X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=d61d0deb9efab7521d917cfa6cb0114356461a00;hb=52a3ab10423a4133e38281e4e19769cd3c2ed931;hp=dc10e5eb99d5447d1ab574c351a8901789891498;hpb=6499fc4f938eb7e61ab3e25df3904db9c890c693;p=dwm.git

diff --git a/view.c b/view.c
index dc10e5e..d61d0de 100644
--- a/view.c
+++ b/view.c
@@ -169,35 +169,42 @@ focusprev(Arg *arg)
 	}
 }
 
+Bool
+isvisible(Client *c)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
 void
-growcol(Arg *arg)
+resizecol(Arg *arg)
 {
-	if(!sel || (arrange != dotile))
+	unsigned int n;
+	Client *c;
+
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
+
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100)
+		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
 			return;
 		mw += arg->i;
 	}
 	else {
-		if(mw - arg->i < 100)
+		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
 			return;
 		mw -= arg->i;
 	}
 	arrange(NULL);
 }
 
-Bool
-isvisible(Client *c)
-{
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		if(c->tags[i] && seltag[i])
-			return True;
-	return False;
-}
-
 void
 restack()
 {
@@ -301,14 +308,19 @@ viewall(Arg *arg)
 void
 zoom(Arg *arg)
 {
-	Client *c = sel;
+	unsigned int n;
+	Client *c;
 
-	if(!c || (arrange != dotile) || c->isfloat || maximized)
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if(c == getnext(clients))
-		if(!(c = getnext(c->next)))
-			return;
+	if((c = sel) == getnext(clients))
+		for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	if(!c)
+		return;
 	detach(c);
 	c->next = clients;
 	clients->prev = c;