defualt START_WITH_NEXT to true for desktops too

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 7bf726456b2ec00c5f03ad8a667cc217e6616aa6..53a6d768eec94a2eeb2bbd94b0606d8a3a81a73a 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -576,6 +576,17 @@ void Client::updateWMHints(bool initstate)
     } else // no group!
       _group = None;
 
+    if (hints->flags & IconPixmapHint) {
+      updateKwmIcon(); // try get the kwm icon first, this is a fallback only
+      if (_pixmap_icon == None) {
+        _pixmap_icon = hints->icon_pixmap;
+        if (hints->flags & IconMaskHint)
+          _pixmap_icon_mask = hints->icon_mask;
+        else
+          _pixmap_icon_mask = None;
+      }
+    }
+
     XFree(hints);
   }
 
@@ -758,15 +769,15 @@ void Client::updateIcons()
 
 void Client::updateKwmIcon()
 {
-  _kwm_icon = _kwm_icon_mask = None;
+  _pixmap_icon = _pixmap_icon_mask = None;
 
   unsigned long num = 2;
   Pixmap *data;
   if (otk::Property::get(_window, otk::Property::atoms.kwm_win_icon,
                          otk::Property::atoms.kwm_win_icon, &num, &data)) {
     if (num >= 2) {
-      _kwm_icon = data[0];
-      _kwm_icon_mask = data[1];
+      _pixmap_icon = data[0];
+      _pixmap_icon_mask = data[1];
     }
     delete [] data;
   }