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

diff --git a/view.c b/view.c
index 424ee5a..4b4c9eb 100644
--- a/view.c
+++ b/view.c
@@ -59,18 +59,17 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
+	maximized = False;
+
 	for(c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
 	}
-	if((sel = getnext(clients)))
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel))
+		focus(getnext(clients));
 	restack();
 }
 
@@ -80,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)
@@ -91,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);
@@ -130,10 +130,8 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if((sel = getnext(clients)))
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel))
+		focus(getnext(clients));
 	restack();
 }
 
@@ -183,6 +181,26 @@ isvisible(Client *c)
 }
 
 void
+resizecol(Arg *arg)
+{
+	Client *c = getnext(clients);
+
+	if(!sel || !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);
+}
+
+void
 restack()
 {
 	static unsigned int nwins = 0;
@@ -209,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) {
@@ -270,11 +290,22 @@ view(Arg *arg)
 }
 
 void
+viewall(Arg *arg)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = True;
+	reorder();
+	arrange(NULL);
+}
+
+void
 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))