X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=163b9132e0e6794dd548b436390ff88dc04a20cc;hb=d3baca52284263872a32193c655ed15a5d52e4ec;hp=d53bce0b43172f3853da424e04a5cbf5c08d40be;hpb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index d53bce0b..163b9132 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -16,7 +16,6 @@ extern "C" {
 
 #include "otk/display.hh"
 #include "otk/screeninfo.hh"
-#include "otk/property.hh"
 #include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
 #include "otk/eventhandler.hh"
@@ -108,14 +107,6 @@ private:
   //! A list of all the managed screens
   ScreenList _screens;
   
-  //! Cached atoms on the display
-  /*!
-    This is a pointer because the Property class uses otk::Display::display
-    in its constructor, so, it needs to be initialized <b>after</b> the display
-    is initialized in this class' constructor.
-  */
-  otk::Property *_property;
-
   //! The action interface through which all user-available actions occur
   Actions *_actions;
 
@@ -177,28 +168,23 @@ public:
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
 
-  //! Returns the otk::Property instance for the window manager
-  inline const otk::Property *property() const { return _property; }
-
   //! Returns the Actions instance for the window manager
   inline Actions *actions() const { return _actions; }
 
   //! Returns the Bindings instance for the window manager
   inline Bindings *bindings() const { return _bindings; }
 
-  //! Returns a managed screen
+  //! Returns a managed screen or a null pointer
+  /*!
+    ALWAYS check the return value for a non-null, as any unmanaged screens
+    will return one. This includes screen(0) if the first managed screen is 1.
+  */
   inline Screen *screen(int num) {
-    assert(num >= 0); assert(num < (signed)_screens.size());
-    if (num >= screenCount())
-      return NULL;
+    assert(num >= 0); assert(num < (signed)ScreenCount(**otk::display));
+    if (num >= (signed)_screens.size()) return 0;
     return _screens[num];
   }
 
-  //! Returns the number of managed screens
-  inline int screenCount() const {
-    return (signed)_screens.size();
-  }
-
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
@@ -243,9 +229,6 @@ public:
   inline void restart(const std::string &bin = "") {
     _shutdown = true; _restart = true; _restart_prog = bin;
   }
-
-  //! Executes a command on a screen
-  void execute(int screen, const std::string &bin);
 };
 
 }