I really need column growing, now pushing upstream

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 5de34c0..dc10e5e 100644 (file)
--- a/view.c
+++ b/view.c
@@ -59,18 +59,17 @@ dofloat(Arg *arg)
 {
        Client *c;
 
+       maximized = False;
+
        for(c = clients; c; c = c->next) {
-               c->ismax = False;
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }
-       if((sel = getnext(clients)))
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if(!sel || !isvisible(sel))
+               focus(getnext(clients));
        restack();
 }
 
@@ -80,6 +79,8 @@ dotile(Arg *arg)
        int h, i, n, w;
        Client *c;
 
+       maximized = False;
+
        w = sw - mw;
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
@@ -91,7 +92,6 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
-               c->ismax = False;
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
@@ -130,10 +130,8 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if((sel = getnext(clients)))
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       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) {
@@ -261,7 +279,6 @@ void
 view(Arg *arg)
 {
        unsigned int i;
-       Client *c;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
@@ -270,12 +287,23 @@ view(Arg *arg)
        arrange(NULL);
 }
 
+void
+viewall(Arg *arg)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = True;
+       reorder();
+       arrange(NULL);
+}
+
 void
 zoom(Arg *arg)
 {
        Client *c = sel;
 
-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       if(!c || (arrange != dotile) || c->isfloat || maximized)
                return;
 
        if(c == getnext(clients))