added comment to %u in config.default.h, added Button{4.5} support on mode label

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 72a4991..06aed3e 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 */
 
@@ -69,12 +70,16 @@ dofloat(void) {
 
 void
 dotile(void) {
-       unsigned int i, n, mpw, th;
+       unsigned int i, n, mw, mh, tw, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-       mpw = (waw * master) / 1000;
+       /* window geoms */
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+       tw = waw - mw;
+       th = (n > nmaster) ? wah / (n - nmaster) : 0;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -85,20 +90,16 @@ dotile(void) {
                        c->ismax = False;
                        c->x = wax;
                        c->y = way;
-                       if(n == 1) { /* only 1 window */
-                               c->w = waw - 2 * BORDERPX;
-                               c->h = wah - 2 * BORDERPX;
-                       }
-                       else if(i == 0) { /* master window */
-                               c->w = mpw - 2 * BORDERPX;
-                               c->h = wah - 2 * BORDERPX;
-                               th = wah / (n - 1);
+                       if(i < nmaster) {
+                               c->y += i * mh;
+                               c->w = mw - 2 * BORDERPX;
+                               c->h = mh - 2 * BORDERPX;
                        }
                        else {  /* tile window */
-                               c->x += mpw;
-                               c->w = (waw - mpw) - 2 * BORDERPX;
+                               c->x += mw;
+                               c->w = tw - 2 * BORDERPX;
                                if(th > bh) {
-                                       c->y += (i - 1) * th;
+                                       c->y += (i - nmaster) * th;
                                        c->h = th - 2 * BORDERPX;
                                }
                                else /* fallback if th < bh */
@@ -147,6 +148,18 @@ focusprev(Arg *arg) {
        }
 }
 
+void
+incnmaster(Arg *arg) {
+       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+               return;
+       nmaster += arg->i;
+       updatemodetext();
+       if(sel)
+               arrange();
+       else
+               drawstatus();
+}
+
 Bool
 isvisible(Client *c) {
        unsigned int i;
@@ -210,6 +223,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       updatemodetext();
        if(sel)
                arrange();
        else
@@ -227,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;
@@ -249,11 +269,9 @@ zoom(Arg *arg) {
                togglemax(sel);
                return;
        }
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
-       if(n < 2 || (arrange == dofloat))
-               return;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
+
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;