X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=33d8ba2d8150b9f178d81540ec6dae097101c83f;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=75a06ea1489aec97ef8ac7203cfb21c670576fc8;hpb=52b83a9dbb2b7823d5f78781f5948dfd8d77d50b;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 75a06ea1..33d8ba2d 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -11,7 +11,7 @@
 namespace otk {
 
 OtkEventDispatcher::OtkEventDispatcher()
-  : _fallback(0)
+  : _fallback(0), _master(0)
 {
 }
 
@@ -33,7 +33,7 @@ void OtkEventDispatcher::clearHandler(Window id)
 {
   _map.erase(id);
 }
-#include <stdio.h>
+
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
@@ -43,18 +43,20 @@ void OtkEventDispatcher::dispatchEvents(void)
   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
 
-    if (it != _map.end())
-      handler = it->second;
-    else
-      handler = _fallback;
+    // 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 (handler)
-      handler->handle(e);
-    else {
-      // some events have to be handled anyways!
-      if (e.type == ConfigureRequest) {
+      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;
@@ -65,11 +67,34 @@ void OtkEventDispatcher::dispatchEvents(void)
         xwc.sibling = e.xconfigurerequest.above;
         xwc.stack_mode = e.xconfigurerequest.detail;
 
-        XConfigureWindow(OBDisplay::display, e.xconfigurerequest.window,
+        XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
                          e.xconfigurerequest.value_mask, &xwc);
       }
+    } else {
+      // normal events
+      
+      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;
+}
+
 }