X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=c42a76063d3d25cfd3dd66abf34051a772cb83e0;hp=0861128f594a7a08bd7ec4238d31893cab95e08b;hb=7b5638f61d5c8b5a76bc3f7a5962cb7490da3b6b;hpb=dba23062bad40afb1a90f60b6897cf9e1ca5035b

diff --git a/tag.c b/tag.c
index 0861128..c42a760 100644
--- a/tag.c
+++ b/tag.c
@@ -2,71 +2,51 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
-#include <stdlib.h>
+#include <regex.h>
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xatom.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
-#include "dwm.h"
+/* static */
 
+typedef struct {
+	const char *pattern;
+	char *tags[TLast];
+	Bool isfloat;
+} Rule;
+
+/* CUSTOMIZE */ 
 static Rule rule[] = {
-	/* class			instance	tags						dofloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
+	/* class:instance	tags				isfloat */
+	{ "Firefox.*",		{ [Tnet] = "net" },		False },
+	{ "Gimp.*",		{ 0 },				True},
+};
+
+char *tags[TLast] = {
+	[Tfnord] = "fnord",
+	[Tdev] = "dev",
+	[Tnet] = "net",
+	[Twork] = "work",
+	[Tmisc] = "misc",
 };
 
 void (*arrange)(Arg *) = dotile;
 
-Client *
-getnext(Client *c)
-{
-	for(; c && !c->tags[tsel]; c = c->next);
-	return c;
-}
+/* END CUSTOMIZE */
+
+/* extern */
 
 void
-settags(Client *c)
+appendtag(Arg *arg)
 {
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-	unsigned int i, j;
-	Bool matched = False;
-
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
+	if(!sel)
 		return;
-	}
-
-	if(XGetClassHint(dpy, c->win, &ch)) {
-		if(ch.res_class && ch.res_name) {
-			for(i = 0; i < len; i++)
-				if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-					&& !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-				{
-					for(j = 0; j < TLast; j++)
-						c->tags[j] = rule[i].tags[j];
-					c->dofloat = rule[i].dofloat;
-					matched = True;
-					break;
-				}
-		}
-		if(ch.res_class)
-			XFree(ch.res_class);
-		if(ch.res_name)
-			XFree(ch.res_name);
-	}
 
-	if(!matched)
-		c->tags[tsel] = tags[tsel];
-}
-
-void
-view(Arg *arg)
-{
-	tsel = arg->i;
+	sel->tags[arg->i] = tags[arg->i];
 	arrange(NULL);
-	drawall();
 }
 
 void
@@ -74,10 +54,11 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
-	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c, True);
+		c->ismax = False;
+		if(c->tags[tsel]) {
+			resize(c, True, TopLeft);
+		}
 		else
 			ban(c);
 	}
@@ -86,6 +67,8 @@ dofloat(Arg *arg)
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
@@ -93,13 +76,12 @@ dofloat(Arg *arg)
 void
 dotile(Arg *arg)
 {
-	Client *c;
 	int n, i, w, h;
+	Client *c;
 
 	w = sw - mw;
-	arrange = dotile;
 	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->dofloat)
+		if(c->tags[tsel] && !c->isfloat)
 			n++;
 
 	if(n > 1)
@@ -108,10 +90,11 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
+		c->ismax = False;
 		if(c->tags[tsel]) {
-			if(c->dofloat) {
+			if(c->isfloat) {
 				higher(c);
-				resize(c, True);
+				resize(c, True, TopLeft);
 				continue;
 			}
 			if(n == 1) {
@@ -126,13 +109,19 @@ dotile(Arg *arg)
 				c->w = mw - 2 * c->border;
 				c->h = sh - 2 * c->border - bh;
 			}
-			else {
+			else if(h > bh) {
 				c->x = sx + mw;
 				c->y = sy + (i - 1) * h + bh;
 				c->w = w - 2 * c->border;
 				c->h = h - 2 * c->border;
 			}
-			resize(c, False);
+			else { /* fallback if h < bh */
+				c->x = sx + mw;
+				c->y = sy + bh;
+				c->w = w - 2 * c->border;
+				c->h = sh - 2 * c->border - bh;
+			}
+			resize(c, False, TopLeft);
 			i++;
 		}
 		else
@@ -143,24 +132,31 @@ dotile(Arg *arg)
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
 
-void
-appendtag(Arg *arg)
+Client *
+getnext(Client *c)
 {
-	if(!sel)
-		return;
+	for(; c && !c->tags[tsel]; c = c->next);
+	return c;
+}
 
-	sel->tags[arg->i] = tags[arg->i];
-	arrange(NULL);
+Client *
+getprev(Client *c)
+{
+	for(; c && !c->tags[tsel]; c = c->prev);
+	return c;
 }
 
 void
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
@@ -169,3 +165,54 @@ replacetag(Arg *arg)
 	appendtag(arg);
 }
 
+void
+settags(Client *c)
+{
+	char classinst[256];
+	static unsigned int len = sizeof(rule) / sizeof(rule[0]);
+	unsigned int i, j;
+	regex_t regex;
+	regmatch_t tmp;
+	Bool matched = False;
+	XClassHint ch;
+
+	if(XGetClassHint(dpy, c->win, &ch)) {
+		snprintf(classinst, sizeof(classinst), "%s:%s",
+				ch.res_class ? ch.res_class : "",
+				ch.res_name ? ch.res_name : "");
+		for(i = 0; !matched && i < len; i++) {
+			if(!regcomp(&regex, rule[i].pattern, 0)) {
+				if(!regexec(&regex, classinst, 1, &tmp, 0)) {
+					for(j = 0; j < TLast; j++) {
+						if(rule[i].tags[j])
+							matched = True;
+						c->tags[j] = rule[i].tags[j];
+					}
+					c->isfloat = rule[i].isfloat;
+				}
+				regfree(&regex);
+			}
+		}
+		if(ch.res_class)
+			XFree(ch.res_class);
+		if(ch.res_name)
+			XFree(ch.res_name);
+	}
+	if(!matched)
+		c->tags[tsel] = tags[tsel];
+}
+
+void
+togglemode(Arg *arg)
+{
+	arrange = arrange == dofloat ? dotile : dofloat;
+	arrange(NULL);
+}
+
+void
+view(Arg *arg)
+{
+	tsel = arg->i;
+	arrange(NULL);
+	drawall();
+}