- if (e.type == FocusIn || e.type == FocusOut)
- // any other types are not ones we're interested in
- if (e.xfocus.detail != NotifyNonlinear)
- continue;
-
- if (e.type == FocusOut) {
- XEvent fi;
- // send a FocusIn first if one exists
- while (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
- // any other types are not ones we're interested in
- printf("found focusin\n");
- if (fi.xfocus.detail == NotifyNonlinear) {
- printf("sending focusin\n");
- dispatch(fi.xfocus.window, fi);
- break;
- }
- }
+void EventDispatcher::dispatchFocus(const XEvent &e)
+{
+ // ignore focus changes from grabs
+ if (e.xfocus.mode == NotifyGrab)
+ return;
+
+ if (e.type == FocusIn) {
+ //printf("Got FocusIn!\n");
+
+ // send a FocusIn to whatever was just focused
+ dispatch(e.xfocus.window, e);
+ //printf("Sent FocusIn 0x%lx\n", e.xfocus.window);
+
+ } else if (e.type == FocusOut) {
+ //printf("Got FocusOut!\n");
+
+ // FocusOut events just make us look for FocusIn events. They are ignored
+ // otherwise.
+ XEvent fi;
+ if (XCheckTypedEvent(**display, FocusIn, &fi)) {
+ //printf("Found FocusIn\n");
+ dispatchFocus(fi);
+ // dont unfocus the window we just focused!
+ if (fi.xfocus.window == e.xfocus.window)
+ return;