X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=933fc20de12bdcb5774171026bf86186181eebae;hb=a132968424c96d9dc62d144c5e863a6810c0369d;hp=c20e676f941a036e1fbd344bcd87841aaefdc141;hpb=06a80ce2c7a189e26063d5e4e475ca500778aba5;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index c20e676f..933fc20d 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -10,26 +10,29 @@ extern "C" { #include } +#include "client.hh" +#include "widget.hh" #include "otk/image.hh" #include "otk/strut.hh" #include "otk/rect.hh" -#include "otk/point.hh" #include "otk/style.hh" -#include "otk/configuration.hh" // TEMPORARY +#include "otk/screeninfo.hh" +#include "otk/eventhandler.hh" +#include "otk/property.hh" #include +#include namespace ob { class OBClient; +class OBRootWindow; //! Manages a single screen /*! */ -class OBScreen { +class OBScreen : public otk::OtkEventHandler, public OBWidget { public: - //! Holds a list of OBClient objects - typedef std::vector ClientList; //! Holds a list of otk::Strut objects typedef std::list StrutList; @@ -42,6 +45,9 @@ public: ButtonPressMask | ButtonReleaseMask; + //! All managed clients on the screen (in order of being mapped) + OBClient::List clients; + private: //! Was %Openbox able to manage the screen? bool _managed; @@ -61,64 +67,107 @@ private: //! Is the root colormap currently installed? bool _root_cmap_installed; - //! The dimentions of the screen - otk::Point _size; - - //! All managed clients on the screen - ClientList _clients; - //! Area usable for placement etc (total - struts) otk::Rect _area; - //! Areas of the screen reserved by applications - StrutList _struts; + //! Combined strut from all of the clients' struts + otk::Strut _strut; + //! An offscreen window which gets focus when nothing else has it + Window _focuswindow; + + //! An offscreen window which shows that a NETWM compliant window manager is + //! running + Window _supportwindow; + + //! A list of all managed clients on the screen, in their stacking order + OBClient::List _stacking; + + //! The desktop currently being displayed + long _desktop; + + //! The number of desktops + long _num_desktops; + + //! The names of all desktops + otk::OBProperty::StringVect _desktop_names; - //! Manage any pre-existing windows on the screen - void manageExisting(); //! Calculate the OBScreen::_area member void calcArea(); + //! Set the list of supported NETWM atoms on the root window + void changeSupportedAtoms(); //! Set the client list on the root window /*! Sets the _NET_CLIENT_LIST root window property.
Also calls OBScreen::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(long 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); + public: +#ifndef SWIG //! Constructs a new OBScreen object - OBScreen(int screen, const otk::Configuration &config); + OBScreen(int screen); //! Destroys the OBScreen object virtual ~OBScreen(); +#endif + inline int number() const { return _number; } + + //! Returns if the screen was successfully managed + /*! + If this is false, then the screen should be deleted and should NOT be + 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 dimentions of the screen - inline const otk::Point &size() const { return _size; } //! 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; } + //! Returns the number of desktops + inline long numDesktops() const { return _num_desktops; } + + //! Update's the screen's combined strut of all the clients. + /*! + Clients should call this whenever they change their strut. + */ + void updateStrut(); - - //! Adds a window's strut to the screen's list of reserved spaces - void addStrut(otk::Strut *strut); - //! Removes a window's strut from the screen's list of reserved spaces - void removeStrut(otk::Strut *strut); - - //! Loads a new style on the screen - void loadStyle(const otk::Configuration &config); - + //! Manage any pre-existing windows on the screen + void manageExisting(); //! Manage a client window /*! This gives the window a frame, reparents it, selects events on it, etc. @@ -130,6 +179,22 @@ public: it, etc. */ void unmanageWindow(OBClient *client); + + //! Raises/Lowers a client window above/below all others in its stacking + //! layer + void restack(bool raise, OBClient *client); + + //! Sets the name of a desktop + /*! + @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(long i, const std::string &name); + + virtual void propertyHandler(const XPropertyEvent &e); + virtual void clientMessageHandler(const XClientMessageEvent &e); + virtual void mapRequestHandler(const XMapRequestEvent &e); }; }