start on otk::ustring (unicode/utf8)

[chaz/openbox] / otk / eventhandler.cc

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index d61189e4713b8f2a1f8497cdea67b63f03bbe5c9..e4a24df81782e87d38d54bb220d9897f62de61f6 100644 (file)
--- 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 &)
 {
   
 }