provide a function to return all the desktop names instead of one at a time. adjust to the new format for otk::Proeprty::get() functions (no nelements)
Dana Jansens danakj@orodu.net
2 files changed,
7 insertions(+),
17 deletions(-)
M
src/screen.cc
→
src/screen.cc
@@ -198,7 +198,7 @@ if (otk::Property::get(_info->rootWindow(),
otk::Property::atoms.net_desktop_layout, otk::Property::atoms.cardinal, &num, &data)) { - if (num >= 4) { + if (num == 4) { if (data[0] == _NET_WM_ORIENTATION_VERT) _layout.orientation = DesktopLayout::Vertical; if (data[3] == _NET_WM_TOPRIGHT)@@ -810,6 +810,9 @@
// the number of rows/columns will differ updateDesktopLayout(); + // may be some unnamed desktops that we need to fill in with names + updateDesktopNames(); + // change our desktop if we're on one that no longer exists! if (_desktop >= _num_desktops) changeDesktop(_num_desktops - 1);@@ -818,7 +821,7 @@
void Screen::updateDesktopNames() { - unsigned long num = (unsigned) -1; + unsigned long num; if (!otk::Property::get(_info->rootWindow(), otk::Property::atoms.net_desktop_names,@@ -828,12 +831,6 @@ while (_desktop_names.size() < _num_desktops)
_desktop_names.push_back("Unnamed"); } - -otk::ustring Screen::desktopName(unsigned int i) const -{ - if (i >= _num_desktops) return ""; - return _desktop_names[i]; -} const otk::Rect& Screen::area(unsigned int desktop) const { assert(desktop < _num_desktops || desktop == 0xffffffff);
M
src/screen.hh
→
src/screen.hh
@@ -222,15 +222,8 @@
//! 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;