separated layout-specific stuff into separate .h and .c files which are included...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 9897640..d0716fa 100644 (file)
--- a/event.c
+++ b/event.c
@@ -16,7 +16,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -138,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);
@@ -301,8 +297,7 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-       fprintf(stderr, "does the window suck? %s\n", wa.map_state == IsViewable ? "no" : "yes");
-       if(wa.override_redirect || wa.map_state != IsViewable)
+       if(wa.override_redirect)
                return;
        if(!getclient(ev->window))
                manage(ev->window, &wa);
@@ -341,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 */