wmii

commit 304e80ca4fd3559bc872ef9b707fed0ac02c6520
parent 778f85c51f05e6c7e68b455911a12d73a099abf4
Author: Kris Maglione <jg@suckless.org>
Date:   Sun, 18 Feb 2007 18:31:58 -0500

Fixed some bugs in the new focus system.

Diffstat:
event.c
 | 
19
+++++++++++++++++--
wmii.h
 | 
1
+

2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/event.c b/event.c
@@ -291,6 +291,8 @@ focusin(XEvent *e) {
 			fprintf(stderr, "\t%s => %s\n", (screen->focus ? screen->focus->name : nil),
 					c->name);
 		}
+		if(ev->mode == NotifyGrab)
+			screen->hasgrab = c;
 		screen->focus = c;
 		update_client_grab(c);
 		if(c->sel)
@@ -302,6 +304,13 @@ focusin(XEvent *e) {
 					"<nil>");
 		}
 		screen->focus = nil;
+	}else if(ev->mode == NotifyGrab) {
+		c = screen->focus;
+		if(c) {
+			screen->focus = nil;
+			if(c->sel)
+				draw_frame(c->sel);
+		}
 	}
 }
 
@@ -313,11 +322,17 @@ focusout(XEvent *e) {
 	if(!((ev->detail == NotifyNonlinear)
 	   ||(ev->detail == NotifyNonlinearVirtual)))
 		return;
-	if(ev->mode == NotifyWhileGrabbed)
-		return;
+	if(ev->mode == NotifyUngrab)
+		screen->hasgrab = nil;
 
 	c = client_of_win(ev->window);
 	if(c) {
+		if(ev->mode == NotifyWhileGrabbed) {
+			if(screen->focus && screen->hasgrab != screen->focus)
+				screen->hasgrab = screen->focus;
+			if(screen->hasgrab == c)
+				return;
+		}
 		if(screen->focus == c)
 			screen->focus = nil;
 		update_client_grab(c);
diff --git a/wmii.h b/wmii.h
@@ -223,6 +223,7 @@ struct WMScreen {
 	Bar *rbar;
 	View *sel;
 	Client *focus;
+	Client *hasgrab;
 	Window barwin;
 
 	XRectangle rect;