corrections

[dwm.git] / view.c

diff --git a/view.c b/view.c
index bd43da9..72a4991 100644 (file)
--- a/view.c
+++ b/view.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -6,42 +6,12 @@
 /* static */
 
 static Client *
-minclient(void) {
-       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 Client *
 nexttiled(Client *c) {
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
 
 static void
-reorder(void) {
-       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;
-}
-
-static void
 togglemax(Client *c) {
        XEvent ev;
                
@@ -99,13 +69,12 @@ dofloat(void) {
 
 void
 dotile(void) {
-       unsigned int i, n, mpx, stackw, th;
+       unsigned int i, n, mpw, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-       mpx = (waw * master) / 1000;
-       stackw = waw - mpx;
+       mpw = (waw * master) / 1000;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -121,15 +90,15 @@ dotile(void) {
                                c->h = wah - 2 * BORDERPX;
                        }
                        else if(i == 0) { /* master window */
-                               c->w = waw - stackw - 2 * BORDERPX;
+                               c->w = mpw - 2 * BORDERPX;
                                c->h = wah - 2 * BORDERPX;
                                th = wah / (n - 1);
                        }
                        else {  /* tile window */
-                               c->x += mpx;
-                               c->w = stackw - 2 * BORDERPX;
+                               c->x += mpw;
+                               c->w = (waw - mpw) - 2 * BORDERPX;
                                if(th > bh) {
-                                       c->y = way + (i - 1) * th;
+                                       c->y += (i - 1) * th;
                                        c->h = th - 2 * BORDERPX;
                                }
                                else /* fallback if th < bh */
@@ -231,6 +200,14 @@ restack(void) {
 }
 
 void
+togglefloat(Arg *arg) {
+       if (!sel || arrange == dofloat)
+               return;
+       sel->isfloat = !sel->isfloat;
+       arrange();
+}
+
+void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
@@ -247,7 +224,6 @@ toggleview(Arg *arg) {
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
-       reorder();
        arrange();
 }
 
@@ -256,19 +232,9 @@ view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
-               seltag[i] = False;
-       seltag[arg->i] = True;
-       reorder();
-       arrange();
-}
-
-void
-viewall(Arg *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltag[i] = True;
-       reorder();
+               seltag[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               seltag[arg->i] = True;
        arrange();
 }