#include <X11/Xlib.h>
}
-#include "client.hh"
-#include "widgetbase.hh"
-#include "otk/image.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"
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 |
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?
//! 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;
-
//! 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;
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;
+ unsigned int _desktop;
//! The number of desktops
- long _num_desktops;
+ unsigned int _num_desktops;
//! The names of all desktops
otk::Property::StringVect _desktop_names;
@param desktop The number of the desktop to switch to (starts from 0).
If the desktop is out of valid range, it is ignored.
*/
- void changeDesktop(long desktop);
+ void changeDesktop(unsigned int desktop);
//! Changes the number of desktops.
/*!
@param num The number of desktops that should exist. This value must be
greater than 0 or it will be ignored.
*/
- void changeNumDesktops(long num);
+ void changeNumDesktops(unsigned int num);
public:
#ifndef SWIG
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; }
//! An offscreen window which gets focus when nothing else has it
inline Window focuswindow() const { return _focuswindow; }
//! Returns the desktop being displayed
- inline long desktop() const { return _desktop; }
+ inline unsigned int desktop() const { return _desktop; }
//! Returns the number of desktops
- inline long numDesktops() const { return _num_desktops; }
+ inline unsigned int 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(unsigned int 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();
*/
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
/*!
@param name The name to set for the desktop
If the index is too large, it is simply ignored.
*/
- void setDesktopName(long i, const otk::ustring &name);
+ void setDesktopName(unsigned int i, const otk::ustring &name);
+
+ void installColormap(bool install) const;
virtual void propertyHandler(const XPropertyEvent &e);
virtual void clientMessageHandler(const XClientMessageEvent &e);
projects / chaz / openbox / blobdiff