some focus improvements..

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 69fa3d5ab0e428f74ddc49634372da6a380d6cd9..d28a74269d57ad861948334daef414de74100eb2 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -11,8 +11,15 @@
 namespace otk {
 
 OtkEventDispatcher::OtkEventDispatcher()
-  : _fallback(0)
+  : _fallback(0), _master(0), _focus(None)
 {
+  _focus_e.xfocus.display = OBDisplay::display;
+  _focus_e.xfocus.mode = NotifyNormal;
+  _focus_e.xfocus.detail = NotifyNonlinear;
+
+  _crossing_e.xcrossing.display = OBDisplay::display;
+  _crossing_e.xcrossing.mode = NotifyNormal;
+  _crossing_e.xcrossing.detail = NotifyNonlinear;
 }
 
 OtkEventDispatcher::~OtkEventDispatcher()
@@ -33,26 +40,145 @@ void OtkEventDispatcher::clearHandler(Window id)
 {
   _map.erase(id);
 }
-#include <stdio.h>
+
 void OtkEventDispatcher::dispatchEvents(void)
 {
-  XEvent e;
-  OtkEventHandler *handler;
   OtkEventMap::iterator it;
+  XEvent e;
+  Window focus = None, unfocus = None;
+  Window enter = None, leave = None;
+  Window enter_root = None, leave_root = None;
 
   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
+
+    // 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);
+      }
+    // madly compress all focus events
+    } else if (e.type == FocusIn) {
+      // any other types are not ones we're interested in
+      if (e.xfocus.detail == NotifyNonlinear) {
+        focus = e.xfocus.window;
+        unfocus = None;
+        printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus);
+      }
+    } else if (e.type == FocusOut) {
+      // any other types are not ones we're interested in
+      if (e.xfocus.detail == NotifyNonlinear) {
+        unfocus = e.xfocus.window;
+        focus = None;
+        printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus);
+      }
+/*    // madly compress all crossing events
+    } else if (e.type == EnterNotify) {
+      // any other types are not ones we're interested in
+      if (e.xcrossing.mode == NotifyNormal) {
+        // any other types are not ones we're interested in
+        enter = e.xcrossing.window;
+        enter_root = e.xcrossing.root;
+        printf("Enter enter=%lx leave=%lx\n", enter, leave);
+      }
+    } else if (e.type == LeaveNotify) {
+      // any other types are not ones we're interested in
+      if (e.xcrossing.mode == NotifyNormal) {
+        leave = e.xcrossing.window;
+        leave_root = e.xcrossing.root;
+        printf("Leave enter=%lx leave=%lx\n", enter, leave);
+        }*/
+    } else {
+      // normal events
+      dispatch(e);
+    }
+  }
+
+  if (unfocus != None) {
+    // the last focus event was an FocusOut, so where the hell is the focus at?
+    printf("UNFOCUSING: %lx\n", unfocus);
+    _focus_e.xfocus.type = FocusOut;
+    _focus_e.xfocus.window = unfocus;
+    dispatch(_focus_e);
 
-    if (it != _map.end())
-      handler = it->second;
-    else
-      handler = _fallback;
+    _focus = None;
+  } else if (focus != None) {
+    // the last focus event was a FocusIn, so unfocus what used to be focus and
+    // focus this new target
+    if (_focus != None) {
+      printf("UNFOCUSING: %lx\n", _focus);
+      _focus_e.xfocus.type = FocusOut;
+      _focus_e.xfocus.window = _focus;
+      dispatch(_focus_e);
+    }
+    printf("FOCUSING: %lx\n", focus);
+    _focus_e.xfocus.type = FocusIn;
+    _focus_e.xfocus.window = focus;
+    dispatch(_focus_e);
 
-    if (handler)
-      handler->handle(e);
+    _focus = focus;
   }
+  
+  if (leave != None) {
+    _crossing_e.xcrossing.type = LeaveNotify;
+    _crossing_e.xcrossing.window = leave;
+    _crossing_e.xcrossing.root = leave_root;
+    dispatch(_crossing_e);
+  }
+  if (enter != None) {
+    _crossing_e.xcrossing.type = EnterNotify;
+    _crossing_e.xcrossing.window = enter;
+    _crossing_e.xcrossing.root = enter_root;
+    dispatch(_crossing_e);
+  }
+}
+
+void OtkEventDispatcher::dispatch(const XEvent &e) {
+  OtkEventHandler *handler;
+  OtkEventMap::iterator it;
+
+  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;
 }
 
 }