fixed issue reported by Christian Garbs

[dwm.git] / client.c

diff --git a/client.c b/client.c
index f5fb7a4..cf3a686 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,4 +1,5 @@
-/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
@@ -151,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;
@@ -184,13 +193,13 @@ 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->border = 0;
                c->x = sx;
                c->y = sy;
+               c->border = wa->border_width;
        }
        else {
-               c->border = BORDERPX;
                if(c->x + c->w + 2 * c->border > wax + waw)
                        c->x = wax + waw - c->w - 2 * c->border;
                if(c->y + c->h + 2 * c->border > way + wah)
@@ -199,15 +208,16 @@ manage(Window w, XWindowAttributes *wa) {
                        c->x = wax;
                if(c->y < way)
                        c->y = way;
+               c->border = BORDERPX;
        }
-       updatesizehints(c);
-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       grabbuttons(c, False);
        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);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
@@ -269,10 +279,6 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
        if(w <= 0 || h <= 0)
                return;
-       if(w == sw && h == sh)
-               c->border = 0;
-       else
-               c->border = BORDERPX;
        /* offscreen appearance fixes */
        if(x > sw)
                x = sw - w - 2 * c->border;
@@ -368,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);