3 files changed, 31 insertions, 11 deletions

diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index a88b237..6c5ffbb 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -107,6 +107,14 @@ void shutdown() {
    @param size number of BYTES to convert
    @return the recoded string, or 0 on failure
 */
+
+/** 
+  --NOTE--
+  In the "C" locale, this will strip any high-bit characters
+  because C means 7-bit ASCII charset. If you don't want this
+  then you need to set your locale to something UTF-8, OR something
+  ISO8859-1.
+*/
 std::string recode(iconv_t cd,
              const std::string &in) {
 
diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh
index 371d4e9..011d47a 100644
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@@ -49,10 +49,6 @@ std::string FbStrToX(const FbString &src);
 FbString LocaleStrToFb(const std::string &src);
 std::string FbStrToLocale(const FbString &src);
 
-// essentially NO-OP
-inline FbString UTF8StrToFb(const std::string &src) { return src; } 
-inline std::string FbStrToUTF8(const FbString &src) { return src; }
-
 bool haveUTF8();
 
 } // namespace FbStringUtil
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 8f204b1..2c34fa1 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -23,6 +23,7 @@
 
 #include "FbWindow.hh"
 #include "FbPixmap.hh"
+#include "FbString.hh"
 
 #include "EventManager.hh"
 #include "Color.hh"
@@ -450,28 +451,43 @@ void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) {
 
 std::string FbWindow::textProperty(Atom property) const {
     XTextProperty text_prop;
-    char ** stringlist;
+    char ** stringlist = 0;
     int count;
     std::string ret;
 
+    static Atom m_utf8string = XInternAtom(display(), "UTF8_STRING", False);
+
     if (XGetTextProperty(display(), window(), &text_prop, property) == 0)
         return "";
 
     if (text_prop.value == 0 || text_prop.nitems == 0)
         return "";
 
-    if (text_prop.encoding != XA_STRING) {
-        // still returns a "StringList" despite the different name
-        if (XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count) == 0 || count == 0)
+    if (text_prop.encoding == XA_STRING) {
+        if (XTextPropertyToStringList(&text_prop, &stringlist, &count) == 0 || count == 0)
             return "";
-    } else {
+        ret = FbStringUtil::XStrToFb(stringlist[0]);
+    } else if (text_prop.encoding == m_utf8string && text_prop.format == 8) {
+#ifdef X_HAVE_UTF8_STRING
+        Xutf8TextPropertyToTextList(display(), &text_prop, &stringlist, &count);
+        if (count == 0)
+            return "";
+#else
         if (XTextPropertyToStringList(&text_prop, &stringlist, &count) == 0 || count == 0)
             return "";
+#endif
+        ret = stringlist[0];
+    } else {
+        // still returns a "StringList" despite the different name
+        if (XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count) == 0 || count == 0)
+            return "";
 
+        ret = FbStringUtil::LocaleStrToFb(stringlist[0]);
     }
 
-    ret = stringlist[0];
-    XFreeStringList(stringlist);
+    // they all use stringlist
+    if (stringlist) 
+        XFreeStringList(stringlist);
     return ret;
 }