small fix

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 424ee5a..ce122ed 100644 (file)
--- a/view.c
+++ b/view.c
@@ -38,6 +38,13 @@ reorder()
        clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c)
+{
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
@@ -59,18 +66,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 +86,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 +99,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 +137,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();
 }
 
@@ -183,6 +188,31 @@ isvisible(Client *c)
 }
 
 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()
 {
        static unsigned int nwins = 0;
@@ -209,13 +239,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) {
@@ -270,15 +302,30 @@ view(Arg *arg)
 }
 
 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;
+       unsigned int n;
+       Client *c;
 
-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       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)))
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
        c->next = clients;