rework focus event handling. does it basically like ob2 did now. and it seems to...

[chaz/openbox] / otk / eventhandler.cc

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index cab95e17ce8db25daa865e4d58b4898ac672c310..d61189e4713b8f2a1f8497cdea67b63f03bbe5c9 100644 (file)
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -1,5 +1,11 @@
+// -*- 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 {
 
@@ -13,7 +19,7 @@ OtkEventHandler::~OtkEventHandler()
 }
 
 
-int OtkEventHandler::handle(const XEvent &e)
+void OtkEventHandler::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,19 @@ int OtkEventHandler::handle(const XEvent &e)
     return selectionHandler(e.xselection);
   case SelectionRequest:
     return selectionRequestHandler(e.xselectionrequest);
-  };
-  return 0;
+  default:
+#ifdef    SHAPE
+    if (e.type == otk::OBDisplay::shapeEventBase())
+      return shapeHandler((*(XShapeEvent*)&e));
+#endif // SHAPE
+    ;
+  }
+}
+
+
+void OtkEventHandler::clientMessageHandler(const XClientMessageEvent &)
+{
+  
 }
 
 }