X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=040dd15fc9d0419d9baf1ef3563701bafda95947;hb=caa7ab536224b0bf4dcd2790a51ead6b7a6cf119;hp=03d158f16648b40cdfd64f6aa9ce15b8a6451dc1;hpb=22399a3bc05406a89f6ad717800b4d9ba41f6e0a;p=dwm.git

diff --git a/client.c b/client.c
index 03d158f..040dd15 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;
@@ -297,6 +305,8 @@ togglefloating(const char *arg) {
 	if(!sel || lt->arrange == floating)
 		return;
 	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating && sel->isfixed)
+		resize(sel, sel->x, sel->y, sel->minw, sel->minh, True);
 	lt->arrange();
 }
 
@@ -366,21 +376,21 @@ updatetitle(Client *c) {
 	if(!name.nitems)
 		return;
 	if(name.encoding == XA_STRING)
-		strncpy(c->name, (char *)name.value, sizeof c->name);
+		strncpy(c->name, (char *)name.value, sizeof c->name - 1);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 		&& n > 0 && *list)
 		{
-			strncpy(c->name, *list, sizeof c->name);
+			strncpy(c->name, *list, sizeof c->name - 1);
 			XFreeStringList(list);
 		}
 	}
+	c->name[sizeof c->name - 1] = '\0';
 	XFree(name.value);
 }
 
 void
 unmanage(Client *c) {
-	Client *nc;
 	XWindowChanges wc;
 
 	wc.border_width = c->oldborder;
@@ -390,10 +400,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);