X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=81f4280a4aab62861a5f32e572b8aae756b65e2f;hb=e316cf53f618dd1dd82828ca5c4e566968473f3a;hp=0a7df776356c3274db1fc2d8473306a2c852463a;hpb=8a6679b3b4999559059df3ae9e08951099511036;p=dwm.git

diff --git a/client.c b/client.c
index 0a7df77..81f4280 100644
--- a/client.c
+++ b/client.c
@@ -82,22 +82,29 @@ ban(Client *c)
 void
 focus(Client *c)
 {
-	Client *old = sel;
+	Client *old;
 
 	if(!issel)
 		return;
 	if(!sel)
 		sel = c;
 	else if(sel != c) {
-		if(sel->ismax)
+		if(maximized)
 			togglemax(NULL);
+		old = sel;
 		sel = c;
-		grabbuttons(old, False);
-		drawtitle(old);
+		if(old) {
+			grabbuttons(old, False);
+			drawtitle(old);
+		}
+	}
+	if(c) {
+		grabbuttons(c, True);
+		drawtitle(c);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
-	grabbuttons(c, True);
-	drawtitle(c);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
 Client *
@@ -241,7 +248,10 @@ manage(Window w, XWindowAttributes *wa)
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
 
-	attach(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
 
 	settitle(c);
 	if(isvisible(c))
@@ -363,12 +373,13 @@ void
 togglemax(Arg *arg)
 {
 	int ox, oy, ow, oh;
+	Client *c;
 	XEvent ev;
 
 	if(!sel)
 		return;
 
-	if((sel->ismax = !sel->ismax)) {
+	if((maximized = !maximized)) {
 		ox = sel->x;
 		oy = sel->y;
 		ow = sel->w;
@@ -379,6 +390,9 @@ togglemax(Arg *arg)
 		sel->h = sh - 2 - bh;
 
 		restack();
+		for(c = getnext(clients); c; c = getnext(c->next))
+			if(c != sel)
+				ban(c);
 		resize(sel, arrange == dofloat, TopLeft);
 
 		sel->x = ox;
@@ -387,37 +401,36 @@ togglemax(Arg *arg)
 		sel->h = oh;
 	}
 	else
-		resize(sel, False, TopLeft);
+		arrange(NULL);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 unmanage(Client *c)
 {
-	Client *tc;
+	Client *tc, *fc;
 	Window trans;
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
-	XGetTransientForHint(dpy, c->win, &trans);
-
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->twin);
-
 	detach(c);
 	if(sel == c) {
+		XGetTransientForHint(dpy, c->win, &trans);
 		if(trans && (tc = getclient(trans)) && isvisible(tc))
-			sel = tc;
+			fc = tc;
 		else
-			sel = getnext(clients);
+			fc = getnext(clients);
+		focus(fc);
 	}
+
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	XDestroyWindow(dpy, c->twin);
+
 	free(c->tags);
 	free(c);
 
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	if(sel)
-		focus(sel);
 	arrange(NULL);
 }