X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=d59cf313d2b402919fd7352e319ecbeb2678afad;hb=590e5e2392e0610e8eb2d21e59d2d4a265caf172;hp=55518fc93a2860312940ec6b6b5c026badbca092;hpb=1e46a39dc305fe92b0c0eca1e60e76fded3e5214;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 55518fc9..d59cf313 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,6 +10,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "config.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
@@ -53,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?
@@ -67,6 +66,9 @@ 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
@@ -84,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;
@@ -144,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; }
   
@@ -159,6 +159,10 @@ public:
     used.
   */
   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
@@ -176,6 +180,8 @@ public:
   */
   const otk::Rect& area(unsigned int desktop) const;
 
+  //! Gives the layout of how the desktops are being displayed, the number of
+  //! rows and columns etc.
   const DesktopLayout& desktopLayout() const { return _layout; }
 
   //! Shows and focuses the desktop and hides all the client windows, or
@@ -224,6 +230,8 @@ public:
   */
   void setDesktopName(unsigned int i, const otk::ustring &name);
 
+  otk::ustring desktopName(unsigned int i) const;
+
   void installColormap(bool install) const;
 
   virtual void propertyHandler(const XPropertyEvent &e);