X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=d0716fa842466b0f419b63de4d7f1bf76c451afb;hp=1454b0b767fd243ea8efe045ce8cd973ebe5bbf6;hb=2d81b78b853565a3e34a8a9190e2362a6fdde739;hpb=154497541d1378d3aded02df06029de94d8af586

diff --git a/event.c b/event.c
index 1454b0b..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 *
@@ -135,19 +135,11 @@ buttonpress(XEvent *e) {
 					else
 						toggleview(buf);
 				}
-				else if(ev->button == Button4)
-					shiftview("-1");
-				else if(ev->button == Button5)
-					shiftview("1");
 				return;
 			}
 		}
-		if(ev->x < x + blw && ev->button == Button1)
+		if((ev->x < x + blw) && ev->button == Button1)
 			setlayout(NULL);
-		else if(ev->button == Button4)
-			focusclient("-1");
-		else if(ev->button == Button5)
-			focusclient("1");
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -344,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 */