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

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 0d861b36..2a0c4448 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)
 {
 }
 
@@ -34,12 +42,13 @@ void OtkEventDispatcher::dispatchEvents(void)
 
   while (XPending(OBDisplay::display)) {
     XNextEvent(OBDisplay::display, &e);
+
     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);