X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=3e9b2395bf963b1ee14a00aec2e8533f46dcba7a;hb=6ee8e3e93b79b7c92246d7d520d5a24be59e5807;hp=64da34374a1ec0f7b41472b1b1f3f704f570f7fe;hpb=b8bccb4ac5222a01ecd6a5f82997ea2ee3b84b8b;p=dwm.git

diff --git a/client.c b/client.c
index 64da343..3e9b239 100644
--- a/client.c
+++ b/client.c
@@ -152,6 +152,14 @@ focus(Client *c) {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
+void
+focustopvisible(void) {
+	Client *c;
+
+	for(c = stack; c && !isvisible(c); c = c->snext);
+	focus(c);
+}
+
 void
 killclient(const char *arg) {
 	XEvent ev;
@@ -296,7 +304,7 @@ void
 togglefloating(const char *arg) {
 	if(!sel || lt->arrange == floating)
 		return;
-	sel->isfloating = !sel->isfloating;
+	sel->isfloating = !sel->isfloating || sel->isfixed;
 	lt->arrange();
 }
 
@@ -365,9 +373,8 @@ updatetitle(Client *c) {
 		XGetWMName(dpy, c->win, &name);
 	if(!name.nitems)
 		return;
-	if(name.encoding == XA_STRING) {
+	if(name.encoding == XA_STRING)
 		strncpy(c->name, (char *)name.value, sizeof c->name - 1);
-	}
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 		&& n > 0 && *list)
@@ -382,7 +389,6 @@ updatetitle(Client *c) {
 
 void
 unmanage(Client *c) {
-	Client *nc;
 	XWindowChanges wc;
 
 	wc.border_width = c->oldborder;
@@ -392,10 +398,8 @@ unmanage(Client *c) {
 	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
 	detach(c);
 	detachstack(c);
-	if(sel == c) {
-		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
-		focus(nc);
-	}
+	if(sel == c)
+		focustopvisible();
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
 	free(c->tags);