X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=5be1c6b190aa77516c1c4b98b2d7f023c38e2798;hb=23a7f188297ba3cef1bf13f1be9407ff6eb9bd62;hp=2de283691bf1ed7229118da7cba4f5310efbaa73;hpb=6f5e60f0337e60d904a8f549aeaa631afefc8033;p=chaz%2Fopenbox diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index 2de28369..5be1c6b1 100644 --- a/otk/eventdispatcher.cc +++ b/otk/eventdispatcher.cc @@ -1,3 +1,9 @@ +// -*- 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 @@ -28,6 +34,7 @@ void OtkEventDispatcher::clearHandler(Window id) _map.erase(id); } +#include void OtkEventDispatcher::dispatchEvents(void) { XEvent e; @@ -36,12 +43,17 @@ void OtkEventDispatcher::dispatchEvents(void) while (XPending(OBDisplay::display)) { XNextEvent(OBDisplay::display, &e); + +#ifdef DEBUG + 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);