X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.hh;h=20ba0a63243f9349325b4f523df7e39cfddaceb3;hb=cce970813f088952e05e20f13d77d6f4766863e3;hp=4eb81d4aebd0b222beebf963f1fd48701ea543eb;hpb=b18959e1bda52f807f62c95772c69ce3005215a7;p=chaz%2Fopenbox diff --git a/src/screen.hh b/src/screen.hh index 4eb81d4a..20ba0a63 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -53,10 +53,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? @@ -67,7 +65,7 @@ private: //! Information about this screen const otk::ScreenInfo *_info; - + //! Area usable for placement etc (total - struts), one per desktop, //! plus one extra for windows on all desktops RectList _area; @@ -84,7 +82,7 @@ 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 unsigned int _desktop; @@ -144,12 +142,10 @@ private: 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; } @@ -159,6 +155,7 @@ public: used. */ inline bool managed() const { return _managed; } + //! An offscreen window which gets focus when nothing else has it inline Window focuswindow() const { return _focuswindow; } //! Returns the desktop being displayed @@ -176,6 +173,8 @@ public: */ 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 @@ -216,15 +215,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(unsigned int i, const otk::ustring &name); - - otk::ustring desktopName(unsigned int i) const; + const otk::Property::StringVect& desktopNames() const + { return _desktop_names; } void installColormap(bool install) const;