X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Feventhandler.cc;h=c867d809c8294aef3b70dfd43f7a2ff8a25b70bd;hb=3fe7bded58fb82fd2c1c2a5f9ad2e8f453fa0609;hp=cab95e17ce8db25daa865e4d58b4898ac672c310;hpb=6f5e60f0337e60d904a8f549aeaa631afefc8033;p=chaz%2Fopenbox

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index cab95e17..c867d809 100644
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -1,19 +1,25 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
+#include "display.hh"
 #include "eventhandler.hh"
-#include <iostream>
 
 namespace otk {
 
-OtkEventHandler::OtkEventHandler()
+EventHandler::EventHandler()
 {
 }
 
 
-OtkEventHandler::~OtkEventHandler()
+EventHandler::~EventHandler()
 {
 }
 
 
-int OtkEventHandler::handle(const XEvent &e)
+void EventHandler::handle(const XEvent &e)
 {
   switch(e.type){
   case KeyPress:
@@ -24,6 +30,8 @@ int 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:
@@ -78,8 +86,23 @@ int OtkEventHandler::handle(const XEvent &e)
     return selectionHandler(e.xselection);
   case SelectionRequest:
     return selectionRequestHandler(e.xselectionrequest);
-  };
-  return 0;
+  default:
+#ifdef    SHAPE
+    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 EventHandler::clientMessageHandler(const XClientMessageEvent &)
+{
+  
 }
 
 }