this algorithm seems to keep order for any scenario

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 22b1794..ac336e3 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,11 +4,77 @@
  */
 #include "dwm.h"
 
+/* static */
+
+static Client *
+getslot(Client *c)
+{
+       unsigned int i, tic;
+       Client *p;
+
+       for(tic = 0; tic < ntags && !c->tags[tic]; tic++);
+       for(p = clients; p; p = p->next) {
+               for(i = 0; i < ntags && !p->tags[i]; i++);
+               if(tic < i)
+                       return p;
+       }
+       return p;
+}
+
+static Client *
+tail()
+{
+       Client *c;
+       for(c = clients; c && c->next; c = c->next);
+       return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
 void
+attach(Client *c)
+{
+       Client *p;
+
+       if(!clients) {
+               clients = c;
+               return;
+       }
+       if(!(p = getnext(clients)) && !(p = getslot(c))) {
+               p = tail();
+               c->prev = p;
+               p->next = c;
+               return;
+       }
+
+       if(p == clients) {
+               c->next = clients;
+               clients->prev = c;
+               clients = c;
+       }
+       else {
+               p->prev->next = c;
+               c->prev = p->prev;
+               p->prev = c;
+               c->next = p;
+       }
+}
+
+void
+detach(Client *c)
+{
+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       if(c == clients)
+               clients = c->next;
+       c->next = c->prev = NULL;
+}
+
+void
 dofloat(Arg *arg)
 {
        Client *c;
@@ -168,21 +234,21 @@ restack()
        fi = 0;
        mi = 2 * f;
        if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->title;
+               wins[fi++] = sel->twin;
                wins[fi++] = sel->win;
        }
        else {
-               wins[mi++] = sel->title;
+               wins[mi++] = sel->twin;
                wins[mi++] = sel->win;
        }
        for(c = clients; c; c = c->next)
                if(isvisible(c) && c != sel) {
                        if(c->isfloat || arrange == dofloat) {
-                               wins[fi++] = c->title;
+                               wins[fi++] = c->twin;
                                wins[fi++] = c->win;
                        }
                        else {
-                               wins[mi++] = c->title;
+                               wins[mi++] = c->twin;
                                wins[mi++] = c->win;
                        }
                }
@@ -228,26 +294,16 @@ view(Arg *arg)
 void
 zoom(Arg *arg)
 {
-       Client *c;
+       Client *c = sel;
 
-       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
+       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
                return;
 
-       if(sel == getnext(clients))  {
-               if((c = getnext(sel->next)))
-                       sel = c;
-               else
+       if(c == getnext(clients))
+               if(!(c = getnext(c->next)))
                        return;
-       }
-
-       /* pop */
-       sel->prev->next = sel->next;
-       if(sel->next)
-               sel->next->prev = sel->prev;
-       sel->prev = NULL;
-       clients->prev = sel;
-       sel->next = clients;
-       clients = sel;
-       focus(sel);
+       detach(c);
+       attach(c);
+       focus(c);
        arrange(NULL);
 }