fixing zoom

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 86902d4..d61d0de 100644 (file)
--- a/view.c
+++ b/view.c
@@ -57,7 +57,7 @@ detach(Client *c)
 void
 dofloat(Arg *arg)
 {
-       Client *c, *fc;
+       Client *c;
 
        maximized = False;
 
@@ -68,9 +68,8 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if(!(fc = sel) || !isvisible(fc))
-               fc = getnext(clients);
-       focus(fc);
+       if(!sel || !isvisible(sel))
+               focus(getnext(clients));
        restack();
 }
 
@@ -78,7 +77,7 @@ void
 dotile(Arg *arg)
 {
        int h, i, n, w;
-       Client *c, *fc;
+       Client *c;
 
        maximized = False;
 
@@ -131,9 +130,8 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if(!(fc = sel) || !isvisible(fc))
-               fc = getnext(clients);
-       focus(fc);
+       if(!sel || !isvisible(sel))
+               focus(getnext(clients));
        restack();
 }
 
@@ -182,6 +180,31 @@ isvisible(Client *c)
        return False;
 }
 
+void
+resizecol(Arg *arg)
+{
+       unsigned int n;
+       Client *c;
+
+       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 || mw + arg->i < 100)
+                       return;
+               mw += arg->i;
+       }
+       else {
+               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+                       return;
+               mw -= arg->i;
+       }
+       arrange(NULL);
+}
+
 void
 restack()
 {
@@ -209,13 +232,15 @@ restack()
 
        fi = 0;
        mi = 2 * f;
-       if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->twin;
-               wins[fi++] = sel->win;
-       }
-       else {
-               wins[mi++] = sel->twin;
-               wins[mi++] = sel->win;
+       if(sel) {
+               if(sel->isfloat || arrange == dofloat) {
+                       wins[fi++] = sel->twin;
+                       wins[fi++] = sel->win;
+               }
+               else {
+                       wins[mi++] = sel->twin;
+                       wins[mi++] = sel->win;
+               }
        }
        for(c = clients; c; c = c->next)
                if(isvisible(c) && c != sel) {
@@ -283,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;