X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=a34dd9b4dd4575eed3574e4db06837e2f8539037;hb=73f7a0bd69607663050f02acf121f40a739d9619;hp=4120192498230d4441248b00cf91f7c45ec728b5;hpb=829ce05c7c7fe3697d11739d12577c7151d9953d;p=chaz%2Fopenbox diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index 41201924..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 void OtkEventDispatcher::dispatchEvents(void) { XEvent e; @@ -42,6 +43,11 @@ 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()) @@ -51,6 +57,9 @@ void OtkEventDispatcher::dispatchEvents(void) if (handler) handler->handle(e); + + if (_master) + _master->handle(e); } }