X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=9b3618c92df787735c769cee5a584fa9e29480a4;hb=4ef15148365c223b8e810611a10dc27dc5fba355;hp=e57ab2edbcb679ce87313144f9ca0afeae6ed561;hpb=c7b22b4f9cee63d860ad4f6617cd5210299b9d8b;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index e57ab2ed..9b3618c9 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -3,35 +3,36 @@ #define __screen_hh /*! @file screen.hh - @brief OBScreen manages a single screen + @brief Screen manages a single screen */ extern "C" { #include } -#include "client.hh" -#include "rootwindow.hh" -#include "otk/image.hh" #include "otk/strut.hh" #include "otk/rect.hh" -#include "otk/style.hh" -#include "otk/configuration.hh" // TEMPORARY +#include "otk/screeninfo.hh" +#include "otk/eventhandler.hh" +#include "otk/property.hh" +#include "otk/ustring.hh" #include +#include namespace ob { -class OBClient; -class OBRootWindow; +class Client; //! Manages a single screen /*! */ -class OBScreen { +class Screen : public otk::EventHandler { public: //! Holds a list of otk::Strut objects - typedef std::list StrutList; + typedef std::vector StrutList; + //! Holds a list of otk::Rect objects + typedef std::vector RectList; static const unsigned long event_mask = ColormapChangeMask | EnterWindowMask | @@ -42,8 +43,10 @@ public: ButtonPressMask | ButtonReleaseMask; + //! Holds a list of Clients + typedef std::list ClientList; //! All managed clients on the screen (in order of being mapped) - OBClient::List clients; + ClientList clients; private: //! Was %Openbox able to manage the screen? @@ -55,23 +58,16 @@ private: //! Information about this screen const otk::ScreenInfo *_info; - //! The Image Control used for rendering on the screen - otk::BImageControl *_image_control; - - //! The style with which to render on the screen - otk::Style _style; - - //! The screen's root window - OBRootWindow _root; - //! 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; @@ -81,35 +77,62 @@ private: Window _supportwindow; //! A list of all managed clients on the screen, in their stacking order - OBClient::List _stacking; + ClientList _stacking; + + //! The desktop currently being displayed + unsigned int _desktop; - //! Calculate the OBScreen::_area member + //! The number of desktops + unsigned int _num_desktops; + + //! The names of all desktops + otk::Property::StringVect _desktop_names; + + //! Calculate the Screen::_area member void calcArea(); //! Set the list of supported NETWM atoms on the root window - void setSupportedAtoms(); + void changeSupportedAtoms(); //! Set the client list on the root window /*! Sets the _NET_CLIENT_LIST root window property.
- Also calls OBScreen::updateStackingList. + Also calls Screen::updateStackingList. */ - void setClientList(); + void changeClientList(); //! Set the client stacking list on the root window /*! Set the _NET_CLIENT_LIST_STACKING root window property. */ - void setStackingList(); + void changeStackingList(); //! Set the work area hint on the root window /*! Set the _NET_WORKAREA root window property. */ - void setWorkArea(); + void changeWorkArea(); + + //! Get desktop names from the root window property + void updateDesktopNames(); + + //! Changes to the specified desktop, displaying windows on it and hiding + //! windows on the others. + /*! + @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(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(unsigned int num); public: #ifndef SWIG - //! Constructs a new OBScreen object - OBScreen(int screen); - //! Destroys the OBScreen object - virtual ~OBScreen(); + //! Constructs a new Screen object + Screen(int screen); + //! Destroys the Screen object + virtual ~Screen(); #endif inline int number() const { return _number; } @@ -120,20 +143,26 @@ public: used. */ inline bool managed() const { return _managed; } - //! Returns the Image Control used for rendering on the screen - inline otk::BImageControl *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 unsigned int desktop() const { return _desktop; } + //! Returns the number of 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(); @@ -146,12 +175,36 @@ public: /*! This removes the window's frame, reparents it to root, unselects events on it, etc. + @param client The client to unmanage */ - void unmanageWindow(OBClient *client); + void unmanageWindow(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 + /*! + @param i The index of the desktop to set the name for (starts at 0) + @param name The name to set for the desktop + If the index is too large, it is simply ignored. + */ + void setDesktopName(unsigned int i, const otk::ustring &name); + + void installColormap(bool install) const; - //! Raises/Lowers a client window above/below all others in its stacking - //! layer - void restack(bool raise, OBClient *client); + virtual void propertyHandler(const XPropertyEvent &e); + virtual void clientMessageHandler(const XClientMessageEvent &e); + virtual void mapRequestHandler(const XMapRequestEvent &e); }; }