X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=ac201e60e13ba39ceafba9fa52cd68cd860f9793;hb=aaad7bfd15a023ab693bb17e2974b57cae7e7e21;hp=4b4c9eb7ae5d7842f9057f9fcc425037b5d72005;hpb=3a1343a2458aa53d50019f24a32a3ab9bb8b3a83;p=dwm.git

diff --git a/view.c b/view.c
index 4b4c9eb..ac201e6 100644
--- a/view.c
+++ b/view.c
@@ -38,6 +38,13 @@ reorder()
 	clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c)
+{
+	for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
@@ -183,17 +190,22 @@ isvisible(Client *c)
 void
 resizecol(Arg *arg)
 {
-	Client *c = getnext(clients);
+	unsigned int n;
+	Client *c;
 
-	if(!sel || !getnext(c->next) || (arrange != dotile))
+	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;
 	}
@@ -303,13 +315,17 @@ 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)))
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c)))
 			return;
 	detach(c);
 	c->next = clients;