X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=b64a5199c9edf03b037dbcddc22b4cc91eedd56c;hb=d22a6c6c04cf20bd23efa68ad1202f278f25e113;hp=8904c2a7750624bfc3172416fd852dcb7be515e6;hpb=77ab46d1e35d48e73c201e6de88b26f48bb06425;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 8904c2a7..b64a5199 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -12,13 +12,13 @@ extern "C" {
 
 #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"
+#include "otk/ustring.hh"
 
 #include <string>
 #include <list>
@@ -26,7 +26,6 @@ extern "C" {
 namespace ob {
 
 class Client;
-class RootWindow;
 
 //! Manages a single screen
 /*!
@@ -58,11 +57,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;
@@ -147,12 +143,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
@@ -181,9 +175,18 @@ public:
   */
   void unmanageWindow(Client *client);
 
-  //! Raises/Lowers a client window above/below all others in its stacking
-  //! layer
-  void restack(bool raise, Client *client);
+  //! Raises a client window above all others in its stacking layer
+  /*!
+    raiseWindow has a couple of constraints that lowerWindow does not.<br>
+    1) raiseWindow can be called after changing a Client's stack layer, and
+       the list will be reorganized properly.<br>
+    2) raiseWindow guarantees that XRestackWindows() will <i>always</i> be
+       called for the specified client.
+  */
+  void raiseWindow(Client *client);
+
+  //! 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
   /*!
@@ -191,7 +194,7 @@ public:
     @param name The name to set for the desktop
     If the index is too large, it is simply ignored.
   */
-  void setDesktopName(long i, const std::string &name);
+  void setDesktopName(long i, const otk::ustring &name);
 
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);