X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=8c2015f95870af95005b39bc65525f048762b1e4;hb=958df7716291a1af680bf9d5432aa99f0b7cf644;hp=b2598dc001dba873d1d6fcf725f541693251f69e;hpb=597f4d81e5e05240a9e6cc7096598cb1fdae82a8;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index b2598dc0..8c2015f9 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -8,7 +8,6 @@
 
 /*
   cuz girls look soooo goood.. on the end of my DICK
-  -- xOr
 */
 
 extern "C" {
@@ -23,7 +22,8 @@ extern "C" {
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
-#include "xeventhandler.hh"
+#include "otk/eventdispatcher.hh"
+#include "otk/eventhandler.hh"
 #include "client.hh"
 
 namespace ob {
@@ -40,7 +40,7 @@ class OBScreen;
   not exit until the window manager is ready to be destroyed. Destruction of
   the Openbox class instance will shutdown the window manager.
 */
-class Openbox
+class Openbox : public otk::OtkEventDispatcher, public otk::OtkEventHandler
 {
 public:
   //! The single instance of the Openbox class for the application.
@@ -103,9 +103,6 @@ private:
   */
   otk::OBTimerQueueManager _timermanager;
 
-  //! The class which will handle raw XEvents
-  OBXEventHandler _xeventhandler;
-
   //! Cached atoms on the display
   /*!
     This is a pointer because the OBProperty class uses otk::OBDisplay::display
@@ -191,6 +188,8 @@ public:
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
+
+  virtual void mapRequestHandler(const XMapRequestEvent &);
 };
 
 }