font.h and font.c

[chaz/openbox] / otk / eventhandler.cc

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index 6603b3e13509387c6cd196cb0a720b3109f353a9..6539d58790d435afca95de406ba0cd2f33549c50 100644 (file)
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -1,25 +1,23 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "display.hh"
 #include "eventhandler.hh"
 
 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:
@@ -30,6 +28,8 @@ void OtkEventHandler::handle(const XEvent &e)
     return buttonPressHandler(e.xbutton);
   case ButtonRelease:
     return buttonReleaseHandler(e.xbutton);
+  case MotionNotify:
+    return motionHandler(e.xmotion);
   case EnterNotify:
     return enterHandler(e.xcrossing);
   case LeaveNotify:
@@ -86,15 +86,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 &)
 {
   
 }