removed spow(x, 0); calls, I did them for consistency's sake, but it should be rather...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 2773c6f..d0716fa 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,7 +16,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -140,12 +138,8 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
-               if(ev->x < x + blw)
-                       switch(ev->button) {
-                       case Button1:
-                               setlayout(NULL);
-                               break;
-                       }
+               if((ev->x < x + blw) && ev->button == Button1)
+                       setlayout(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -242,11 +236,11 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if((c = getclient(ev->window)) && isvisible(c))
+       if((c = getclient(ev->window)))
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               focustopvisible();
+               focus(NULL);
        }
 }
 
@@ -342,8 +336,10 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = getclient(ev->window)) && (ev->event == root)) {
+               if(ev->send_event || c->unmapped-- == 0)
+                       unmanage(c);
+       }
 }
 
 /* extern */