fixing zoom

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 4b4c9eb..d61d0de 100644 (file)
--- a/view.c
+++ b/view.c
@@ -183,17 +183,22 @@ isvisible(Client *c)
 void
 resizecol(Arg *arg)
 {
-       Client *c = getnext(clients);
+       unsigned int n;
+       Client *c;
 
-       if(!sel || !getnext(c->next) || (arrange != dotile))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       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;
        }
@@ -303,14 +308,19 @@ 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 = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
-       if(c == getnext(clients))
-               if(!(c = getnext(c->next)))
-                       return;
+       if((c = sel) == getnext(clients))
+               for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+       if(!c)
+               return;
        detach(c);
        c->next = clients;
        clients->prev = c;