X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=21eb9fa280b760ab36239e839e9d8c03374f99ad;hb=72707c2fae68f5eba6ea97cbf356bfb968c8a15d;hp=d29a179863ee7bcc89e1745a480aaed989858cc3;hpb=58f2fe3f6af3d6f8c925125c721a2d1800d750dc;p=dwm.git

diff --git a/tag.c b/tag.c
index d29a179..21eb9fa 100644
--- a/tag.c
+++ b/tag.c
@@ -4,28 +4,40 @@
  */
 #include "dwm.h"
 
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
 /* static */
 
+typedef struct {
+	const char *pattern;
+	char *tags[TLast];
+	Bool isfloat;
+} Rule;
+
 /* CUSTOMIZE */ 
 static Rule rule[] = {
-	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
+	/* class:instance	tags				isfloat */
+	{ "Firefox.*",		{ [Twww] = "www" },		False },
+	{ "Gimp.*",		{ 0 },				True},
 };
 
-/* extern */
-
-/* CUSTOMIZE */
 char *tags[TLast] = {
 	[Tscratch] = "scratch",
 	[Tdev] = "dev",
 	[Twww] = "www",
 	[Twork] = "work",
 };
+
 void (*arrange)(Arg *) = dotile;
 
+/* END CUSTOMIZE */
+
+/* extern */
+
 void
 appendtag(Arg *arg)
 {
@@ -41,11 +53,10 @@ 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);
+			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
@@ -62,11 +73,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,32 +87,38 @@ 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);
-				resize(c, True);
+				resize(c, True, TopLeft);
 				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 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 {
-				*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);
+			resize(c, False, TopLeft);
 			i++;
 		}
 		else
@@ -124,6 +140,13 @@ getnext(Client *c, unsigned int t)
 	return c;
 }
 
+Client *
+getprev(Client *c)
+{
+	for(; c && !c->tags[tsel]; c = c->prev);
+	return c;
+}
+
 void
 heretag(Arg *arg)
 {
@@ -147,6 +170,7 @@ void
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
@@ -158,10 +182,13 @@ replacetag(Arg *arg)
 void
 settags(Client *c)
 {
-	XClassHint ch;
+	char classinst[256];
 	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
 	unsigned int i, j;
+	regex_t regex;
+	regmatch_t tmp;
 	Bool matched = False;
+	XClassHint ch;
 
 	if(!len) {
 		c->tags[tsel] = tags[tsel];
@@ -169,29 +196,39 @@ settags(Client *c)
 	}
 
 	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;