X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/22399a3bc05406a89f6ad717800b4d9ba41f6e0a..124866e269a783ef51e7a2eeefc0fb5c71d9f037:/client.c

diff --git a/client.c b/client.c
index 03d158f..72e5c32 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;
@@ -366,15 +374,16 @@ 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);
 }
 
@@ -390,10 +399,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);