X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=20ba0a63243f9349325b4f523df7e39cfddaceb3;hb=cce970813f088952e05e20f13d77d6f4766863e3;hp=f27e41f1f4fced166a3ca12ea920302b1177835a;hpb=7175ac2b5aec7aface6a2f86df32dd0386e0cc05;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index f27e41f1..20ba0a63 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -3,38 +3,46 @@ #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 "widget.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" +#include "otk/ustring.hh" #include #include namespace ob { -class OBClient; -class OBRootWindow; +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 OBScreen : public otk::OtkEventHandler, public OBWidget { +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 | @@ -46,7 +54,7 @@ public: ButtonReleaseMask; //! All managed clients on the screen (in order of being mapped) - OBClient::List clients; + std::list clients; private: //! Was %Openbox able to manage the screen? @@ -57,21 +65,14 @@ 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; - - //! 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,25 +82,31 @@ private: Window _supportwindow; //! A list of all managed clients on the screen, in their stacking order - OBClient::List _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::OBProperty::StringVect _desktop_names; + otk::Property::StringVect _desktop_names; - //! Calculate the OBScreen::_area member + //! 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 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 changeClientList(); //! Set the client stacking list on the root window @@ -116,13 +123,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(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(); -#endif + //! Constructs a new Screen object + Screen(int screen); + //! Destroys the Screen object + virtual ~Screen(); inline int number() const { return _number; } @@ -132,24 +155,37 @@ 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 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(); @@ -162,35 +198,27 @@ 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); - - //! Raises/Lowers a client window above/below all others in its stacking - //! layer - void restack(bool raise, OBClient *client); + void unmanageWindow(Client *client); - //! Changes to the specified desktop, displaying windows on it and hiding - //! windows on the others. + //! Raises a client window above all others in its stacking layer /*! - @param desktop The number of the desktop to switch to (starts from 0). - If the desktop is out of valid range, it is ignored. + 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 changeDesktop(long desktop); + void raiseWindow(Client *client); - //! 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); + //! Lowers a client window below all others in its stacking layer + void lowerWindow(Client *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); + const otk::Property::StringVect& desktopNames() const + { return _desktop_names; } + + void installColormap(bool install) const; virtual void propertyHandler(const XPropertyEvent &e); virtual void clientMessageHandler(const XClientMessageEvent &e);