I really need column growing, now pushing upstream

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 86902d4..dc10e5e 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();
 }
 
@@ -171,6 +169,24 @@ focusprev(Arg *arg)
        }
 }
 
+void
+growcol(Arg *arg)
+{
+       if(!sel || (arrange != dotile))
+               return;
+       if(sel == getnext(clients)) {
+               if(mw + arg->i > sw - 100)
+                       return;
+               mw += arg->i;
+       }
+       else {
+               if(mw - arg->i < 100)
+                       return;
+               mw -= arg->i;
+       }
+       arrange(NULL);
+}
+
 Bool
 isvisible(Client *c)
 {
@@ -209,13 +225,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) {