X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=abdcfef386968d922e4a301b285678a82f6a585a;hb=977ecf1f1e82f385a542648b545a0d0877febaf0;hp=18c0e85c3d1dfddfd82b865fdfef2b44a33dccbb;hpb=29d504e76cf90b9f3c27c91383889ce003b01728;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 18c0e85c..abdcfef3 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -22,14 +22,16 @@ extern "C" {
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
-#include "xeventhandler.hh"
-#include "client.hh"
+#include "otk/eventdispatcher.hh"
+#include "otk/eventhandler.hh"
 
 namespace ob {
 
 class OBScreen;
+class OBClient;
+class OBActions;
 
-//! The main class for the Openbox window manager.
+//! The main class for the Openbox window manager
 /*!
   Only a single instance of the Openbox class may be used in the application. A
   pointer to this instance is held in the Openbox::instance static member
@@ -39,10 +41,10 @@ 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.
+  //! The single instance of the Openbox class for the application
   /*!
     Since this variable is globally available in the application, the Openbox
     class does not need to be passed around to any of the other classes.
@@ -102,9 +104,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
@@ -113,6 +112,9 @@ private:
   */
   otk::OBProperty *_property;
 
+  //! The action interface through which all user-available actions occur
+  OBActions *_actions;
+
   //! The running state of the window manager
   RunState _state;