Added tag 2.4 for changeset 32b246925086910d63147483160281a91a47479f

[dwm.git] / event.c

diff --git a/event.c b/event.c
index e3bdea4..4e11552 100644 (file)
--- a/event.c
+++ b/event.c
@@ -48,14 +48,14 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);

-                       if(abs(sx + c->x) < SNAP)
-                               c->x = sx;
-                       else if(abs((sx + sw) - (c->x + c->w)) < SNAP)
-                               c->x = sw - c->w - 2 * BORDERPX;
-                       if(abs((sy + bh) - c->y) < SNAP)
-                               c->y = sy + bh;
-                       else if(abs((sy + sh) - (c->y + c->h)) < SNAP)
-                               c->y = sh - c->h - 2 * BORDERPX;
+                       if(abs(wax + c->x) < SNAP)
+                               c->x = wax;
+                       else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+                               c->x = wax + waw - c->w - 2 * BORDERPX;
+                       if(abs(way - c->y) < SNAP)
+                               c->y = way;
+                       else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+                               c->y = way + wah - c->h - 2 * BORDERPX;

                        resize(c, False, TopLeft);
                        break;
                }
                        resize(c, False, TopLeft);
                        break;
                }


@@ -244,7 +244,7 @@ expose(XEvent *e) {
 
 static void
 keypress(XEvent *e) {
 
 static void
 keypress(XEvent *e) {

-       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       static unsigned int len = sizeof key / sizeof key[0];

        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;


@@ -256,7 +256,6 @@ keypress(XEvent *e) {
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);

-                       return;

                }
        }
 }
                }
        }
 }


@@ -355,7 +354,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
 
 void
 grabkeys(void) {

-       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       static unsigned int len = sizeof key / sizeof key[0];

        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;