add support for the WM_CLASS property.

make getValue for a string array return the right number in nelements.

diff --git a/src/XAtom.cc b/src/XAtom.cc
index 488c051109c04ceb24ee8b266a4f261326ac54d1..f6d0be730f82a5e0deda8b3be4b16ab80b4b5bbc 100644 (file)
--- a/src/XAtom.cc
+++ b/src/XAtom.cc
@@ -52,6 +52,7 @@ XAtom::XAtom(Display *d) {
   _atoms[wm_take_focus] = create("WM_TAKE_FOCUS");
   _atoms[wm_name] = create("WM_NAME");
   _atoms[wm_icon_name] = create("WM_ICON_NAME");
+  _atoms[wm_class] = create("WM_CLASS");
   _atoms[motif_wm_hints] = create("_MOTIF_WM_HINTS");
   _atoms[blackbox_hints] = create("_BLACKBOX_HINTS");
   _atoms[blackbox_attributes] = create("_BLACKBOX_ATTRIBUTES");
@@ -471,10 +472,10 @@ bool XAtom::getValue(Window win, Atoms atom, StringType type,
     std::string::const_iterator tmp = it; // current string.begin()
     it = std::find(tmp, end, '\0');       // look for null between tmp and end
     strings.push_back(std::string(tmp, it));   // s[tmp:it)
+    ++num;
     if (it == end) break;
     ++it;
     if (it == end) break;
-    ++num;
   }
 
   nelements = num;

diff --git a/src/XAtom.hh b/src/XAtom.hh
index f4474a4ae1ca07772579edca25414b77412759c5..6e232c85e327d3b8e9b2ffb1d78ab03443f488c1 100644 (file)
--- a/src/XAtom.hh
+++ b/src/XAtom.hh
@@ -57,6 +57,7 @@ public:
     wm_change_state,
     wm_name,
     wm_icon_name,
+    wm_class,
     motif_wm_hints,
     blackbox_attributes,
     blackbox_change_attributes,