X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.cc;h=a34dd9b4dd4575eed3574e4db06837e2f8539037;hb=90ae66cc44a93ab1419821944c258e72d1e4b559;hp=5be1c6b190aa77516c1c4b98b2d7f023c38e2798;hpb=bdc491ccfe71ce29a5a1ea813da4b1c66e2fa330;p=chaz%2Fopenbox diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index 5be1c6b1..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,7 +34,7 @@ void OtkEventDispatcher::clearHandler(Window id) _map.erase(id); } -#include +//#include void OtkEventDispatcher::dispatchEvents(void) { XEvent e; @@ -44,7 +44,7 @@ void OtkEventDispatcher::dispatchEvents(void) while (XPending(OBDisplay::display)) { XNextEvent(OBDisplay::display, &e); -#ifdef DEBUG +#if defined(DEBUG) && 0 printf("Event %d window %lx\n", e.type, e.xany.window); #endif @@ -57,6 +57,9 @@ void OtkEventDispatcher::dispatchEvents(void) if (handler) handler->handle(e); + + if (_master) + _master->handle(e); } }