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

diff --git a/view.c b/view.c
index 1ac3141..f2e4040 100644
--- a/view.c
+++ b/view.c
@@ -149,7 +149,7 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-	if(nmaster + arg->i < 1)
+	if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
 		return;
 	nmaster += arg->i;
 	arrange();
@@ -248,7 +248,7 @@ view(Arg *arg) {
 
 void
 zoom(Arg *arg) {
-	unsigned int i, n;
+	unsigned int n;
 	Client *c;
 
 	if(!sel)
@@ -259,17 +259,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;