X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=20ba0a63243f9349325b4f523df7e39cfddaceb3;hb=c5789fea10f24163465292430a068f4d2ae33f39;hp=b84d8b06a389853ee84ac62280d0c3baf205c8c3;hpb=361303715b6eb54d77ed8e1c9ad8f35e44e4ede1;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index b84d8b06..20ba0a63 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,7 +10,6 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "config.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
@@ -67,9 +66,6 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
 
-  //! Configuration options from the user scripts
-  Config _config;
-  
   //! Area usable for placement etc (total - struts), one per desktop,
   //! plus one extra for windows on all desktops
   RectList _area;
@@ -146,12 +142,10 @@ private:
   void changeNumDesktops(unsigned int num);
 
 public:
-#ifndef SWIG
   //! Constructs a new Screen object
   Screen(int screen);
   //! Destroys the Screen object
   virtual ~Screen();
-#endif
 
   inline int number() const { return _number; }
   
@@ -162,9 +156,6 @@ public:
   */
   inline bool managed() const { return _managed; }
 
-  //! Returns the config options set by the user scripts
-  Config& config() { return _config; }
-
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed
@@ -224,15 +215,8 @@ public:
   //! Lowers a client window below all others in its stacking layer
   void lowerWindow(Client *client);
 
-  //! Sets the name of a desktop by changing the root window property
-  /*!
-    @param i The index of the desktop to set the name for (starts at 0)
-    @param name The name to set for the desktop
-    If the index is too large, it is simply ignored.
-  */
-  void setDesktopName(unsigned int i, const otk::ustring &name);
-
-  otk::ustring desktopName(unsigned int i) const;
+  const otk::Property::StringVect& desktopNames() const
+    { return _desktop_names; }
 
   void installColormap(bool install) const;