X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=4eb81d4aebd0b222beebf963f1fd48701ea543eb;hb=b18959e1bda52f807f62c95772c69ce3005215a7;hp=ce6d6dea781280f82cb959be4f10286e79357fff;hpb=89e6d5c0e64513d06ac4368981239de969a6fc9d;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index ce6d6dea..4eb81d4a 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -3,36 +3,46 @@ #define __screen_hh /*! @file screen.hh - @brief OBScreen manages a single screen + @brief Screen manages a single screen */ extern "C" { #include } -#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; + +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 { +class Screen : public otk::EventHandler { public: - //! Holds a list of OBClient objects - typedef std::list ClientList; //! 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,18 +53,8 @@ public: ButtonPressMask | ButtonReleaseMask; - enum StackLayer { - Layer_Icon, // 0 - iconified windows, in any order at all - Layer_Desktop, // 1 - desktop windows - Layer_Below, // 2 - normal windows w/ below - Layer_Normal, // 3 - normal windows - Layer_Above, // 4 - normal windows w/ above - Layer_Top, // 5 - always-on-top-windows (docks?) - Layer_Fullscreen, // 6 - fullscreeen windows - Layer_Internal, // 7 - openbox windows/menus - NUM_LAYERS - }; - + //! Holds a list of Clients + typedef std::list ClientList; //! All managed clients on the screen (in order of being mapped) ClientList clients; @@ -68,76 +68,125 @@ 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; - //! Areas of the screen reserved by applications + //! 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; + //! 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 ClientList _stacking; - //! Calculate the OBScreen::_area member + //! The desktop currently being displayed + unsigned int _desktop; + + //! The number of 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 + 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(); + + //! 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(); + //! Constructs a new Screen object + Screen(int screen); + //! Destroys the Screen object + virtual ~Screen(); #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 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; } + //! 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; + + 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); - //! 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); + //! Update's the screen's combined strut of all the clients. + /*! + Clients should call this whenever they change their strut. + */ + void updateStruts(); //! Manage any pre-existing windows on the screen void manageExisting(); @@ -150,14 +199,38 @@ 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 - void raise(OBClient *client); + /*! + 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 lower(OBClient *client); + 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); + + otk::ustring desktopName(unsigned int i) const; + + void installColormap(bool install) const; + + virtual void propertyHandler(const XPropertyEvent &e); + virtual void clientMessageHandler(const XClientMessageEvent &e); + virtual void mapRequestHandler(const XMapRequestEvent &e); }; }