applied sander's patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index c3169aa..36d873f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -122,41 +122,27 @@ 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;
                }
        }
 }
 
-static void
-clientmessage(XEvent *e)
-{
-       Client *c;
-       XClientMessageEvent *ev = &e->xclient;
-
-       if(ev->message_type == netatom[NetActiveWindow]) {
-               if((c = getclient(ev->window)) && c->tags[tsel])
-                       focus(c);
-       }
-}
-
 static void
 configurerequest(XEvent *e)
 {
@@ -235,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)))
@@ -351,7 +337,6 @@ unmapnotify(XEvent *e)
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
-       [ClientMessage] = clientmessage,
        [ConfigureRequest] = configurerequest,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,