X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=6c15a60bcf8d0aa9be411a517971eaf42b24630b;hb=915b171befc55dc12daffe5814cdf6332083f2ad;hp=36802f164d59f021e210d1a1e88ec00983040687;hpb=6062fe404ce5f2505494132d5454370d696625ca;p=chaz%2Fopenbox diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index 36802f16..6c15a60b 100644 --- a/otk/eventdispatcher.cc +++ b/otk/eventdispatcher.cc @@ -11,15 +11,8 @@ namespace otk { OtkEventDispatcher::OtkEventDispatcher() - : _fallback(0), _master(0), _focus(None) + : _fallback(0), _master(0) { - _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() @@ -44,9 +37,6 @@ void OtkEventDispatcher::clearHandler(Window id) void OtkEventDispatcher::dispatchEvents(void) { XEvent e; - 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); @@ -55,139 +45,106 @@ void OtkEventDispatcher::dispatchEvents(void) printf("Event %d window %lx\n", e.type, e.xany.window); #endif - Window win; - - // pick a window - switch (e.type) { - case UnmapNotify: - win = e.xunmap.window; - break; - case DestroyNotify: - win = e.xdestroywindow.window; - break; - case ConfigureRequest: - win = e.xconfigurerequest.window; - break; - default: - win = e.xany.window; - } - - // grab the lasttime and hack up the modifiers - switch (e.type) { - case ButtonPress: - case ButtonRelease: - _lasttime = e.xbutton.time; - e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() | - OBDisplay::scrollLockMask()); - break; - case KeyPress: - e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() | - OBDisplay::scrollLockMask()); - break; - case MotionNotify: - _lasttime = e.xmotion.time; - e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() | - OBDisplay::scrollLockMask()); - break; - case PropertyNotify: - _lasttime = e.xproperty.time; - break; - case EnterNotify: - case LeaveNotify: - _lasttime = e.xcrossing.time; - break; - } - - // madly compress all focus events - if (e.type == FocusIn) { - // any other types are not ones we're interested in - if (e.xfocus.detail == NotifyNonlinear) { - 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) { - 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); + if (e.type == FocusIn || e.type == FocusOut) { + // focus events are a beast all their own.. yuk, hate, etc. + dispatchFocus(e); + } else { + Window win; + + // pick a window + switch (e.type) { + case UnmapNotify: + win = e.xunmap.window; + break; + case DestroyNotify: + win = e.xdestroywindow.window; + break; + case ConfigureRequest: + win = e.xconfigurerequest.window; + break; + default: + win = e.xany.window; } - } 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); + + // grab the lasttime and hack up the modifiers + switch (e.type) { + case ButtonPress: + case ButtonRelease: + _lasttime = e.xbutton.time; + e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() | + OBDisplay::scrollLockMask()); + break; + case KeyPress: + e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() | + OBDisplay::scrollLockMask()); + break; + case MotionNotify: + _lasttime = e.xmotion.time; + e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() | + OBDisplay::scrollLockMask()); + break; + case PropertyNotify: + _lasttime = e.xproperty.time; + break; + case EnterNotify: + case LeaveNotify: + _lasttime = e.xcrossing.time; + break; } - } else { - // normal events + dispatch(win, e); } } +} - 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.xfocus.window, _focus_e); - - _focus = None; - } else if (focus != None && focus != _focus) { - // the last focus event was a FocusIn, so unfocus what used to be focus and - // focus this new target - //printf("FOCUSING: %lx\n", focus); - _focus_e.xfocus.type = FocusIn; - _focus_e.xfocus.window = focus; - dispatch(_focus_e.xfocus.window, _focus_e); - - if (_focus != None) { - //printf("UNFOCUSING: %lx\n", _focus); - _focus_e.xfocus.type = FocusOut; - _focus_e.xfocus.window = _focus; - dispatch(_focus_e.xfocus.window, _focus_e); - } - - _focus = focus; - } +void OtkEventDispatcher::dispatchFocus(const XEvent &e) +{ + 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"); + + // ignore FocusOut changes from grabs + if (e.xfocus.mode == NotifyGrab) + return; - if (leave != None) { - _crossing_e.xcrossing.type = LeaveNotify; - _crossing_e.xcrossing.window = leave; - _crossing_e.xcrossing.root = leave_root; - dispatch(_crossing_e.xcrossing.window, _crossing_e); - } - if (enter != None) { - _crossing_e.xcrossing.type = EnterNotify; - _crossing_e.xcrossing.window = enter; - _crossing_e.xcrossing.root = enter_root; - dispatch(_crossing_e.xcrossing.window, _crossing_e); + // FocusOut events just make us look for FocusIn events. They are ignored + // otherwise. + XEvent fi; + if (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) { + //printf("Found FocusIn\n"); + dispatchFocus(fi); + // dont unfocus the window we just focused! + if (fi.xfocus.window == e.xfocus.window) + return; + } + + dispatch(e.xfocus.window, e); + //printf("Sent FocusOut 0x%lx\n", e.xfocus.window); } } -void OtkEventDispatcher::dispatch(Window win, const XEvent &e) { +void OtkEventDispatcher::dispatch(Window win, const XEvent &e) +{ OtkEventHandler *handler = 0; OtkEventMap::iterator it; + // master gets everything first if (_master) _master->handle(e); + // find handler for the chosen window it = _map.find(win); - - if (it != _map.end()) + + if (it != _map.end()) { + // if we found a handler handler = it->second; - // these ConfigureRequests require some special attention - else if (e.type == ConfigureRequest) { + } else if (e.type == ConfigureRequest) { // unhandled configure requests must be used to configure the window // directly XWindowChanges xwc; @@ -202,8 +159,10 @@ void OtkEventDispatcher::dispatch(Window win, const XEvent &e) { XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window, e.xconfigurerequest.value_mask, &xwc); - } else + } else { + // grab a falback if it exists handler = _fallback; + } if (handler) handler->handle(e);