X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=ac201e60e13ba39ceafba9fa52cd68cd860f9793;hb=0915da8842fd6e16b804ae3205ec2f6baaaa342c;hp=86902d4779b638a374a8e00498f5311841c64e17;hpb=26157e6973f240a9b5ee407b9d2d5eca9358844f;p=dwm.git

diff --git a/view.c b/view.c
index 86902d4..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;
@@ -57,7 +64,7 @@ detach(Client *c)
 void
 dofloat(Arg *arg)
 {
-	Client *c, *fc;
+	Client *c;
 
 	maximized = False;
 
@@ -68,9 +75,8 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!(fc = sel) || !isvisible(fc))
-		fc = getnext(clients);
-	focus(fc);
+	if(!sel || !isvisible(sel))
+		focus(getnext(clients));
 	restack();
 }
 
@@ -78,7 +84,7 @@ void
 dotile(Arg *arg)
 {
 	int h, i, n, w;
-	Client *c, *fc;
+	Client *c;
 
 	maximized = False;
 
@@ -131,9 +137,8 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!(fc = sel) || !isvisible(fc))
-		fc = getnext(clients);
-	focus(fc);
+	if(!sel || !isvisible(sel))
+		focus(getnext(clients));
 	restack();
 }
 
@@ -183,6 +188,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;
@@ -209,13 +239,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) {
@@ -283,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;