X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=16a4225b37697a11f514fde644662d76cbbdcb74;hb=12108e16e166034cd1840627502280d9a1ab0b9e;hp=37e56cf1085625c9bc77484202667fd2d869891d;hpb=dd6f90684899e8e26e653af4b2e7e7eab1abf798;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 37e56cf1..16a4225b 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,9 +10,6 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "client.hh"
-#include "widgetbase.hh"
-#include "otk/renderstyle.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
@@ -26,15 +23,16 @@ extern "C" {
 namespace ob {
 
 class Client;
-class RootWindow;
 
 //! Manages a single screen
 /*!
 */
-class Screen : public otk::EventHandler, public WidgetBase {
+class Screen : public otk::EventHandler {
 public:
   //! Holds a list of otk::Strut objects
-  typedef std::list<otk::Strut*> StrutList;
+  typedef std::vector<otk::Strut> StrutList;
+  //! Holds a list of otk::Rect objects
+  typedef std::vector<otk::Rect> RectList;
 
   static const unsigned long event_mask = ColormapChangeMask |
                                           EnterWindowMask |
@@ -45,8 +43,10 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! Holds a list of Clients
+  typedef std::list<Client*> ClientList;
   //! All managed clients on the screen (in order of being mapped)
-  Client::List clients;
+  ClientList clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -58,17 +58,16 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
   
-  //! The style with which to render on the screen
-  otk::RenderStyle _style;
-
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
-  //! Area usable for placement etc (total - struts)
-  otk::Rect _area;
+  //! Area usable for placement etc (total - struts), one per desktop,
+  //! plus one extra for windows on all desktops
+  RectList _area;
 
-  //! Combined strut from all of the clients' struts
-  otk::Strut _strut;
+  //! Combined strut from all of the clients' struts, one per desktop,
+  //! plus one extra for windows on all desktops
+  StrutList _struts;
 
   //!  An offscreen window which gets focus when nothing else has it
   Window _focuswindow;
@@ -78,7 +77,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  Client::List _stacking;
+  ClientList _stacking;
 
   //! The desktop currently being displayed
   long _desktop;
@@ -144,10 +143,6 @@ public:
     used.
   */
   inline bool managed() const { return _managed; }
-  //! Returns the area of the screen not reserved by applications' Struts
-  inline const otk::Rect &area() const { return _area; }
-  //! Returns the style in use on the screen
-  inline const otk::RenderStyle *style() const { return &_style; }
   //!  An offscreen window which gets focus when nothing else has it
   inline Window focuswindow() const { return _focuswindow; }
   //! Returns the desktop being displayed
@@ -155,11 +150,19 @@ public:
   //! Returns the number of desktops
   inline long numDesktops() const { return _num_desktops; }
 
+  //! Returns the area of the screen not reserved by applications' Struts
+  /*!
+    @param desktop The desktop number of the area to retrieve for. A value of
+                   0xffffffff will return an area that combines all struts
+                   on all desktops.
+  */
+  const otk::Rect& area(long desktop) const;
+
   //! Update's the screen's combined strut of all the clients.
   /*!
     Clients should call this whenever they change their strut.
   */
-  void updateStrut();
+  void updateStruts();
 
   //! Manage any pre-existing windows on the screen
   void manageExisting();
@@ -197,6 +200,8 @@ public:
   */
   void setDesktopName(long i, const otk::ustring &name);
 
+  void installColormap(bool install) const;
+
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);
   virtual void mapRequestHandler(const XMapRequestEvent &e);