returning to old bar colorization behavior, like sander proposed for consistency...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 42a6fc0..23dcf55 100644 (file)
--- a/event.c
+++ b/event.c
@@ -48,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(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;
                }
@@ -136,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);
                }