applied sanders try2 patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index e959917..0e98f0f 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) {
@@ -135,7 +136,7 @@ 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);
                }
@@ -179,7 +180,7 @@ configurerequest(XEvent *e) {
                                ban(c);
                }
                else
-                       arrange(NULL);
+                       arrange();
        }
        else {
                wc.x = ev->x;
@@ -304,7 +305,7 @@ propertynotify(XEvent *e) {
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                                if(!c->isfloat && (c->isfloat = (trans != 0)))
-                                       arrange(NULL);
+                                       arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesize(c);