X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=4e2ffb35e526701517cf2b109e8286b91699220f;hb=f679125206ae28b38f77e9620a67365d310ddff3;hp=1ac31415cdf957ab02b59af407b9204a9dd4de7b;hpb=0b80d1842d1c921a8a94c11fd9222dad9311cc97;p=dwm.git

diff --git a/view.c b/view.c
index 1ac3141..4e2ffb3 100644
--- 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)
+	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
@@ -236,6 +242,12 @@ toggleview(Arg *arg) {
 }
 
 void
+updatemodetext() {
+	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+	bmw = textw(mtext);
+}
+
+void
 view(Arg *arg) {
 	unsigned int i;
 
@@ -248,7 +260,7 @@ view(Arg *arg) {
 
 void
 zoom(Arg *arg) {
-	unsigned int i, n;
+	unsigned int n;
 	Client *c;
 
 	if(!sel)
@@ -259,17 +271,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;