fixed the issue observed by various people, that clients appeared on empty tags

[dwm.git] / tile.c

diff --git a/tile.c b/tile.c
index 2481eb3..386832d 100644 (file)
--- a/tile.c
+++ b/tile.c
@@ -12,15 +12,17 @@ void
 addtomwfact(const char *arg) {
        double delta;
 
-       if(lt->arrange != tile)
+       if(!isarrange(tile))
                return;
 
        /* arg handling, manipulate mwfact */
-       if(arg && (1 == sscanf(arg, "%lf", &delta))) {
+       if(arg == NULL)
+               mwfact = MWFACT;
+       else if(1 == sscanf(arg, "%lf", &delta)) {
                if(delta + mwfact > 0.1 && delta + mwfact < 0.9)
                        mwfact += delta;
        }
-       lt->arrange();
+       arrange();
 }
 
 void
@@ -39,43 +41,35 @@ tile(void) {
 
        nx = wax;
        ny = way;
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       unban(c);
-                       if(c->isfloating)
-                               continue;
-                       c->ismax = False;
-                       if(i == 0) { /* master */
-                               nw = mw - 2 * c->border;
-                               nh = wah - 2 * c->border;
-                       }
-                       else {  /* tile window */
-                               if(i == 1) {
-                                       ny = way;
-                                       nx += mw;
-                               }
-                               nw = waw - mw - 2 * c->border;
-                               if(i + 1 == n) /* remainder */
-                                       nh = (way + wah) - ny - 2 * c->border;
-                               else
-                                       nh = th - 2 * c->border;
+       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) {
+               c->ismax = False;
+               if(i == 0) { /* master */
+                       nw = mw - 2 * c->border;
+                       nh = wah - 2 * c->border;
+               }
+               else {  /* tile window */
+                       if(i == 1) {
+                               ny = way;
+                               nx += mw;
                        }
-                       resize(c, nx, ny, nw, nh, False);
-                       if(n > 1 && th != wah)
-                               ny += nh + 2 * c->border;
-                       i++;
+                       nw = waw - mw - 2 * c->border;
+                       if(i + 1 == n) /* remainder */
+                               nh = (way + wah) - ny - 2 * c->border;
+                       else
+                               nh = th - 2 * c->border;
                }
-               else
-                       ban(c);
-       focus(NULL);
-       restack();
+               resize(c, nx, ny, nw, nh, False);
+               if(n > 1 && th != wah)
+                       ny += nh + 2 * c->border;
+               i++;
+       }
 }
 
 void
 zoom(const char *arg) {
        Client *c;
 
-       if(!sel || lt->arrange == floating || sel->isfloating)
+       if(!sel || !isarrange(tile) || sel->isfloating)
                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
@@ -83,5 +77,5 @@ zoom(const char *arg) {
        detach(c);
        attach(c);
        focus(c);
-       lt->arrange();
+       arrange();
 }