make sure that changing sx has no impact on snapping

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 7f040e2..e3bdea4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -18,6 +18,7 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static void
 movemouse(Client *c) {
@@ -47,6 +48,14 @@ movemouse(Client *c) {
                        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;
                        resize(c, False, TopLeft);
                        break;
                }
@@ -135,7 +144,8 @@ buttonpress(XEvent *e) {
                }
                else if(ev->button == Button2)
                        zoom(NULL);
-               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+                               !c->isfixed) {
                        restack();
                        resizemouse(c);
                }