moving strut into its own .hh. adding OBClient class

[chaz/openbox] / src / openbox.hh

diff --git a/src/openbox.hh b/src/openbox.hh
index 5e9edd177c44f5cd5d1f92844c5483a003e9c03b..baf9edebe906dc90dd290047bf1a8deab2d4326b 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -15,8 +15,8 @@ extern "C" {
 
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
+#include "otk/property.hh"
 #include "xeventhandler.hh"
-#include "atom.hh"
 
 namespace ob {
 
@@ -74,6 +74,14 @@ private:
   //! 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
+    in its constructor, so, it needs to be initialized <b>after</b> the display
+    is initialized in this class' constructor.
+  */
+  otk::OBProperty *_property;
+
   //! The running state of the window manager
   RunState _state;
 
@@ -110,6 +118,8 @@ public:
   */
   inline otk::OBTimerQueueManager *timerManager() { return &_timermanager; }
 
+  inline const otk::OBProperty *property() const { return _property; }
+
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.