X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fscreen.hh;h=b64a5199c9edf03b037dbcddc22b4cc91eedd56c;hb=1d94cd5277cf998a4516ddc8d40c2ccf0e6dfcc7;hp=c3af7b6cb2701feb4e691f3bc2172916f5d30074;hpb=ef02a0c8ae65f169157c90064a335303e964a4c1;p=chaz%2Fopenbox
diff --git a/src/screen.hh b/src/screen.hh
index c3af7b6c..b64a5199 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -12,10 +12,9 @@ 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"
@@ -27,7 +26,6 @@ extern "C" {
namespace ob {
class Client;
-class RootWindow;
//! Manages a single screen
/*!
@@ -59,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;
@@ -148,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
@@ -182,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.
+ 1) raiseWindow can be called after changing a Client's stack layer, and
+ the list will be reorganized properly.
+ 2) raiseWindow guarantees that XRestackWindows() will always 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
/*!