X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=2f0260831ca90a32183de2c212077238ac9eff14;hb=d2a1ecb1b50902d262a74e347203a36a961e1d92;hp=ab0bc25aea37841c0196fb186a9105ceec4739b1;hpb=1cd253f4684ee126340fae38094b637f1b0010ea;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index ab0bc25a..2f026083 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -10,8 +10,7 @@ extern "C" { #include } -#include "widgetbase.hh" -#include "otk/renderstyle.hh" +#include "config.hh" #include "otk/strut.hh" #include "otk/rect.hh" #include "otk/screeninfo.hh" @@ -26,13 +25,25 @@ namespace ob { class Client; +struct DesktopLayout { + enum Corner { TopLeft, TopRight, BottomRight, BottomLeft }; + enum Direction { Horizontal, Vertical }; + + Direction orientation; + Corner start_corner; + unsigned int rows; + unsigned int columns; +}; + //! 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 StrutList; + typedef std::vector StrutList; + //! Holds a list of otk::Rect objects + typedef std::vector RectList; static const unsigned long event_mask = ColormapChangeMask | EnterWindowMask | @@ -43,10 +54,8 @@ public: ButtonPressMask | ButtonReleaseMask; - //! Holds a list of Clients - typedef std::list ClientList; //! All managed clients on the screen (in order of being mapped) - ClientList clients; + std::list clients; private: //! Was %Openbox able to manage the screen? @@ -57,18 +66,17 @@ private: //! Information about this screen const otk::ScreenInfo *_info; - - //! The style with which to render on the screen - otk::RenderStyle _style; - - //! Is the root colormap currently installed? - bool _root_cmap_installed; - //! Area usable for placement etc (total - struts) - otk::Rect _area; + //! Configuration options from the user scripts + Config _config; + + //! 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; @@ -78,17 +86,23 @@ private: Window _supportwindow; //! A list of all managed clients on the screen, in their stacking order - ClientList _stacking; + std::list _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; + //! The layout of the desktops as specified by an EWMH compliant pager + DesktopLayout _layout; + + //! True when the window manager is in 'showing desktop' mode + bool _showing_desktop; + //! Calculate the Screen::_area member void calcArea(); //! Set the list of supported NETWM atoms on the root window @@ -113,28 +127,29 @@ private: //! Get desktop names from the root window property void updateDesktopNames(); + //! Gets the layout of the desktops from the root window property + void updateDesktopLayout(); + //! 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); + 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 //! Constructs a new Screen object Screen(int screen); //! Destroys the Screen object virtual ~Screen(); -#endif inline int number() const { return _number; } @@ -144,22 +159,40 @@ public: used. */ inline bool managed() const { return _managed; } - //! 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::RenderStyle *style() const { return &_style; } + + //! Returns the config options set by the user scripts + Config& config() { return _config; } + //! 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; } + //! When true, the desktop is being shown and all clients are hidden + inline bool showingDesktop() const { return _showing_desktop; } + + //! 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; + + //! Gives the layout of how the desktops are being displayed, the number of + //! rows and columns etc. + const DesktopLayout& desktopLayout() const { return _layout; } + + //! Shows and focuses the desktop and hides all the client windows, or + //! returns to the normal state, showing client windows. + void showDesktop(bool show); //! 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(); @@ -189,13 +222,8 @@ public: //! 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(long i, const otk::ustring &name); + const otk::Property::StringVect& desktopNames() const + { return _desktop_names; } void installColormap(bool install) const;