OtkEventDispatcher::OtkEventDispatcher()
: _fallback(0), _master(0), _focus(None)
{
+ _focus_e.xfocus.display = OBDisplay::display;
_focus_e.xfocus.mode = NotifyNormal;
_focus_e.xfocus.detail = NotifyNonlinear;
+
+ _crossing_e.xcrossing.display = OBDisplay::display;
+ _crossing_e.xcrossing.mode = NotifyNormal;
+ _crossing_e.xcrossing.detail = NotifyNonlinear;
}
OtkEventDispatcher::~OtkEventDispatcher()
{
OtkEventMap::iterator it;
XEvent e;
- Window focus = _focus;
- Window unfocus = None;
+ Window focus = None, unfocus = None;
+ Window enter = None, leave = None;
+ Window enter_root = None, leave_root = None;
while (XPending(OBDisplay::display)) {
XNextEvent(OBDisplay::display, &e);
} else if (e.type == FocusIn) {
// any other types are not ones we're interested in
if (e.xfocus.detail == NotifyNonlinear) {
- if (e.xfocus.window != focus) {
- if (focus)
- unfocus = focus;
- focus = e.xfocus.window;
- printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
- }
+ focus = e.xfocus.window;
+ unfocus = None;
+ printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
}
} else if (e.type == FocusOut) {
// any other types are not ones we're interested in
if (e.xfocus.detail == NotifyNonlinear) {
- if (e.xfocus.window == focus) {
- unfocus = focus;
- focus = None;
- printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
- }
+ unfocus = e.xfocus.window;
+ focus = None;
+ printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
+ }
+/* // madly compress all crossing events
+ } else if (e.type == EnterNotify) {
+ // any other types are not ones we're interested in
+ if (e.xcrossing.mode == NotifyNormal) {
+ // any other types are not ones we're interested in
+ enter = e.xcrossing.window;
+ enter_root = e.xcrossing.root;
+ printf("Enter enter=%lx leave=%lx\n", enter, leave);
}
+ } else if (e.type == LeaveNotify) {
+ // any other types are not ones we're interested in
+ if (e.xcrossing.mode == NotifyNormal) {
+ leave = e.xcrossing.window;
+ leave_root = e.xcrossing.root;
+ printf("Leave enter=%lx leave=%lx\n", enter, leave);
+ }*/
} else {
// normal events
dispatch(e);
}
}
- if (focus != _focus) {
+ if (unfocus != None) {
+ // the last focus event was an FocusOut, so where the hell is the focus at?
+ printf("UNFOCUSING: %lx\n", unfocus);
+ _focus_e.xfocus.type = FocusOut;
+ _focus_e.xfocus.window = unfocus;
+ dispatch(_focus_e);
+
+ _focus = None;
+ } else if (focus != None) {
+ // the last focus event was a FocusIn, so unfocus what used to be focus and
+ // focus this new target
+ if (_focus != None) {
+ printf("UNFOCUSING: %lx\n", _focus);
+ _focus_e.xfocus.type = FocusOut;
+ _focus_e.xfocus.window = _focus;
+ dispatch(_focus_e);
+ }
+ printf("FOCUSING: %lx\n", focus);
_focus_e.xfocus.type = FocusIn;
_focus_e.xfocus.window = focus;
dispatch(_focus_e);
+
_focus = focus;
}
- if (unfocus != None) {
- _focus_e.xfocus.type = FocusOut;
- _focus_e.xfocus.window = unfocus;
- dispatch(_focus_e);
+
+ if (leave != None) {
+ _crossing_e.xcrossing.type = LeaveNotify;
+ _crossing_e.xcrossing.window = leave;
+ _crossing_e.xcrossing.root = leave_root;
+ dispatch(_crossing_e);
+ }
+ if (enter != None) {
+ _crossing_e.xcrossing.type = EnterNotify;
+ _crossing_e.xcrossing.window = enter;
+ _crossing_e.xcrossing.root = enter_root;
+ dispatch(_crossing_e);
}
}