make client_showhide a static function

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 9e3cdae195cb2dac77f9476b5c2dbd7303226813..2e78cb7672ff439db78dce1eb6f0f3a219b332dd 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -151,10 +151,15 @@ void Client::getDesktop()
 {
   // defaults to the current desktop
   _desktop = openbox->screen(_screen)->desktop();
+  unsigned int d;
 
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_desktop,
                          otk::Property::atoms.cardinal,
-                         (long unsigned*)&_desktop)) {
+                         (long unsigned*)&d)) {
+    if (d >= openbox->screen(_screen)->numDesktops() &&
+        d != 0xffffffff)
+      d = openbox->screen(_screen)->numDesktops() - 1;
+    _desktop = d;
 #ifdef DEBUG
 //    printf("Window requested desktop: %ld\n", _desktop);
 #endif