allowing nmaster=0 (I think that's a straight idea)

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 9bd7584..4513a45 100644 (file)
--- a/view.c
+++ b/view.c
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 
 /* static */
 
@@ -11,40 +12,6 @@ nexttiled(Client *c) {
        return c;
 }
 
-static Bool
-ismaster(Client *c) {
-       Client *cl;
-       unsigned int i;
-
-       for(cl = nexttiled(clients), i = 0; cl && cl != c; cl = nexttiled(cl->next), i++);
-       return i < nmaster;
-}
-
-static void
-pop(Client *c) {
-       detach(c);
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-}
-
-static void
-swap(Client *c1, Client *c2) {
-       Client tmp = *c1;
-       Client *c1p = c1->prev;
-       Client *c1n = c1->next;
-       Client *c2p = c2->prev;
-       Client *c2n = c2->next;
-
-       *c1 = *c2;
-       *c2 = tmp;
-       c1->prev = c1p;
-       c1->next = c1n;
-       c2->prev = c2p;
-       c2->next = c2n;
-}
-
 static void
 togglemax(Client *c) {
        XEvent ev;
@@ -68,15 +35,6 @@ togglemax(Client *c) {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static Client *
-topofstack() {
-       Client *c;
-       unsigned int i;
-
-       for(c = nexttiled(clients), i = 0; c && i < nmaster; c = nexttiled(c->next), i++);
-       return (i < nmaster) ? NULL : c;
-}
-
 /* extern */
 
 void (*arrange)(void) = DEFMODE;
@@ -117,11 +75,16 @@ dotile(void) {
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
+
        /* window geoms */
-       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
-       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-       tw = waw - mw;
+       if(nmaster > 0) {
+               mh = (n > nmaster) ?  wah / nmaster : wah / (n > 0 ? n : 1);
+               mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+       }
+       else
+               mh = mw = 0;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
+       tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -132,7 +95,7 @@ dotile(void) {
                        c->ismax = False;
                        c->x = wax;
                        c->y = way;
-                       if(i < nmaster) {
+                       if((nmaster > 0) && (i < nmaster)) {
                                c->y += i * mh;
                                c->w = mw - 2 * BORDERPX;
                                c->h = mh - 2 * BORDERPX;
@@ -192,10 +155,16 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+       if((arrange == dofloat)
+       || ((int)nmaster + arg->i < 0)
+       || (((int)nmaster + arg->i > 0) && (wah / (nmaster + arg->i) < bh)))
                return;
        nmaster += arg->i;
-       arrange();
+       updatemodetext();
+       if(sel)
+               arrange();
+       else
+               drawstatus();
 }
 
 Bool
@@ -261,6 +230,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       updatemodetext();
        if(sel)
                arrange();
        else
@@ -278,6 +248,12 @@ toggleview(Arg *arg) {
        arrange();
 }
 
+void
+updatemodetext() {
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
+}
+
 void
 view(Arg *arg) {
        unsigned int i;
@@ -303,20 +279,14 @@ zoom(Arg *arg) {
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
-       c = sel;
-       if(arrange == dofloat)
-               return;
-       else if(n <= nmaster)
-               pop(c);
-       else if(ismaster(sel)) {
-               if(!(c = topofstack()))
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
                        return;
-               swap(c, sel);
-               c = sel;
-       }
-       else
-               pop(c);
-
+       detach(c);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
        focus(c);
        arrange();
 }