X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventhandler.cc;h=e4a24df81782e87d38d54bb220d9897f62de61f6;hb=77ab46d1e35d48e73c201e6de88b26f48bb06425;hp=d61189e4713b8f2a1f8497cdea67b63f03bbe5c9;hpb=fbc516442d47048edf2b5201e0b956c85b782bac;p=chaz%2Fopenbox diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc index d61189e4..e4a24df8 100644 --- a/otk/eventhandler.cc +++ b/otk/eventhandler.cc @@ -9,17 +9,17 @@ namespace otk { -OtkEventHandler::OtkEventHandler() +EventHandler::EventHandler() { } -OtkEventHandler::~OtkEventHandler() +EventHandler::~EventHandler() { } -void OtkEventHandler::handle(const XEvent &e) +void EventHandler::handle(const XEvent &e) { switch(e.type){ case KeyPress: @@ -88,15 +88,19 @@ void OtkEventHandler::handle(const XEvent &e) return selectionRequestHandler(e.xselectionrequest); default: #ifdef SHAPE - if (e.type == otk::OBDisplay::shapeEventBase()) + if (e.type == Display::shapeEventBase()) return shapeHandler((*(XShapeEvent*)&e)); #endif // SHAPE +#ifdef XKB + if (e.type == Display::xkbEventBase()) + return xkbHandler((*(XkbEvent*)&e)); +#endif // XKB ; } } -void OtkEventHandler::clientMessageHandler(const XClientMessageEvent &) +void EventHandler::clientMessageHandler(const XClientMessageEvent &) { }