renamed/changed

[dwm.git] / mouse.c

diff --git a/mouse.c b/mouse.c
index 07b533c..ff81701 100644 (file)
--- a/mouse.c
+++ b/mouse.c
@@ -13,54 +13,34 @@
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 

-static void
-mmatch(Client *c, int x1, int y1, int x2, int y2)
-{
-       c->r[RFloat].width = abs(x1 - x2);
-       c->r[RFloat].height = abs(y1 - y2);
-       c->r[RFloat].width -=
-               (c->r[RFloat].width - c->size.base_width) % c->size.width_inc;
-       c->r[RFloat].height -=
-               (c->r[RFloat].height - c->size.base_height) % c->size.height_inc;
-       if(c->size.min_width && c->r[RFloat].width < c->size.min_width)
-               c->r[RFloat].width = c->size.min_width;
-       if(c->size.min_height && c->r[RFloat].height < c->size.min_height)
-               c->r[RFloat].height = c->size.min_height;
-       if(c->size.max_width && c->r[RFloat].width > c->size.max_width)
-               c->r[RFloat].width = c->size.max_width;
-       if(c->size.max_height && c->r[RFloat].height > c->size.max_height)
-               c->r[RFloat].height = c->size.max_height;
-       c->r[RFloat].x = (x1 <= x2) ? x1 : x1 - c->r[RFloat].width;
-       c->r[RFloat].y = (y1 <= y2) ? y1 : y1 - c->r[RFloat].height;
-}
-

 void
 mresize(Client *c)
 {
        XEvent ev;
        int old_cx, old_cy;
 
 void
 mresize(Client *c)
 {
        XEvent ev;
        int old_cx, old_cy;
 

-       old_cx = c->r[RFloat].x;
-       old_cy = c->r[RFloat].y;
+       old_cx = c->x;
+       old_cy = c->y;

        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;

-       XGrabServer(dpy);
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-                       c->r[RFloat].width, c->r[RFloat].height);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MouseMask, &ev);
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);

                switch(ev.type) {
                default: break;
                switch(ev.type) {
                default: break;

+               case Expose:
+                       handler[Expose](&ev);
+                       break;

                case MotionNotify:
                case MotionNotify:

-                       XUngrabServer(dpy);
-                       mmatch(c, old_cx, old_cy, ev.xmotion.x, ev.xmotion.y);
-                       XResizeWindow(dpy, c->win, c->r[RFloat].width, c->r[RFloat].height);
-                       XGrabServer(dpy);
+                       XFlush(dpy);
+                       c->w = abs(old_cx - ev.xmotion.x);
+                       c->h = abs(old_cy - ev.xmotion.y);
+                       c->x = (old_cx <= ev.xmotion.x) ? old_cx : old_cx - c->w;
+                       c->y = (old_cy <= ev.xmotion.y) ? old_cy : old_cy - c->h;
+                       resize(c);

                        break;
                case ButtonRelease:
                        break;
                case ButtonRelease:

-                       resize(c);
-                       XUngrabServer(dpy);

                        XUngrabPointer(dpy, CurrentTime);
                        return;
                }
                        XUngrabPointer(dpy, CurrentTime);
                        return;
                }


@@ -75,28 +55,26 @@ mmove(Client *c)
        unsigned int dui;
        Window dummy;
 
        unsigned int dui;
        Window dummy;
 

-       old_cx = c->r[RFloat].x;
-       old_cy = c->r[RFloat].y;
+       old_cx = c->x;
+       old_cy = c->y;

        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);

-       XGrabServer(dpy);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MouseMask, &ev);
+               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);

                switch (ev.type) {
                default: break;
                switch (ev.type) {
                default: break;

+               case Expose:
+                       handler[Expose](&ev);
+                       break;

                case MotionNotify:
                case MotionNotify:

-                       XUngrabServer(dpy);
-                       c->r[RFloat].x = old_cx + (ev.xmotion.x - x1);
-                       c->r[RFloat].y = old_cy + (ev.xmotion.y - y1);
-                       XMoveResizeWindow(dpy, c->win, c->r[RFloat].x, c->r[RFloat].y,
-                                       c->r[RFloat].width, c->r[RFloat].height);
-                       XGrabServer(dpy);
+                       XFlush(dpy);
+                       c->x = old_cx + (ev.xmotion.x - x1);
+                       c->y = old_cy + (ev.xmotion.y - y1);
+                       resize(c);

                        break;
                case ButtonRelease:
                        break;
                case ButtonRelease:

-                       resize(c);
-                       XUngrabServer(dpy);

                        XUngrabPointer(dpy, CurrentTime);
                        return;
                }
                        XUngrabPointer(dpy, CurrentTime);
                        return;
                }