Added tag 1.4 for changeset a6b8994af16491220db0199623bd57d061e06143

[dwm.git] / view.c

diff --git a/view.c b/view.c
index b76b47e..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;
@@ -317,16 +324,9 @@ zoom(Arg *arg)
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
-       /* this is somewhat tricky, it asserts to only zoom tiled clients */
-       for(c = clients; c && c->isfloat; c = getnext(c->next));
-       if(c) {
-               if(c == sel)
-                       for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
-               else
-                       c = sel;
-       }
-       if(!c)
-               return;
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
+                       return;
        detach(c);
        c->next = clients;
        clients->prev = c;