no, ordering floating clients at the end seems better

[dwm.git] / view.c

diff --git a/view.c b/view.c
index f1be609..8df93ef 100644 (file)
--- a/view.c
+++ b/view.c
@@ -82,8 +82,8 @@ dotile(Arg *arg)
        maximized = False;
 
        w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))
                        n++;
 
        if(n > 1)
@@ -169,35 +169,42 @@ focusprev(Arg *arg)
        }
 }
 
+Bool
+isvisible(Client *c)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i] && seltag[i])
+                       return True;
+       return False;
+}
+
 void
-growcol(Arg *arg)
+resizecol(Arg *arg)
 {
-       if(!sel || !clients || !clients->next || (arrange != dotile))
+       unsigned int n;
+       Client *c;
+
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
+
        if(sel == getnext(clients)) {
-               if(mw + arg->i > sw - 100)
+               if(mw + arg->i > sw - 100 || mw + arg->i < 100)
                        return;
                mw += arg->i;
        }
        else {
-               if(mw - arg->i < 100)
+               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
                        return;
                mw -= arg->i;
        }
        arrange(NULL);
 }
 
-Bool
-isvisible(Client *c)
-{
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltag[i])
-                       return True;
-       return False;
-}
-
 void
 restack()
 {
@@ -301,13 +308,17 @@ viewall(Arg *arg)
 void
 zoom(Arg *arg)
 {
-       Client *c = sel;
+       unsigned int n;
+       Client *c;
 
-       if(!c || (arrange != dotile) || c->isfloat || maximized)
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
-       if(c == getnext(clients))
-               if(!(c = getnext(c->next)))
+       if((c = sel) == getnext(clients))
+               if(!(c = getnext(c->next)) || c->isfloat)
                        return;
        detach(c);
        c->next = clients;