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

diff --git a/view.c b/view.c
index cb92eee..d61d0de 100644
--- a/view.c
+++ b/view.c
@@ -181,6 +181,31 @@ isvisible(Client *c)
 }
 
 void
+resizecol(Arg *arg)
+{
+	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 || mw + arg->i < 100)
+			return;
+		mw += arg->i;
+	}
+	else {
+		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+			return;
+		mw -= arg->i;
+	}
+	arrange(NULL);
+}
+
+void
 restack()
 {
 	static unsigned int nwins = 0;
@@ -207,13 +232,15 @@ restack()
 
 	fi = 0;
 	mi = 2 * f;
-	if(sel->isfloat || arrange == dofloat) {
-		wins[fi++] = sel->twin;
-		wins[fi++] = sel->win;
-	}
-	else {
-		wins[mi++] = sel->twin;
-		wins[mi++] = sel->win;
+	if(sel) {
+		if(sel->isfloat || arrange == dofloat) {
+			wins[fi++] = sel->twin;
+			wins[fi++] = sel->win;
+		}
+		else {
+			wins[mi++] = sel->twin;
+			wins[mi++] = sel->win;
+		}
 	}
 	for(c = clients; c; c = c->next)
 		if(isvisible(c) && c != sel) {
@@ -281,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;