handling WM_STATE seems to make DnD in gtk/qt apps working, well let's handle this...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index a6b7815..badb875 100644 (file)
--- a/client.c
+++ b/client.c
@@ -53,6 +53,13 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
                                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;
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;


@@ -60,12 +67,6 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 
 /* extern functions */
 
 
 /* extern functions */
 

-void
-ban(Client *c) {
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
-}
-

 void
 configure(Client *c) {
        XEvent synev;
 void
 configure(Client *c) {
        XEvent synev;


@@ -85,26 +86,24 @@ configure(Client *c) {
 
 void
 focus(Client *c) {
 
 void
 focus(Client *c) {

-       Client *old;
-
-       if(!issel || (c && !isvisible(c)))
+       if(c && !isvisible(c))

                return;
                return;

-       if(!sel)
-               sel = c;
-       else if(sel != c) {
-               old = sel;
-               sel = c;
-               if(old) {
-                       grabbuttons(old, False);
-                       drawtitle(old);
-               }
+       if(sel && sel != c) {
+               grabbuttons(sel, False);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);

        }
        if(c) {
                detachstack(c);
                c->snext = stack;
                stack = c;
                grabbuttons(c, True);
        }
        if(c) {
                detachstack(c);
                c->snext = stack;
                stack = c;
                grabbuttons(c, True);

-               drawtitle(c);
+       }
+       sel = c;
+       drawstatus();
+       if(!selscreen)
+               return;
+       if(c) {
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else


@@ -121,16 +120,6 @@ getclient(Window w) {
        return NULL;
 }
 
        return NULL;
 }
 

-Client *
-getctitle(Window w) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->twin == w)
-                       return c;
-       return NULL;
-}
-

 void
 killclient(Arg *arg) {
        if(!sel)
 void
 killclient(Arg *arg) {
        if(!sel)


@@ -145,62 +134,60 @@ void
 manage(Window w, XWindowAttributes *wa) {
        Client *c;
        Window trans;
 manage(Window w, XWindowAttributes *wa) {
        Client *c;
        Window trans;

-       XSetWindowAttributes twa;

 
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;

-       c->border = 0;
-       c->x = c->tx = wa->x;
-       c->y = c->ty = wa->y;
-       c->w = c->tw = wa->width;
+       c->x = wa->x;
+       c->y = wa->y;
+       c->w = wa->width;

        c->h = wa->height;
        c->h = wa->height;

-       c->th = bh;
-       updatesizehints(c);
-       if(c->x + c->w + 2 * BORDERPX > sw)
-               c->x = sw - c->w - 2 * BORDERPX;
-       if(c->x < sx)
+       if(c->w == sw && c->h == sh) {
+               c->border = 0;

                c->x = sx;
                c->x = sx;

-       if(c->y + c->h + 2 * BORDERPX > sh)
-               c->y = sh - c->h - 2 * BORDERPX;
-       if(c->h != sh && c->y < bh)
-               c->y = bh;
+               c->y = sy;
+       }
+       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)
+                       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);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);

-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask | EnterWindowMask;
-       c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
-                       0, DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);

        grabbuttons(c, False);
        grabbuttons(c, False);

+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

        updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)
                c->isfloat = trans || c->isfixed;
        updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)
                c->isfloat = trans || c->isfixed;

-       resizetitle(c);

        if(clients)
                clients->prev = c;
        c->next = clients;
        c->snext = stack;
        stack = clients = c;
        if(clients)
                clients->prev = c;
        c->next = clients;
        c->snext = stack;
        stack = clients = c;

-       ban(c);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->win);

-       XMapWindow(dpy, c->twin);
+       setclientstate(c, NormalState);

        if(isvisible(c))
                focus(c);
        arrange();
 }
 
 void
        if(isvisible(c))
                focus(c);
        arrange();
 }
 
 void

-resize(Client *c, Bool sizehints, Corner sticky) {
-       int bottom = c->y + c->h;
-       int right = c->x + c->w;
+resize(Client *c, Bool sizehints) {

        XWindowChanges wc;
 
        XWindowChanges wc;
 

+       if(c->w <= 0 || c->h <= 0)
+               return;

        if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
        if(sizehints) {
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;


@@ -215,46 +202,29 @@ resize(Client *c, Bool sizehints, Corner sticky) {
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }

-       if(sticky == TopRight || sticky == BotRight)
-               c->x = right - c->w;
-       if(sticky == BotLeft || sticky == BotRight)
-               c->y = bottom - c->h;
+       if(c->w == sw && c->h == sh)
+               c->border = 0;
+       else
+               c->border = BORDERPX;

        /* offscreen appearance fixes */
        /* offscreen appearance fixes */

-       if(c->x + c->w < sx)
-               c->x = sx;
-       if(c->y + c->h < bh)
-               c->y = bh;

        if(c->x > sw)
        if(c->x > sw)

-               c->x = sw - c->w;
+               c->x = sw - c->w - 2 * c->border;

        if(c->y > sh)
        if(c->y > sh)

-               c->y = sh - c->h;
-       resizetitle(c);
+               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;
        wc.height = c->h;
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
        wc.height = c->h;

-       if(c->w == sw && c->h == sh)
-               wc.border_width = 0;
-       else
-               wc.border_width = BORDERPX;
+       wc.border_width = c->border;

        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
        configure(c);
        XSync(dpy, False);
 }
 
        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
        configure(c);
        XSync(dpy, False);
 }
 

-void
-resizetitle(Client *c) {
-       c->tw = textw(c->name);
-       if(c->tw > c->w)
-               c->tw = c->w + 2 * BORDERPX;
-       c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
-       c->ty = c->y;
-       if(isvisible(c))
-               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
-       else
-               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-}
-

 void
 updatesizehints(Client *c) {
        long msize;
 void
 updatesizehints(Client *c) {
        long msize;


@@ -331,7 +301,7 @@ unmanage(Client *c) {
                focus(nc);
        }
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
                focus(nc);
        }
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       XDestroyWindow(dpy, c->twin);
+       setclientstate(c, WithdrawnState);

        free(c->tags);
        free(c);
        XSync(dpy, False);
        free(c->tags);
        free(c);
        XSync(dpy, False);