applied sander's patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 88e1b10..36d873f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -122,24 +122,22 @@ buttonpress(XEvent *e)
                }
        }
        else if((c = getclient(ev->window))) {
+               higher(c);
                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               higher(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))
                                movemouse(c);
-                       }
                        break;
                case Button2:
-                       lower(c);
+                       if(!c->ismax && arrange != dofloat && !c->isfloat)
+                               zoom(NULL);
                        break;
                case Button3:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               higher(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))
                                resizemouse(c);
-                       }
                        break;
                }
        }
@@ -156,22 +154,17 @@ configurerequest(XEvent *e)
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
-               if(c->isfloat) {
-                       if(ev->value_mask & CWX)
-                               c->x = ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = ev->y;
-                       if(ev->value_mask & CWWidth)
-                               c->w = ev->width;
-                       if(ev->value_mask & CWHeight)
-                               c->h = ev->height;
-               }
+               if(ev->value_mask & CWX)
+                       c->x = ev->x;
+               if(ev->value_mask & CWY)
+                       c->y = ev->y;
+               if(ev->value_mask & CWWidth)
+                       c->w = ev->width;
+               if(ev->value_mask & CWHeight)
+                       c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                gravitate(c, False);
-
-               resize(c, True, TopLeft);
-
                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;
@@ -193,6 +186,11 @@ configurerequest(XEvent *e)
                        /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }
+               XSync(dpy, False);
+               if(c->isfloat)
+                       resize(c, False, TopLeft);
+               else
+                       arrange(NULL);
        }
        else {
                wc.x = ev->x;
@@ -203,8 +201,8 @@ configurerequest(XEvent *e)
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+               XSync(dpy, False);
        }
-       XSync(dpy, False);
 }
 
 static void
@@ -223,7 +221,7 @@ enternotify(XEvent *e)
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
-       if(ev->detail == NotifyInferior)
+       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
@@ -359,20 +357,12 @@ grabkeys()
 
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
-               /* normal */
-               XUngrabKey(dpy, code, key[i].mod, root);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
-               /* capslock */
-               XUngrabKey(dpy, code, key[i].mod | LockMask, root);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               /* numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
                                GrabModeAsync, GrabModeAsync);
-               /* capslock & numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
        }