X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FUtil.cc;h=d80834447971b425750bd5ee44dc04665eac95f1;hb=47585423c6494391db0425f2237890e82f1b031a;hp=9dadb3e10ea510fcd73961536fdc7f8958d83a3b;hpb=351a06655bdd7d440780b5bc5b255081c888044b;p=chaz%2Fopenbox

diff --git a/src/Util.cc b/src/Util.cc
index 9dadb3e1..d8083444 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -147,6 +147,12 @@ bool Rect::contains(int __x, int __y) const {
 }
 
 
+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;
 
@@ -188,8 +194,9 @@ string textPropertyToString(Display *display, XTextProperty& text_prop) {
   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;