X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=2f0260831ca90a32183de2c212077238ac9eff14;hb=d2a1ecb1b50902d262a74e347203a36a961e1d92;hp=457ca324ef909d997b3c623f52e573c3a4b253ce;hpb=059bc4dc24b68d637c3608c05344c53c64cc2c4b;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 457ca324..2f026083 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -54,10 +54,8 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  //! Holds a list of Clients
-  typedef std::list<Client*> ClientList;
   //! All managed clients on the screen (in order of being mapped)
-  ClientList clients;
+  std::list<Client*> clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -88,7 +86,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  ClientList _stacking;
+  std::list<Client*> _stacking;
 
   //! The desktop currently being displayed
   unsigned int _desktop;
@@ -148,12 +146,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; }
   
@@ -165,7 +161,7 @@ public:
   inline bool managed() const { return _managed; }
 
   //! Returns the config options set by the user scripts
-  const Config& config() const { return _config; }
+  Config& config() { return _config; }
 
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
@@ -226,15 +222,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;