make getting a list of strings work right

diff --git a/src/XAtom.cc b/src/XAtom.cc
index 5945b83344333b6301fb4051eee5eb91c32339dc..62a8f710b3c770e7ea4e3958a11f464fda5ad620 100644 (file)
--- a/src/XAtom.cc
+++ b/src/XAtom.cc
@@ -434,7 +434,7 @@ bool XAtom::getValue(Window win, Atoms atom, Atoms type,
  */
 bool XAtom::getValue(Window win, Atoms atom, StringType type,
                      std::string &value) const {
-  int n = 1;
+  unsigned long n = 1;
   StringVect s;
   if (getValue(win, atom, type, n, s)) {
     value = s[0];
@@ -444,8 +444,8 @@ bool XAtom::getValue(Window win, Atoms atom, StringType type,
 }
 
 
-bool XAtom::getValue(Window win, Atoms atom, StringType type, int &nelements,
-                     StringVect &strings) const {
+bool XAtom::getValue(Window win, Atoms atom, StringType type,
+                     unsigned long &nelements, StringVect &strings) const {
   assert(atom >= 0 && atom < NUM_ATOMS);
   assert(type >= 0 && type < NUM_STRING_TYPE);
   assert(win != None); assert(_atoms[atom] != None);
@@ -463,22 +463,22 @@ bool XAtom::getValue(Window win, Atoms atom, StringType type, int &nelements,
   if (!getValue(win, _atoms[atom], t, elements, &value, 8) || elements < 1)
     return false;
 
-  std::string s(reinterpret_cast<char *>(value));
+  std::string s(reinterpret_cast<char *>(value), elements);
   delete [] value;
 
   std::string::const_iterator it = s.begin(), end = s.end();
-  int num = 0;
+  unsigned long num = 0;
   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)
-    if (it == end)
-      break;
+    if (it == end) break;
     ++it;
+    if (it == end) break;
     ++num;
   }
 
-  nelements = elements;
+  nelements = num;
 
   return true;
 }

diff --git a/src/XAtom.hh b/src/XAtom.hh
index 839951a8796e088057c6380d59986116bb6cf454..f4474a4ae1ca07772579edca25414b77412759c5 100644 (file)
--- a/src/XAtom.hh
+++ b/src/XAtom.hh
@@ -207,7 +207,7 @@ public:
   bool getValue(Window win, Atoms atom, StringType type,
                 std::string &value) const;
   bool getValue(Window win, Atoms atom, StringType type,
-                int &nelements, StringVect &strings) const;
+                unsigned long &nelements, StringVect &strings) const;
   
   void eraseValue(Window win, Atoms atom) const;