nah the last change feels bad

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 503f1c2..4e2ffb3 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 */
 
@@ -75,10 +76,10 @@ 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;
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
+       tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -149,10 +150,14 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
                return;
        nmaster += arg->i;
-       arrange();
+       updatemodetext();
+       if(sel)
+               arrange();
+       else
+               drawstatus();
 }
 
 Bool
@@ -218,6 +223,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       updatemodetext();
        if(sel)
                arrange();
        else
@@ -235,6 +241,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;
@@ -260,14 +272,14 @@ zoom(Arg *arg) {
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
-       c = sel;
-       if((arrange != dofloat) && c != nexttiled(clients)) {
-               detach(c);
-               if(clients)
-                       clients->prev = c;
-               c->next = clients;
-               clients = c;
-               focus(c);
-               arrange();
-       }
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
+                       return;
+       detach(c);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+       focus(c);
+       arrange();
 }