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

diff --git a/tag.c b/tag.c
index 1bfedb2..f7513c1 100644
--- a/tag.c
+++ b/tag.c
@@ -4,27 +4,26 @@
  */
 #include "dwm.h"
 
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
 /* static */
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"firefox-bin",	{ [Twww] = "www" },			False },
-};
+typedef struct {
+	const char *pattern;
+	char *tags[TLast];
+	Bool isfloat;
+} Rule;
 
-/* extern */
+TAGS
+RULES
+
+void (*arrange)(Arg *) = ARRANGE;
 
-/* CUSTOMIZE */
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
+/* extern */
 
 void
 appendtag(Arg *arg)
@@ -41,9 +40,8 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
-	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
-		setgeom(c);
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			resize(c, True, TopLeft);
 		}
@@ -51,10 +49,12 @@ dofloat(Arg *arg)
 			ban(c);
 	}
 	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients, tsel))) {
+		if((sel = getnext(clients))) {
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
@@ -62,11 +62,10 @@ 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->isfloat)
 			n++;
@@ -77,7 +76,7 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		setgeom(c);
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			if(c->isfloat) {
 				higher(c);
@@ -85,22 +84,28 @@ dotile(Arg *arg)
 				continue;
 			}
 			if(n == 1) {
-				*c->x = sx;
-				*c->y = sy + bh;
-				*c->w = sw - 2 * c->border;
-				*c->h = sh - 2 * c->border - bh;
+				c->x = sx;
+				c->y = sy + bh;
+				c->w = sw - 2 * c->border;
+				c->h = sh - 2 * c->border - bh;
 			}
 			else if(i == 0) {
-				*c->x = sx;
-				*c->y = sy + bh;
-				*c->w = mw - 2 * c->border;
-				*c->h = sh - 2 * c->border - bh;
+				c->x = sx;
+				c->y = sy + bh;
+				c->w = mw - 2 * c->border;
+				c->h = sh - 2 * c->border - bh;
 			}
-			else {
-				*c->x = sx + mw;
-				*c->y = sy + (i - 1) * h + bh;
-				*c->w = w - 2 * c->border;
-				*c->h = h - 2 * c->border;
+			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;
+			}
+			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++;
@@ -109,44 +114,35 @@ dotile(Arg *arg)
 			ban(c);
 	}
 	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients, tsel))) {
+		if((sel = getnext(clients))) {
 			higher(sel);
 			focus(sel);
 		}
+		else
+			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	}
 	drawall();
 }
 
 Client *
-getnext(Client *c, unsigned int t)
+getnext(Client *c)
 {
-	for(; c && !c->tags[t]; c = c->next);
+	for(; c && !c->tags[tsel]; c = c->next);
 	return c;
 }
 
-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)
 {
-	int i;
-	Client *c;
-
-	if(arg->i == tsel)
-		return;
-
-	if(!(c = getnext(clients, arg->i)))
-		return;
-
-	for(i = 0; i < TLast; i++)
-		c->tags[i] = NULL;
-	c->tags[tsel] = tags[tsel];
-	pop(c);
-	focus(c);
+	for(; c && !c->tags[tsel]; c = c->prev);
+	return c;
 }
 
 void
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
@@ -158,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->isfloat = rule[i].isfloat;
-					matched = True;
-					break;
 				}
+				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);
+}