X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=a34dd9b4dd4575eed3574e4db06837e2f8539037;hb=73f7a0bd69607663050f02acf121f40a739d9619;hp=0d861b3670ce286f4ca36539b8efc72697700535;hpb=e53fbcf092c40b22ccc4c5f23795e12c9862c338;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 0d861b36..a34dd9b4 100644
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -1,9 +1,17 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "eventdispatcher.hh"
 #include "display.hh"
+#include <iostream>
 
 namespace otk {
 
 OtkEventDispatcher::OtkEventDispatcher()
+  : _fallback(0), _master(0)
 {
 }
 
@@ -26,6 +34,7 @@ void OtkEventDispatcher::clearHandler(Window id)
   _map.erase(id);
 }
 
+//#include <stdio.h>
 void OtkEventDispatcher::dispatchEvents(void)
 {
   XEvent e;
@@ -34,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);
   }
 }