- printf("num=%u scroll=%u\n", OBDisplay::numLockMask(), OBDisplay::scrollLockMask());
-
- // 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;
- }
-
- // 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 (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.y = e.xconfigurerequest.y;
- xwc.width = e.xconfigurerequest.width;
- xwc.height = e.xconfigurerequest.height;
- xwc.border_width = e.xconfigurerequest.border_width;
- xwc.sibling = e.xconfigurerequest.above;
- xwc.stack_mode = e.xconfigurerequest.detail;
-
- XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
- e.xconfigurerequest.value_mask, &xwc);
+ 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;