X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FXAtom.cc;h=a98c366fc79cc9e15e1fd3db951d2cc6504d7221;hb=20bc088a998a362977233086577d74d00eea8765;hp=5945b83344333b6301fb4051eee5eb91c32339dc;hpb=578a5cc980dd39430fe803a4ca9719075e78e986;p=chaz%2Fopenbox diff --git a/src/XAtom.cc b/src/XAtom.cc index 5945b833..a98c366f 100644 --- a/src/XAtom.cc +++ b/src/XAtom.cc @@ -276,7 +276,7 @@ void XAtom::setValue(Window win, Atoms atom, Atoms type, assert(atom >= 0 && atom < NUM_ATOMS); assert(type >= 0 && type < NUM_ATOMS); setValue(win, _atoms[atom], _atoms[type], - reinterpret_cast(&value), 32, 1, false); + reinterpret_cast(&value), 32, 1, False); } @@ -288,7 +288,7 @@ void XAtom::setValue(Window win, Atoms atom, Atoms type, assert(atom >= 0 && atom < NUM_ATOMS); assert(type >= 0 && type < NUM_ATOMS); setValue(win, _atoms[atom], _atoms[type], - reinterpret_cast(value), 32, elements, false); + reinterpret_cast(value), 32, elements, False); } @@ -304,11 +304,11 @@ void XAtom::setValue(Window win, Atoms atom, StringType type, switch (type) { case ansi: t = _atoms[string]; break; case utf8: t = _atoms[utf8_string]; break; - default: assert(false); // unhandled StringType + default: assert(False); // unhandled StringType } setValue(win, _atoms[atom], t, reinterpret_cast(const_cast(value.c_str())), - 8, value.size() + 1, false); // add 1 to the size to include the null + 8, value.size() + 1, False); // add 1 to the size to include the null } @@ -324,7 +324,7 @@ void XAtom::setValue(Window win, Atoms atom, StringType type, switch (type) { case ansi: t = _atoms[string]; break; case utf8: t = _atoms[utf8_string]; break; - default: assert(false); // unhandled StringType + default: assert(False); // unhandled StringType } std::string value; @@ -336,14 +336,14 @@ void XAtom::setValue(Window win, Atoms atom, StringType type, setValue(win, _atoms[atom], t, reinterpret_cast(const_cast(value.c_str())), - 8, value.size(), false); + 8, value.size(), False); } /* * Internal getValue function used by all of the typed getValue functions. * Gets an property's value from a window. - * Returns true if the property was successfully retrieved; false if the + * Returns True if the property was successfully retrieved; False if the * property did not exist on the window, or has a different type/size format * than the user tried to retrieve. */ @@ -353,7 +353,7 @@ bool XAtom::getValue(Window win, Atom atom, Atom type, assert(win != None); assert(atom != None); assert(type != None); assert(size == 8 || size == 16 || size == 32); assert(nelements > 0); - unsigned char *c_val; // value alloc'd with c malloc + unsigned char *c_val = 0; // value alloc'd with c malloc Atom ret_type; int ret_size; unsigned long ret_bytes; @@ -363,13 +363,12 @@ bool XAtom::getValue(Window win, Atom atom, Atom type, result = XGetWindowProperty(_display, win, atom, 0l, 1l, False, AnyPropertyType, &ret_type, &ret_size, &nelements, &ret_bytes, &c_val); - if (result != Success || ret_type == None || nelements < 1) - // an error occured, the property does not exist on the window, or is empty - return false; - if (ret_type != type || ret_size != size) { - // wrong data in property - XFree(c_val); - return false; + if (result != Success || ret_type != type || ret_size != size || + nelements < 1) { + // an error occured, the property does not exist on the window, or is empty, + // or the wrong data is in property for the request + if (c_val) XFree(c_val); + return False; } // the data is correct, now, is there more elements left? if (ret_bytes == 0 || maxread <= nelements) { @@ -377,7 +376,7 @@ bool XAtom::getValue(Window win, Atom atom, Atom type, *value = new unsigned char[nelements * size/8 + 1]; memcpy(*value, c_val, nelements * size/8 + 1); XFree(c_val); - return true; + return True; } // get the entire property since it is larger than one long XFree(c_val); @@ -394,7 +393,7 @@ bool XAtom::getValue(Window win, Atom atom, Atom type, *value = new unsigned char[nelements * size/8 + 1]; memcpy(*value, c_val, nelements * size/8 + 1); XFree(c_val); - return true; + return True; } @@ -422,10 +421,10 @@ bool XAtom::getValue(Window win, Atoms atom, Atoms type, unsigned long num = 1; if (! getValue(win, _atoms[atom], _atoms[type], num, reinterpret_cast(&temp), 32)) - return false; + return False; value = temp[0]; delete [] temp; - return true; + return True; } @@ -434,18 +433,18 @@ 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]; - return true; + return True; } - return false; + return False; } -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); @@ -455,32 +454,32 @@ bool XAtom::getValue(Window win, Atoms atom, StringType type, int &nelements, switch (type) { case ansi: t = _atoms[string]; break; case utf8: t = _atoms[utf8_string]; break; - default: assert(false); // unhandled StringType + default: assert(False); // unhandled StringType } unsigned char *value; unsigned long elements = (unsigned) -1; if (!getValue(win, _atoms[atom], t, elements, &value, 8) || elements < 1) - return false; + return False; - std::string s(reinterpret_cast(value)); + std::string s(reinterpret_cast(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; + return True; }