fixed issue reported by Christian Garbs

[dwm.git] / client.c

diff --git a/client.c b/client.c
index e267b63..cf3a686 100644 (file)
--- 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;
@@ -185,9 +193,11 @@ manage(Window w, XWindowAttributes *wa) {
        c->y = wa->y;
        c->w = wa->width;
        c->h = wa->height;
+       c->oldborder = wa->border_width;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
+               c->border = wa->border_width;
        }
        else {
                if(c->x + c->w + 2 * c->border > wax + waw)
@@ -198,15 +208,16 @@ manage(Window w, XWindowAttributes *wa) {
                        c->x = wax;
                if(c->y < way)
                        c->y = way;
+               c->border = BORDERPX;
        }
+       wc.border_width = c->border;
+       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+       configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        XSelectInput(dpy, w,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        grabbuttons(c, False);
-       c->border = wc.border_width = (c->w == sw && c->h == sh) ? wa->border_width : BORDERPX;
-       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
-       configure(c); /* propagates border_width, if size doesn't change */
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
@@ -363,31 +374,32 @@ 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;
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
+       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);