X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/7ac0de8350c51ef39e4dee5f60e1da641c4fbd5b..58beead14d79ba42acc6357d450c4125e3e8407a:/view.c?ds=sidebyside

diff --git a/view.c b/view.c
index ffa22a1..4513a45 100644
--- 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) || (wah / (nmaster + arg->i) < bh))
+	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;
@@ -260,14 +279,14 @@ zoom(Arg *arg) {
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
-	c = sel;
-	if(arrange != dofloat) {
-		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();
 }