X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=otk%2Feventdispatcher.cc;h=a34dd9b4dd4575eed3574e4db06837e2f8539037;hb=90ae66cc44a93ab1419821944c258e72d1e4b559;hp=30996de003250ba9c5ce3745cc1a435a9378c673;hpb=1d897f432e54400cb2a0e1499712782b336fd728;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 30996de0..a34dd9b4 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -11,7 +11,7 @@
 namespace otk {
 
 OtkEventDispatcher::OtkEventDispatcher()
-  : _fallback(0)
+  : _fallback(0), _master(0)
 {
 }
 
@@ -34,6 +34,7 @@ void OtkEventDispatcher::clearHandler(Window id)
   _map.erase(id);
 }
 
+//#include <stdio.h>
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
@@ -42,15 +43,23 @@ void OtkEventDispatcher::dispatchEvents(void)
 
   while (XPending(OBDisplay::display)) {
     XNextEvent(OBDisplay::display, &e);
+
+#if defined(DEBUG) && 0
+    printf("Event %d window %lx\n", e.type, e.xany.window);
+#endif
+
     it = _map.find(e.xany.window);
 
-    if (it == _map.end())
-      handler = _fallback;
-    else
+    if (it != _map.end())
       handler = it->second;
+    else
+      handler = _fallback;
 
     if (handler)
       handler->handle(e);
+
+    if (_master)
+      _master->handle(e);
   }
 }