}
+bool Rect::contains(const Rect& a) const {
+ return a._x1 >= _x1 && a._x2 <= _x2 &&
+ a._y1 >= _y1 && a._y2 <= _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;