X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=ab0bc25aea37841c0196fb186a9105ceec4739b1;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=7f33b9c89d1bda67c7e758fc84335fd07654b053;hpb=af1ac846ccb5fab8a3c83d8688db3d3f96f5a98b;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 7f33b9c8..ab0bc25a 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,12 +10,10 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "client.hh"
 #include "widgetbase.hh"
-#include "otk/image.hh"
+#include "otk/renderstyle.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
-#include "otk/style.hh"
 #include "otk/screeninfo.hh"
 #include "otk/eventhandler.hh"
 #include "otk/property.hh"
@@ -27,7 +25,6 @@ extern "C" {
 namespace ob {
 
 class Client;
-class RootWindow;
 
 //! Manages a single screen
 /*!
@@ -46,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?
@@ -59,11 +58,8 @@ private:
   //! Information about this screen
   const otk::ScreenInfo *_info;
   
-  //! The Image Control used for rendering on the screen
-  otk::ImageControl *_image_control;
-
   //! The style with which to render on the screen
-  otk::Style _style;
+  otk::RenderStyle _style;
 
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
@@ -82,7 +78,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;
@@ -148,12 +144,10 @@ public:
     used.
   */
   inline bool managed() const { return _managed; }
-  //! Returns the Image Control used for rendering on the screen
-  inline otk::ImageControl *imageControl() { return _image_control; }
   //! 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::Style *style() const { return &_style; }
+  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
@@ -203,6 +197,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);