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

diff --git a/view.c b/view.c
index 21efa16..8df93ef 100644
--- a/view.c
+++ b/view.c
@@ -57,7 +57,7 @@ detach(Client *c)
 void
 dofloat(Arg *arg)
 {
-	Client *c, *fc;
+	Client *c;
 
 	maximized = False;
 
@@ -77,13 +77,13 @@ void
 dotile(Arg *arg)
 {
 	int h, i, n, w;
-	Client *c, *fc;
+	Client *c;
 
 	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)
@@ -181,6 +181,31 @@ isvisible(Client *c)
 }
 
 void
+resizecol(Arg *arg)
+{
+	unsigned int n;
+	Client *c;
+
+	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;
+
+	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,13 +308,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->isfloat; c = c->next)
+		if(isvisible(c))
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if(c == getnext(clients))
-		if(!(c = getnext(c->next)))
+	if((c = sel) == getnext(clients))
+		if(!(c = getnext(c->next)) || c->isfloat)
 			return;
 	detach(c);
 	c->next = clients;