still something wrong with reorder()

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 9ba8e0b..3270160 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,37 +4,36 @@
  */
 #include "dwm.h"
 
-/* extern */
-
-void (*arrange)(Arg *) = DEFMODE;
+/* static */
 
-void
-attach(Client *c)
+static void
+reorder()
 {
-       Client *first = getnext(clients);
+       Client *c, *orig, *p;
 
-       if(!first) {
-               if(clients) {
-                       for(first = clients; first->next; first = first->next);
-                       first->next = c;
-                       c->prev = first;
+       orig = clients;
+       clients = NULL;
+
+       while((c = orig)) {
+               orig = orig->next;
+               detach(c);
+
+               for(p = clients; p && p->next && p->weight <= c->weight; p = p->next);
+               c->prev = p;
+               if(p) {
+                       if((c->next = p->next))
+                               c->next->prev = c;
+                       p->next = c;
                }
                else
                        clients = c;
        }
-       else if(first == clients) {
-               c->next = clients;
-               clients->prev = c;
-               clients = c;
-       }
-       else {
-               first->prev->next = c;
-               c->prev = first->prev;
-               first->prev = c;
-               c->next = first;
-       }
 }
 
+/* extern */
+
+void (*arrange)(Arg *) = DEFMODE;
+
 void
 detach(Client *c)
 {
@@ -250,6 +249,7 @@ toggleview(Arg *arg)
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
+       reorder();
        arrange(NULL);
 }
 
@@ -257,10 +257,12 @@ void
 view(Arg *arg)
 {
        unsigned int i;
+       Client *c;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
        seltag[arg->i] = True;
+       reorder();
        arrange(NULL);
 }
 
@@ -276,7 +278,9 @@ zoom(Arg *arg)
                if(!(c = getnext(c->next)))
                        return;
        detach(c);
-       attach(c);
+       c->next = clients;
+       clients->prev = c;
+       clients = c;
        focus(c);
        arrange(NULL);
 }