X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=f7513c1270daf60187b748d06e8a9df98b18dd8c;hp=8951dd82bc89ab5f040714f7473f02f7c03b7cfa;hb=a73a88280681acdab047bd11a9ba77d97d6a0b72;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a

diff --git a/tag.c b/tag.c
index 8951dd8..f7513c1 100644
--- a/tag.c
+++ b/tag.c
@@ -4,28 +4,26 @@
  */
 #include "dwm.h"
 
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
-/********** CUSTOMIZE **********/
+/* static */
 
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
+typedef struct {
+	const char *pattern;
+	char *tags[TLast];
+	Bool isfloat;
+} Rule;
 
-static Rule rule[] = {
-	/* class			instance	tags						dofloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
+TAGS
+RULES
 
-/********** CUSTOMIZE **********/
+void (*arrange)(Arg *) = ARRANGE;
 
-/* extern functions */
-
-void (*arrange)(Arg *) = dotile;
+/* extern */
 
 void
 appendtag(Arg *arg)
@@ -42,10 +40,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);
 	}
@@ -54,6 +53,8 @@ dofloat(Arg *arg)
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
@@ -61,13 +62,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)
@@ -76,10 +76,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) {
@@ -94,13 +95,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
@@ -111,6 +118,8 @@ dotile(Arg *arg)
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
@@ -122,10 +131,18 @@ getnext(Client *c)
 	return c;
 }
 
+Client *
+getprev(Client *c)
+{
+	for(; c && !c->tags[tsel]; c = c->prev);
+	return c;
+}
+
 void
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
@@ -137,43 +154,65 @@ replacetag(Arg *arg)
 void
 settags(Client *c)
 {
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	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;
-
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
-	}
+	XClassHint ch;
 
 	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++)
+		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->dofloat = rule[i].dofloat;
-					matched = True;
-					break;
+					}
+					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();
 }
+
+void
+viewnext(Arg *arg)
+{
+	arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+	view(arg);
+}
+
+void
+viewprev(Arg *arg)
+{
+	arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+	view(arg);
+}