X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=8f5ad64fc89c4d74e022190be166c626fea86710;hb=25060031a5e9a505c53d8462c087d80013ffdc16;hp=bb0647a1807edbeb8feada11d1de59f6dfd1a57a;hpb=daae3bba504fc705c5fd56363b656937eee5deb4;p=dwm.git

diff --git a/view.c b/view.c
index bb0647a..8f5ad64 100644
--- a/view.c
+++ b/view.c
@@ -59,8 +59,9 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
+	maximized = False;
+
 	for(c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
 		}
@@ -68,11 +69,7 @@ dofloat(Arg *arg)
 			ban(c);
 	}
 	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+		focus(getnext(clients));
 	restack();
 }
 
@@ -82,6 +79,8 @@ dotile(Arg *arg)
 	int h, i, n, w;
 	Client *c;
 
+	maximized = False;
+
 	w = sw - mw;
 	for(n = 0, c = clients; c; c = c->next)
 		if(isvisible(c) && !c->isfloat)
@@ -93,7 +92,6 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
@@ -133,11 +131,7 @@ dotile(Arg *arg)
 			ban(c);
 	}
 	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+		focus(getnext(clients));
 	restack();
 }
 
@@ -175,6 +169,26 @@ focusprev(Arg *arg)
 	}
 }
 
+void
+growcol(Arg *arg)
+{
+	Client *c = getnext(clients);
+
+	if(!sel || !c || !getnext(c->next) || (arrange != dotile))
+		return;
+	if(sel == getnext(clients)) {
+		if(mw + arg->i > sw - 100)
+			return;
+		mw += arg->i;
+	}
+	else {
+		if(mw - arg->i < 100)
+			return;
+		mw -= arg->i;
+	}
+	arrange(NULL);
+}
+
 Bool
 isvisible(Client *c)
 {
@@ -213,13 +227,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) {
@@ -280,6 +296,7 @@ viewall(Arg *arg)
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = True;
+	reorder();
 	arrange(NULL);
 }
 
@@ -288,7 +305,7 @@ zoom(Arg *arg)
 {
 	Client *c = sel;
 
-	if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+	if(!c || (arrange != dotile) || c->isfloat || maximized)
 		return;
 
 	if(c == getnext(clients))