applied Jukkas patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index f0e88d0..e3bdea4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -48,13 +48,13 @@ 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(c->x) < sx + SNAP)
+                       if(abs(sx + c->x) < SNAP)

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

-                       if(abs(c->y) < sy + bh + SNAP)
-                               c->y = sy + bh;
-                       if(c->x + c->w > sx + sw - SNAP)
+                       else if(abs((sx + sw) - (c->x + c->w)) < SNAP)

                                c->x = sw - c->w - 2 * BORDERPX;
                                c->x = sw - c->w - 2 * BORDERPX;

-                       if(c->y + c->h > sy + sh - SNAP)
+                       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;
                        resize(c, False, TopLeft);
                        break;
                                c->y = sh - c->h - 2 * BORDERPX;
                        resize(c, False, TopLeft);
                        break;