Added tag 3.3 for changeset 0f91934037b0

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 7ccad39..badb875 100644 (file)
--- a/client.c
+++ b/client.c
@@ -53,6 +53,13 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
+static void
+setclientstate(Client *c, long state) {
+       long data[] = {state, None};
+       XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+                       PropModeReplace, (unsigned char *)data, 2);
+}
+
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
@@ -93,7 +100,7 @@ focus(Client *c) {
        }
        sel = c;
        drawstatus();
-       if(!activescreen)
+       if(!selscreen)
                return;
        if(c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
@@ -142,14 +149,14 @@ manage(Window w, XWindowAttributes *wa) {
        }
        else {
                c->border = BORDERPX;
-               if(c->x < wax)
-                       c->x = wax;
-               if(c->y < way)
-                       c->y = way;
                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)
                        c->y = way + wah - c->h - 2 * c->border;
+               if(c->x < wax)
+                       c->x = wax;
+               if(c->y < way)
+                       c->y = way;
        }
        updatesizehints(c);
        c->proto = getproto(c->win);
@@ -169,6 +176,7 @@ manage(Window w, XWindowAttributes *wa) {
        stack = clients = c;
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMapWindow(dpy, c->win);
+       setclientstate(c, NormalState);
        if(isvisible(c))
                focus(c);
        arrange();
@@ -178,6 +186,8 @@ void
 resize(Client *c, Bool sizehints) {
        XWindowChanges wc;
 
+       if(c->w <= 0 || c->h <= 0)
+               return;
        if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
@@ -197,14 +207,14 @@ resize(Client *c, Bool sizehints) {
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */
-       if(c->x + c->w + 2 * c->border < sx)
-               c->x = sx;
-       if(c->y + c->h + 2 * c->border < sy)
-               c->y = sy;
        if(c->x > sw)
                c->x = sw - c->w - 2 * c->border;
        if(c->y > sh)
                c->y = sh - c->h - 2 * c->border;
+       if(c->x + c->w + 2 * c->border < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * c->border < sy)
+               c->y = sy;
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
@@ -291,6 +301,7 @@ unmanage(Client *c) {
                focus(nc);
        }
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       setclientstate(c, WithdrawnState);
        free(c->tags);
        free(c);
        XSync(dpy, False);