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

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 1ac3141..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 */
 
@@ -74,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)) {
@@ -89,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;
@@ -149,10 +155,16 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if(nmaster + arg->i < 1)
+       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
@@ -218,6 +230,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       updatemodetext();
        if(sel)
                arrange();
        else
@@ -235,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;
@@ -248,7 +267,7 @@ view(Arg *arg) {
 
 void
 zoom(Arg *arg) {
-       unsigned int i, n;
+       unsigned int n;
        Client *c;
 
        if(!sel)
@@ -259,17 +278,10 @@ zoom(Arg *arg) {
        }
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-       if(n <= nmaster || (arrange == dofloat))
-               return;
-
-       for(c = nexttiled(clients), i = 0; c && (c != sel) && i < nmaster; c = nexttiled(c->next))
-               i++;
-       if(c == sel && i < nmaster)
-               for(; c && i < nmaster; c = nexttiled(c->next))
-                       i++;
-       if(!c)
-               return;
 
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
+                       return;
        detach(c);
        if(clients)
                clients->prev = c;