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

diff --git a/src/screen.hh b/src/screen.hh
index e8306933..457ca324 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"
@@ -67,6 +68,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
@@ -143,10 +147,6 @@ private:
   */
   void changeNumDesktops(unsigned int num);
 
-  //! Shows and focuses the desktop and hides all the client windows, or
-  //! returns to the normal state, showing client windows.
-  void showDesktop(bool show);
-
 public:
 #ifndef SWIG
   //! Constructs a new Screen object
@@ -163,6 +163,10 @@ public:
     used.
   */
   inline bool managed() const { return _managed; }
+
+  //! Returns the config options set by the user scripts
+  const Config& config() const { return _config; }
+
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed
@@ -180,8 +184,14 @@ 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
+  //! returns to the normal state, showing client windows.
+  void showDesktop(bool show);
+
   //! Update's the screen's combined strut of all the clients.
   /*!
     Clients should call this whenever they change their strut.
@@ -224,6 +234,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);