removed unneecessary crap

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 1a8de56..1e077fa 100644 (file)
--- a/event.c
+++ b/event.c
@@ -118,21 +118,24 @@ 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))
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               restack(c);
                                movemouse(c);
+                       }
                        break;
                case Button2:
                        zoom(NULL);
                        break;
                case Button3:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat))
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               restack(c);
                                resizemouse(c);
+                       }
                        break;
                }
        }
@@ -251,13 +254,15 @@ keypress(XEvent *e)
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
+       for(i = 0; i < len; i++) {
                if(keysym == key[i].keysym &&
-                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }
+       }
 }
 
 static void
@@ -365,5 +370,6 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
+               XSync(dpy, False);
        }
 }