X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=9244bb2d594ad88593100ad83d56376939cb03e0;hb=74cfb1b4c115cdb4e05aa823b09d2b5ea9d0d690;hp=aea9d2936511d410baadba3ac673fc809c8e5a3c;hpb=00e2c5aaad4a0831fd1e0d1b1c287df4d6eaac93;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index aea9d293..9244bb2d 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -3,35 +3,31 @@ #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; //! 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; @@ -45,8 +41,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? @@ -58,12 +56,6 @@ 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; @@ -81,7 +73,7 @@ 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 long _desktop; @@ -90,16 +82,16 @@ private: long _num_desktops; //! The names of all desktops - otk::OBProperty::StringVect _desktop_names; + otk::Property::StringVect _desktop_names; - //! Calculate the OBScreen::_area member + //! 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,12 +108,27 @@ private: //! 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); - //! 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; } @@ -132,16 +139,14 @@ 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 long desktop() const { return _desktop; } + 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. /*! @@ -160,35 +165,32 @@ 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/Lowers a client window above/below all others in its stacking - //! layer - void restack(bool raise, OBClient *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 + //! 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 std::string &name); + void setDesktopName(long i, const otk::ustring &name); + + void installColormap(bool install) const; virtual void propertyHandler(const XPropertyEvent &e); virtual void clientMessageHandler(const XClientMessageEvent &e);