removed viewnext/viewprev

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 72d87d3..d27d91a 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -51,7 +51,7 @@ 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
@@ -74,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)
@@ -84,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);
@@ -106,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;
@@ -132,14 +135,14 @@ dotile(Arg *arg)
 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;
 }
 
@@ -172,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)
 {
@@ -214,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
@@ -227,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();
 }