namespace otk {
OtkEventDispatcher::OtkEventDispatcher()
- : _fallback(0)
+ : _fallback(0), _master(0)
{
}
{
_map.erase(id);
}
-#include <stdio.h>
+
void OtkEventDispatcher::dispatchEvents(void)
{
XEvent e;
while (XPending(OBDisplay::display)) {
XNextEvent(OBDisplay::display, &e);
- it = _map.find(e.xany.window);
+#if 0
+ printf("Event %d window %lx\n", e.type, e.xany.window);
+#endif
- if (it != _map.end())
- handler = it->second;
- else
- handler = _fallback;
+ // these ConfigureRequests require some special attention
+ if (e.type == ConfigureRequest) {
+ // find the actual window! e.xany.window is the parent window
+ it = _map.find(e.xconfigurerequest.window);
- if (handler)
- handler->handle(e);
- else {
- // some events have to be handled anyways!
- if (e.type == ConfigureRequest) {
+ if (it != _map.end())
+ it->second->handle(e);
+ else {
+ // unhandled configure requests must be used to configure the window
+ // directly
XWindowChanges xwc;
xwc.x = e.xconfigurerequest.x;
xwc.sibling = e.xconfigurerequest.above;
xwc.stack_mode = e.xconfigurerequest.detail;
- XConfigureWindow(OBDisplay::display, e.xconfigurerequest.window,
+ XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
e.xconfigurerequest.value_mask, &xwc);
}
+ } else {
+ // normal events
+
+ it = _map.find(e.xany.window);
+
+ if (it != _map.end())
+ handler = it->second;
+ else
+ handler = _fallback;
+
+ if (handler)
+ handler->handle(e);
}
+
+ if (_master)
+ _master->handle(e);
}
}
+OtkEventHandler *OtkEventDispatcher::findHandler(Window win)
+{
+ OtkEventMap::iterator it = _map.find(win);
+ if (it != _map.end())
+ return it->second;
+ return 0;
+}
+
}