X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=c9eec90233b41d417cb1f0dfed1ef4d0120aeb99;hp=3837fbdbde6d293e000e93fbfe536317038820c1;hb=1f9614f82e14fa3a46e0db05346b41d6be611f88;hpb=4f8b08d330a6c377ab919f48b8e922d1c5ded601

diff --git a/tag.c b/tag.c
index 3837fbd..c9eec90 100644
--- a/tag.c
+++ b/tag.c
@@ -12,7 +12,7 @@
 /* CUSTOMIZE */ 
 static Rule rule[] = {
 	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
+	{ "Firefox-bin",	"firefox-bin",	{ [Twww] = "www" },			False },
 };
 
 /* extern */
@@ -43,8 +43,10 @@ dofloat(Arg *arg)
 
 	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c, True);
+		setgeom(c);
+		if(c->tags[tsel]) {
+			resize(c, True, TopLeft);
+		}
 		else
 			ban(c);
 	}
@@ -75,31 +77,38 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
+		setgeom(c);
 		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 {
-				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;
 			}
-			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
@@ -136,7 +145,7 @@ heretag(Arg *arg)
 	for(i = 0; i < TLast; i++)
 		c->tags[i] = NULL;
 	c->tags[tsel] = tags[tsel];
-	arrange(NULL);
+	pop(c);
 	focus(c);
 }