applied Jukkas patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 1939cd5..83301bc 100644 (file)
--- a/event.c
+++ b/event.c
@@ -49,6 +49,7 @@ movemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
+       c->ismax = False;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
@@ -92,6 +93,7 @@ resizemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
+       c->ismax = False;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
@@ -108,9 +110,9 @@ resizemouse(Client *c) {
                case MotionNotify:
                        XSync(dpy, False);
                        if((nw = abs(ocx - ev.xmotion.x)))
-                               c->w = abs(ocx - ev.xmotion.x);
+                               c->w = nw;
                        if((nh = abs(ocy - ev.xmotion.y)))
-                               c->h = abs(ocy - ev.xmotion.y);
+                               c->h = nh;
                        c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
                        c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
                        if(ocx <= ev.xmotion.x)
@@ -168,13 +170,13 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
-                       restack(c);
+                       restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
-                       restack(c);
+                       restack();
                        resizemouse(c);
                }
        }
@@ -386,7 +388,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
-grabkeys() {
+grabkeys(void) {
        static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeyCode code;
@@ -406,7 +408,7 @@ grabkeys() {
 }
 
 void
-procevent() {
+procevent(void) {
        XEvent ev;
 
        while(XPending(dpy)) {