X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=d0716fa842466b0f419b63de4d7f1bf76c451afb;hb=0937cc78bf5d8855dcd757b18e10c7dd49e7a1ab;hp=1da9a6ba3ffd4d0d2d865135c597022cd0d5dcde;hpb=ff957d1eaca73800e59f640351dce35e3ab67f9e;p=dwm.git

diff --git a/event.c b/event.c
index 1da9a6b..d0716fa 100644
--- 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);
@@ -225,19 +221,6 @@ configurenotify(XEvent *e) {
 }
 
 static void
-createnotify(XEvent *e) {
-	static XWindowAttributes wa;
-	XCreateWindowEvent *ev = &e->xcreatewindow;
-
-	if(!XGetWindowAttributes(dpy, ev->window, &wa))
-		return;
-	if(wa.override_redirect)
-		return;
-	if(!getclient(ev->window) && (wa.map_state == IsViewable))
-		manage(ev->window, &wa);
-}
-
-static void
 destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -353,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 */
@@ -363,7 +348,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[ConfigureNotify] = configurenotify,
-/*	[CreateNotify] = createnotify, */
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
 	[LeaveNotify] = leavenotify,