M src/XAtom.cc → src/XAtom.cc

@@ -52,6 +52,7 @@ _atoms[wm_delete_window] = create("WM_DELETE_WINDOW");
   _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 @@ while(num < nelements) {
     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;

M src/XAtom.hh → src/XAtom.hh

@@ -57,6 +57,7 @@ wm_take_focus,
     wm_change_state,
     wm_name,
     wm_icon_name,
+    wm_class,
     motif_wm_hints,
     blackbox_attributes,
     blackbox_change_attributes,