added pointer warp on drop in resize

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b89264c..e37b9e6 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,7 +7,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 

-/* static functions */
+/* static */

 
 static void
 detachstack(Client *c) {
 
 static void
 detachstack(Client *c) {


@@ -53,12 +53,19 @@ 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;
 }
 

-/* extern functions */
+/* extern */

 
 void
 configure(Client *c) {
 
 void
 configure(Client *c) {


@@ -113,11 +120,26 @@ getclient(Window w) {
        return NULL;
 }
 
        return NULL;
 }
 

+Bool
+isprotodel(Client *c) {
+       int i, n;
+       Atom *protocols;
+       Bool ret = False;
+
+       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               for(i = 0; !ret && i < n; i++)
+                       if(protocols[i] == wmatom[WMDelete])
+                               ret = True;
+               XFree(protocols);
+       }
+       return ret;
+}
+

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

-       if(sel->proto & PROTODELWIN)
+       if(isprotodel(sel))

                sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
        else
                XKillClient(dpy, sel->win);
                sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
        else
                XKillClient(dpy, sel->win);


@@ -142,17 +164,16 @@ manage(Window w, XWindowAttributes *wa) {
        }
        else {
                c->border = BORDERPX;
        }
        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 + 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);
        }
        updatesizehints(c);

-       c->proto = getproto(c->win);

        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);


@@ -169,6 +190,7 @@ manage(Window w, XWindowAttributes *wa) {
        stack = clients = c;
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMapWindow(dpy, c->win);
        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();
        if(isvisible(c))
                focus(c);
        arrange();


@@ -176,13 +198,12 @@ manage(Window w, XWindowAttributes *wa) {
 
 void
 resize(Client *c, Bool sizehints) {
 
 void
 resize(Client *c, Bool sizehints) {

+       float actual, dx, dy, max, min;

        XWindowChanges wc;
 
        XWindowChanges wc;
 

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

        if(sizehints) {
        if(sizehints) {

-               if(c->incw)
-                       c->w -= (c->w - c->basew) % c->incw;
-               if(c->inch)
-                       c->h -= (c->h - c->baseh) % c->inch;

                if(c->minw && c->w < c->minw)
                        c->w = c->minw;
                if(c->minh && c->h < c->minh)
                if(c->minw && c->w < c->minw)
                        c->w = c->minw;
                if(c->minh && c->h < c->minh)


@@ -191,20 +212,46 @@ resize(Client *c, Bool sizehints) {
                        c->w = c->maxw;
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
                        c->w = c->maxw;
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;

+               /* inspired by algorithm from fluxbox */
+               if(c->minay > 0 && c->maxay && (c->h - c->baseh) > 0) {
+                       dx = (float)(c->w - c->basew);
+                       dy = (float)(c->h - c->baseh);
+                       min = (float)(c->minax) / (float)(c->minay);
+                       max = (float)(c->maxax) / (float)(c->maxay);
+                       actual = dx / dy;
+                       if(max > 0 && min > 0 && actual > 0) {
+                               if(actual < min) {
+                                       dy = (dx * min + dy) / (min * min + 1);
+                                       dx = dy * min;
+                                       c->w = (int)dx + c->basew;
+                                       c->h = (int)dy + c->baseh;
+                               }
+                               else if(actual > max) {
+                                       dy = (dx * min + dy) / (max * max + 1);
+                                       dx = dy * min;
+                                       c->w = (int)dx + c->basew;
+                                       c->h = (int)dy + c->baseh;
+                               }
+                       }
+               }
+               if(c->incw)
+                       c->w -= (c->w - c->basew) % c->incw;
+               if(c->inch)
+                       c->h -= (c->h - c->baseh) % c->inch;

        }
        if(c->w == sw && c->h == sh)
                c->border = 0;
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */
        }
        if(c->w == sw && c->h == sh)
                c->border = 0;
        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 > 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;
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;


@@ -247,6 +294,14 @@ updatesizehints(Client *c) {
        }
        else
                c->minw = c->minh = 0;
        }
        else
                c->minw = c->minh = 0;

+       if(c->flags & PAspect) {
+               c->minax = size.min_aspect.x;
+               c->minay = size.min_aspect.y;
+               c->maxax = size.max_aspect.x;
+               c->maxay = size.max_aspect.y;
+       }
+       else
+               c->minax = c->minay = c->maxax = c->maxay = 0;

        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
                                c->maxw == c->minw && c->maxh == c->minh);
 }
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
                                c->maxw == c->minw && c->maxh == c->minh);
 }


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

+       setclientstate(c, WithdrawnState);

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