implemented nmaster appearance in mode label (using %u)

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 1ac3141..2f2d42a 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 */
 
@@ -149,10 +150,15 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if(nmaster + arg->i < 1)
+       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
                return;
        nmaster += arg->i;
-       arrange();
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
+       if(sel)
+               arrange();
+       else
+               drawstatus();
 }
 
 Bool
@@ -218,6 +224,8 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
        if(sel)
                arrange();
        else
@@ -248,7 +256,7 @@ view(Arg *arg) {
 
 void
 zoom(Arg *arg) {
-       unsigned int i, n;
+       unsigned int n;
        Client *c;
 
        if(!sel)
@@ -259,17 +267,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;