}
-bool Rect::contains(int __x, int __y) const {
- return __x >= _x1 && __x <= _x2 &&
- __y >= _y1 && __y <= _y2;
-}
-
-
string expandTilde(const string& s) {
if (s[0] != '~') return s;
string ret;
if (text_prop.value && text_prop.nitems > 0) {
- ret = (char *) text_prop.value;
- if (text_prop.encoding != XA_STRING) {
+ if (text_prop.encoding == XA_STRING) {
+ ret = (char *) text_prop.value;
+ } else {
text_prop.nitems = strlen((char *) text_prop.value);
char **list;