applied patch of Paul Liu to allow onthefly resizing due to xrandr changes

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b7fde1a..03d158f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -185,13 +185,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)
@@ -200,15 +200,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);
@@ -270,10 +271,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;
@@ -384,10 +381,13 @@ updatetitle(Client *c) {
 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) {