X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=8df93efbbecaa116726bbf99987bbf90034d3a41;hb=0d0e8bde134b999dd22c891d227d886ca6c9ba2c;hp=561d4ef060ae3b9f8d2b87eccdc0fd677e8aaf42;hpb=838a1ff950eb42e4137cfd7039a0e78227b2ef70;p=dwm.git

diff --git a/view.c b/view.c
index 561d4ef..8df93ef 100644
--- a/view.c
+++ b/view.c
@@ -82,8 +82,8 @@ dotile(Arg *arg)
 	maximized = False;
 
 	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 
 	if(n > 1)
@@ -186,8 +186,8 @@ resizecol(Arg *arg)
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
@@ -311,22 +311,15 @@ zoom(Arg *arg)
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	/* this is somewhat tricky, it asserts to only zoom tiled clients */
-	for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
-	if(c) {
-		if(c == sel)
-			for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
-		else
-			c = sel;
-	}
-	if(!c)
-		return;
+	if((c = sel) == getnext(clients))
+		if(!(c = getnext(c->next)) || c->isfloat)
+			return;
 	detach(c);
 	c->next = clients;
 	clients->prev = c;