X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=a794f448c1b58b30268c3f05266548da0a2f8c30;hb=d2d394eccf2d23eb264a321fe187bb2084beb4b9;hp=71ef677a4f1df0cb4578d9f6d6323d46add7a406;hpb=8aa860d270467ac941d48f6e6905bb7eecf0a8be;p=dwm.git

diff --git a/client.c b/client.c
index 71ef677..a794f44 100644
--- a/client.c
+++ b/client.c
@@ -19,11 +19,11 @@ detachstack(Client *c)
 }
 
 static void
-grabbuttons(Client *c, Bool focus)
+grabbuttons(Client *c, Bool focused)
 {
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
-	if(focus) {
+	if(focused) {
 		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
 		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -223,7 +223,7 @@ manage(Window w, XWindowAttributes *wa)
 	c->th = bh;
 
 	c->border = 0;
-	setsize(c);
+	updatesize(c);
 
 	if(c->x + c->w + 2 > sw)
 		c->x = sw - c->w - 2;
@@ -260,7 +260,7 @@ manage(Window w, XWindowAttributes *wa)
 	c->snext = stack;
 	stack = clients = c;
 
-	settitle(c);
+	updatetitle(c);
 	ban(c);
 	XMapWindow(dpy, c->win);
 	XMapWindow(dpy, c->twin);
@@ -304,12 +304,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
 		wc.border_width = 0;
 	else
 		wc.border_width = 1;
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
 	XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
+updatesize(Client *c)
 {
 	long msize;
 	XSizeHints size;
@@ -348,7 +348,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
+updatetitle(Client *c)
 {
 	char **list = NULL;
 	int n;
@@ -414,19 +414,21 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
+	Client *nc;
+
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	detach(c);
+	detachstack(c);
 	if(sel == c) {
-		for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
-		focus(sel);
+		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+		focus(nc);
 	}
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->twin);
 
-	detachstack(c);
 	free(c->tags);
 	free(c);