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

diff --git a/view.c b/view.c
index 5de34c0..86902d4 100644
--- a/view.c
+++ b/view.c
@@ -57,20 +57,20 @@ detach(Client *c)
 void
 dofloat(Arg *arg)
 {
-	Client *c;
+	Client *c, *fc;
+
+	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(!(fc = sel) || !isvisible(fc))
+		fc = getnext(clients);
+	focus(fc);
 	restack();
 }
 
@@ -78,7 +78,9 @@ void
 dotile(Arg *arg)
 {
 	int h, i, n, w;
-	Client *c;
+	Client *c, *fc;
+
+	maximized = False;
 
 	w = sw - mw;
 	for(n = 0, c = clients; c; c = c->next)
@@ -91,7 +93,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 +131,9 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if((sel = getnext(clients)))
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!(fc = sel) || !isvisible(fc))
+		fc = getnext(clients);
+	focus(fc);
 	restack();
 }
 
@@ -261,7 +261,6 @@ void
 view(Arg *arg)
 {
 	unsigned int i;
-	Client *c;
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = False;
@@ -271,11 +270,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))