namespace otk {
-OtkEventDispatcher::OtkEventDispatcher()
+EventDispatcher::EventDispatcher()
: _fallback(0), _master(0)
{
}
-OtkEventDispatcher::~OtkEventDispatcher()
+EventDispatcher::~EventDispatcher()
{
}
-void OtkEventDispatcher::clearAllHandlers(void)
+void EventDispatcher::clearAllHandlers(void)
{
_map.clear();
}
-void OtkEventDispatcher::registerHandler(Window id, OtkEventHandler *handler)
+void EventDispatcher::registerHandler(Window id, EventHandler *handler)
{
- _map.insert(std::pair<Window, OtkEventHandler*>(id, handler));
+ _map.insert(std::pair<Window, EventHandler*>(id, handler));
}
-void OtkEventDispatcher::clearHandler(Window id)
+void EventDispatcher::clearHandler(Window id)
{
_map.erase(id);
}
-void OtkEventDispatcher::dispatchEvents(void)
+void EventDispatcher::dispatchEvents(void)
{
XEvent e;
- while (XPending(OBDisplay::display)) {
- XNextEvent(OBDisplay::display, &e);
+ while (XPending(**display)) {
+ XNextEvent(**display, &e);
#if 0//defined(DEBUG)
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;
- }
+ 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;
+ }
- // 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;
+ // grab the lasttime and hack up the modifiers
+ switch (e.type) {
+ case ButtonPress:
+ case ButtonRelease:
+ _lasttime = e.xbutton.time;
+ e.xbutton.state &= ~(LockMask | display->numLockMask() |
+ display->scrollLockMask());
+ break;
+ case KeyPress:
+ e.xkey.state &= ~(LockMask | display->numLockMask() |
+ display->scrollLockMask());
+ break;
+ case MotionNotify:
+ _lasttime = e.xmotion.time;
+ e.xmotion.state &= ~(LockMask | display->numLockMask() |
+ display->scrollLockMask());
+ break;
+ case PropertyNotify:
+ _lasttime = e.xproperty.time;
+ break;
+ case EnterNotify:
+ case LeaveNotify:
+ _lasttime = e.xcrossing.time;
+ break;
+ }
+
+ dispatch(win, e);
}
+ }
+}
- 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
- if (fi.xfocus.detail == NotifyNonlinear) {
- dispatch(fi.xfocus.window, fi);
- break;
- }
- }
+void EventDispatcher::dispatchFocus(const XEvent &e)
+{
+ // ignore focus changes from grabs
+ if (e.xfocus.mode == NotifyGrab) // ||
+ // From Metacity, from WindowMaker, ignore all funky pointer root events
+ // its commented out cuz I don't think we need this at all. If problems
+ // arise we can look into it
+ //e.xfocus.detail > NotifyNonlinearVirtual)
+ 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;
}
-
- dispatch(win, e);
+
+ dispatch(e.xfocus.window, e);
+ //printf("Sent FocusOut 0x%lx\n", e.xfocus.window);
}
}
-void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
+void EventDispatcher::dispatch(Window win, const XEvent &e)
{
- OtkEventHandler *handler = 0;
- OtkEventMap::iterator it;
+ EventHandler *handler = 0;
+ EventMap::iterator it;
// master gets everything first
if (_master)
xwc.sibling = e.xconfigurerequest.above;
xwc.stack_mode = e.xconfigurerequest.detail;
- XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
+ XConfigureWindow(**display, e.xconfigurerequest.window,
e.xconfigurerequest.value_mask, &xwc);
} else {
// grab a falback if it exists
handler->handle(e);
}
-OtkEventHandler *OtkEventDispatcher::findHandler(Window win)
+EventHandler *EventDispatcher::findHandler(Window win)
{
- OtkEventMap::iterator it = _map.find(win);
+ EventMap::iterator it = _map.find(win);
if (it != _map.end())
return it->second;
return 0;
projects / chaz / openbox / blobdiff