X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=8c2015f95870af95005b39bc65525f048762b1e4;hb=74cb09bb2cc4832463a57743b1495eef24237d2a;hp=a257cb243cb49dd52e2e75a98f30dafe1a2f4fbb;hpb=cee305244662d352a7ad5ab7ae22f6221c064d3d;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index a257cb24..8c2015f9 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -6,6 +6,10 @@
   @brief The main class for the Openbox window manager
 */
 
+/*
+  cuz girls look soooo goood.. on the end of my DICK
+*/
+
 extern "C" {
 #include <X11/Xlib.h>
 }
@@ -18,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 {
@@ -35,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.
@@ -98,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
@@ -155,7 +157,7 @@ public:
   inline const otk::OBProperty *property() const { return _property; }
 
   //! Returns a managed screen
-  inline const OBScreen *screen(int num) const {
+  inline OBScreen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
     return _screens[num];
   }
@@ -186,6 +188,8 @@ public:
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
+
+  virtual void mapRequestHandler(const XMapRequestEvent &);
 };
 
 }