- it = _map.find(e.xany.window);
-
- if (it != _map.end())
- handler = it->second;
- else
- handler = _fallback;
-
- if (handler)
- handler->handle(e);
- else {
- // some events have to be handled anyways!
- if (e.type == ConfigureRequest) {
- 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(OBDisplay::display, e.xconfigurerequest.window,
- e.xconfigurerequest.value_mask, &xwc);
+#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;
+ }
+
+ // 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;
+ }
+
+ 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
+ printf("found focusin\n");
+ if (fi.xfocus.detail == NotifyNonlinear) {
+ printf("sending focusin\n");
+ dispatch(fi.xfocus.window, fi);
+ break;
+ }