using a global stack for focus recovery on arrange() - seems to work great

[dwm.git] / view.c

diff --git a/view.c b/view.c
index f1be609..5cbab08 100644 (file)
--- a/view.c
+++ b/view.c
@@ -12,13 +12,14 @@ minclient()
 {
        Client *c, *min;
 
+       if((clients && clients->isfloat) || arrange == dofloat)
+               return clients; /* don't touch floating order */
        for(min = c = clients; c; c = c->next)
                if(c->weight < min->weight)
                        min = c;
        return min;
 }
 
-
 static void
 reorder()
 {
@@ -38,6 +39,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;
@@ -68,8 +76,10 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
+               focus(sel);
+       }
        restack();
 }
 
@@ -130,8 +140,10 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
+               focus(sel);
+       }
        restack();
 }
 
@@ -169,84 +181,61 @@ focusprev(Arg *arg)
        }
 }
 
+Bool
+isvisible(Client *c)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i] && seltag[i])
+                       return True;
+       return False;
+}
+
 void
-growcol(Arg *arg)
+resizecol(Arg *arg)
 {
-       if(!sel || !clients || !clients->next || (arrange != dotile))
+       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)
+               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;
        }
        arrange(NULL);
 }
 
-Bool
-isvisible(Client *c)
-{
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltag[i])
-                       return True;
-       return False;
-}
-
 void
 restack()
 {
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
        Client *c;
        XEvent ev;
-
-       for(f = 0, m = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat || arrange == dofloat)
-                               f++;
-                       else
-                               m++;
-               }
-       if(!(n = 2 * (f + m))) {
+       
+       if(!sel) {
                drawstatus();
                return;
        }
-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
-       }
-
-       fi = 0;
-       mi = 2 * f;
-       if(sel) {
-               if(sel->isfloat || arrange == dofloat) {
-                       wins[fi++] = sel->twin;
-                       wins[fi++] = sel->win;
-               }
-               else {
-                       wins[mi++] = sel->twin;
-                       wins[mi++] = sel->win;
-               }
+       if(sel->isfloat || arrange == dofloat) {
+               XRaiseWindow(dpy, sel->win);
+               XRaiseWindow(dpy, sel->twin);
        }
-       for(c = clients; c; c = c->next)
-               if(isvisible(c) && c != sel) {
-                       if(c->isfloat || arrange == dofloat) {
-                               wins[fi++] = c->twin;
-                               wins[fi++] = c->win;
-                       }
-                       else {
-                               wins[mi++] = c->twin;
-                               wins[mi++] = c->win;
-                       }
+       if(arrange != dofloat)
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       XLowerWindow(dpy, c->twin);
+                       XLowerWindow(dpy, c->win);
                }
-       XRestackWindows(dpy, wins, n);
        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -301,17 +290,22 @@ 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)))
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
+       if(clients)
+               clients->prev = c;
        c->next = clients;
-       clients->prev = c;
        clients = c;
        focus(c);
        arrange(NULL);