about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:26:32 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-10 11:26:32 +0200
commitfde45ebed844c227a17c21d161f60aa55c8b3c41 (patch)
treef6b04697f927569556e82d2c511525bd166db7f1
parent4bd0d33f57c6fb764ef546a9b0ebfcd20ff1df70 (diff)
downloaddwm-fde45ebed844c227a17c21d161f60aa55c8b3c41.tar.gz
applied sumik's multihead patch
-rw-r--r--client.c2
-rw-r--r--draw.c2
-rw-r--r--event.c15
3 files changed, 13 insertions, 6 deletions
diff --git a/client.c b/client.c
index f268623..773b8f8 100644
--- a/client.c
+++ b/client.c
@@ -49,6 +49,8 @@ ban(Client *c)
 void
 focus(Client *c)
 {
+	if (!issel)
+		return;
 	Client *old = sel;
 	XEvent ev;
 
diff --git a/draw.c b/draw.c
index 5d19bfb..869c2f2 100644
--- a/draw.c
+++ b/draw.c
@@ -138,7 +138,7 @@ drawtitle(Client *c)
 	int i;
 	Bool istile = arrange == dotile;
 
-	if(c == sel) {
+	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->title);
 		XSetWindowBorder(dpy, c->win, dc.fg);
diff --git a/event.c b/event.c
index 36d873f..25ed6fa 100644
--- a/event.c
+++ b/event.c
@@ -114,10 +114,10 @@ buttonpress(XEvent *e)
 			}
 			break;
 		case Button4:
-			viewnext(&a);
+			viewprev(&a);
 			break;
 		case Button5:
-			viewprev(&a);
+			viewnext(&a);
 			break;
 		}
 	}
@@ -226,8 +226,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
@@ -267,8 +270,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
55'>255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290