X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tag.c;h=d27d91ae7dbbfd515bddbce092213dc605bc563e;hb=4cb78a170c6daa488a90dffb60224fcf2b76fbf0;hp=015a06a4f047db019cec7a2a7c3444b99ca9d2fb;hpb=e21d93b7bd5d34f31bc09a576b7d449df5b68c07;p=dwm.git

diff --git a/tag.c b/tag.c
index 015a06a..d27d91a 100644
--- a/tag.c
+++ b/tag.c
@@ -51,20 +51,18 @@ dofloat(Arg *arg)
 
 	for(c = clients; c; c = c->next) {
 		c->ismax = False;
-		if(c->tags[tsel]) {
+		if(isvisible(c)) {
 			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
 	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-		else
-			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if((sel = getnext(clients))) {
+		higher(sel);
+		focus(sel);
 	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 
@@ -76,7 +74,7 @@ dotile(Arg *arg)
 
 	w = sw - mw;
 	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->isfloat)
+		if(isvisible(c) && !c->isfloat)
 			n++;
 
 	if(n > 1)
@@ -86,7 +84,7 @@ dotile(Arg *arg)
 
 	for(i = 0, c = clients; c; c = c->next) {
 		c->ismax = False;
-		if(c->tags[tsel]) {
+		if(isvisible(c)) {
 			if(c->isfloat) {
 				higher(c);
 				resize(c, True, TopLeft);
@@ -108,7 +106,10 @@ dotile(Arg *arg)
 				c->x = sx + mw;
 				c->y = sy + (i - 1) * h + bh;
 				c->w = w - 2;
-				c->h = h - 2;
+				if(i + 1 == n)
+					c->h = sh - c->y - 2;
+				else
+					c->h = h - 2;
 			}
 			else { /* fallback if h < bh */
 				c->x = sx + mw;
@@ -122,28 +123,26 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-		else
-			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if((sel = getnext(clients))) {
+		higher(sel);
+		focus(sel);
 	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 
 Client *
 getnext(Client *c)
 {
-	for(; c && !c->tags[tsel]; c = c->next);
+	for(; c && !isvisible(c); c = c->next);
 	return c;
 }
 
 Client *
 getprev(Client *c)
 {
-	for(; c && !c->tags[tsel]; c = c->prev);
+	for(; c && !isvisible(c); c = c->prev);
 	return c;
 }
 
@@ -176,6 +175,17 @@ initrregs()
 	}
 }
 
+Bool
+isvisible(Client *c)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
 void
 replacetag(Arg *arg)
 {
@@ -218,7 +228,8 @@ settags(Client *c)
 			XFree(ch.res_name);
 	}
 	if(!matched)
-		c->tags[tsel] = True;
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = seltag[i];
 }
 
 void
@@ -231,21 +242,24 @@ togglemode(Arg *arg)
 void
 view(Arg *arg)
 {
-	tsel = arg->i;
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = False;
+	seltag[arg->i] = True;
 	arrange(NULL);
 	drawall();
 }
 
 void
-viewnext(Arg *arg)
+toggleview(Arg *arg)
 {
-	arg->i = (tsel < ntags-1) ? tsel+1 : 0;
-	view(arg);
-}
+	unsigned int i;
 
-void
-viewprev(Arg *arg)
-{
-	arg->i = (tsel > 0) ? tsel-1 : ntags-1;
-	view(arg);
+	seltag[arg->i] = !seltag[arg->i];
+	for(i = 0; !seltag[i] && i < ntags; i++);
+	if(i == ntags)
+		seltag[arg->i] = True; /* cannot toggle last view */
+	arrange(NULL);
+	drawall();
 }