rm old comment

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 33d8ba2d8150b9f178d81540ec6dae097101c83f..6beff8dc3bcc2019590f0d07dd5f6e480482397a 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -37,56 +37,117 @@ void OtkEventDispatcher::clearHandler(Window id)
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
-  OtkEventHandler *handler;
-  OtkEventMap::iterator it;
 
   while (XPending(OBDisplay::display)) {
     XNextEvent(OBDisplay::display, &e);
 
-#if 0
+#if 0//defined(DEBUG)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    // 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);
+    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;
+        }
       }
-    } else {
-      // normal events
-      
-      it = _map.find(e.xany.window);
+    }
+    
+    dispatch(win, e);
+  }
+}
 
-      if (it != _map.end())
-        handler = it->second;
-      else
-        handler = _fallback;
+void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
+{
+  OtkEventHandler *handler = 0;
+  OtkEventMap::iterator it;
 
-      if (handler)
-        handler->handle(e);
-    }
+  // master gets everything first
+  if (_master)
+    _master->handle(e);
+
+  // find handler for the chosen window
+  it = _map.find(win);
 
-    if (_master)
-      _master->handle(e);
+  if (it != _map.end()) {
+    // if we found a handler
+    handler = it->second;
+  } else if (e.type == ConfigureRequest) {
+    // 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);
+  } else {
+    // grab a falback if it exists
+    handler = _fallback;
   }
+
+  if (handler)
+    handler->handle(e);
 }
 
 OtkEventHandler *OtkEventDispatcher::findHandler(Window win)