X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=event.c;h=650967ea335817a13bc09279236e398504315f98;hb=9fce8215b7c1b95903adbfd0cb7d6e2822ea063f;hp=0f984f2fae13afa6127e9720145062055933d9db;hpb=b79b5facb104a653314577bb7f15824396b9e94b;p=dwm.git

diff --git a/event.c b/event.c
index 0f984f2..650967e 100644
--- a/event.c
+++ b/event.c
@@ -114,33 +114,29 @@ buttonpress(XEvent *e)
 			}
 			break;
 		case Button4:
-			viewnext(&a);
+			viewprev(&a);
 			break;
 		case Button5:
-			viewprev(&a);
+			viewnext(&a);
 			break;
 		}
 	}
 	else if((c = getclient(ev->window))) {
+		higher(c);
 		focus(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
-			if(!c->ismax) {
-				if(arrange == dofloat || c->isfloat) {
-					higher(c);
-					movemouse(c);
-				}
-				else
-					zoom(NULL);
-			}
+			if(!c->ismax && (arrange == dofloat || c->isfloat))
+				movemouse(c);
+			break;
+		case Button2:
+			zoom(NULL);
 			break;
 		case Button3:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				higher(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat))
 				resizemouse(c);
-			}
 			break;
 		}
 	}
@@ -229,8 +225,11 @@ enternotify(XEvent *e)
 
 	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
 		focus(c);
-	else if(ev->window == root)
+	else if(ev->window == root) {
 		issel = True;
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+		drawall();
+	}
 }
 
 static void
@@ -270,8 +269,10 @@ leavenotify(XEvent *e)
 {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen)
-		issel = True;
+	if((ev->window == root) && !ev->same_screen) {
+		issel = False;
+		drawall();
+	}
 }
 
 static void