valgrind fixes, and fixes for writing shit all over the environment. yay~!!!!!!!

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index d2e1a96eb20554f2cace1ae43164e2ee4b07c38b..6c15a60bcf8d0aa9be411a517971eaf42b24630b 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -11,7 +11,7 @@
 namespace otk {
 
 OtkEventDispatcher::OtkEventDispatcher()
-  : _fallback(0)
+  : _fallback(0), _master(0)
 {
 }
 
@@ -34,30 +34,146 @@ void OtkEventDispatcher::clearHandler(Window id)
   _map.erase(id);
 }
 
-//#include <stdio.h>
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
-  OtkEventHandler *handler;
-  OtkEventMap::iterator it;
 
   while (XPending(OBDisplay::display)) {
     XNextEvent(OBDisplay::display, &e);
 
-#if defined(DEBUG) && 0
+#if 0//defined(DEBUG)
     printf("Event %d window %lx\n", e.type, e.xany.window);
 #endif
 
-    it = _map.find(e.xany.window);
+    if (e.type == FocusIn || e.type == FocusOut) {
+      // focus events are a beast all their own.. yuk, hate, etc.
+      dispatchFocus(e);
+    } else {    
+      Window win;
 
-    if (it != _map.end())
-      handler = it->second;
-    else
-      handler = _fallback;
+      // 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 (handler)
-      handler->handle(e);
+      dispatch(win, e);
+    }
   }
 }
 
+void OtkEventDispatcher::dispatchFocus(const XEvent &e)
+{
+  if (e.type == FocusIn) {
+    //printf("Got FocusIn!\n");
+
+    // send a FocusIn to whatever was just focused
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusIn 0x%lx\n", e.xfocus.window);
+
+  } else if (e.type == FocusOut) {
+    //printf("Got FocusOut!\n");
+
+    // ignore FocusOut changes from grabs
+    if (e.xfocus.mode == NotifyGrab)
+      return;
+  
+    // FocusOut events just make us look for FocusIn events. They are ignored
+    // otherwise.
+    XEvent fi;
+    if (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
+      //printf("Found FocusIn\n");
+      dispatchFocus(fi);
+      // dont unfocus the window we just focused!
+      if (fi.xfocus.window == e.xfocus.window)
+        return;
+    }
+
+    dispatch(e.xfocus.window, e);
+    //printf("Sent FocusOut 0x%lx\n", e.xfocus.window);
+  }
+}
+
+void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
+{
+  OtkEventHandler *handler = 0;
+  OtkEventMap::iterator it;
+
+  // master gets everything first
+  if (_master)
+    _master->handle(e);
+
+  // find handler for the chosen window
+  it = _map.find(win);
+
+  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)
+{
+  OtkEventMap::iterator it = _map.find(win);
+  if (it != _map.end())
+    return it->second;
+  return 0;
+}
+
 }