applied patch similiar proposed by dave tweed

[dwm.git] / view.c

diff --git a/view.c b/view.c
index d9aa6e4..5de34c0 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,11 +3,57 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
+
+/* static */
+
+static Client *
+minclient()
+{
+       Client *c, *min;
+
+       for(min = c = clients; c; c = c->next)
+               if(c->weight < min->weight)
+                       min = c;
+       return min;
+}
+
+
+static void
+reorder()
+{
+       Client *c, *newclients, *tail;
+
+       newclients = tail = NULL;
+       while((c = minclient())) {
+               detach(c);
+               if(tail) {
+                       c->prev = tail;
+                       tail->next = c;
+                       tail = c;
+               }
+               else
+                       tail = newclients = c;
+       }
+       clients = newclients;
+}
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
+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)
 {
@@ -21,9 +67,7 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
+       if((sel = getnext(clients)))
                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -86,9 +130,7 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
+       if((sel = getnext(clients)))
                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -168,21 +210,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;
                        }
                }
@@ -195,7 +237,7 @@ restack()
 void
 togglemode(Arg *arg)
 {
-       arrange = arrange == dofloat ? dotile : dofloat;
+       arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
        else
@@ -211,6 +253,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);
 }
 
@@ -218,36 +261,30 @@ 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);
 }
 
 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);
+       c->next = clients;
+       clients->prev = c;
+       clients = c;
+       focus(c);
        arrange(NULL);
 }