9 files changed, 90 insertions, 38 deletions

diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index 9e3868e..5c4f1b8 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -164,7 +164,7 @@ void Color::allocate(unsigned short red, unsigned short green, unsigned short bl
         
     if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
         _FB_USES_NLS;
-        cerr<<"FbTk::Color: "<<_FBTKTEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
+        cerr<<"FbTk::Color: "<<_FBTK_CONSOLETEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
     } else {
         free();
         setRGB(maxValue(color.red),
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index 8d05204..7876821 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -38,6 +38,7 @@
 #endif // _GNU_SOURCE
 
 #include "I18n.hh"
+#include "FileUtil.hh"
 
 #include <X11/Xlocale.h>
 
@@ -72,7 +73,7 @@ void NLSInit(const char *catalog) {
 }
 
 
-I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
+I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)(-1)) {
 #ifdef  HAVE_SETLOCALE
     //make sure we don't get 0 to m_locale string
     char *temp = setlocale(LC_MESSAGES, "");
@@ -122,13 +123,33 @@ I18n *I18n::instance() {
 
 void I18n::openCatalog(const char *catalog) {
 #if defined(NLS) && defined(HAVE_CATOPEN)
-        
+
     string catalog_filename = LOCALEPATH;
     catalog_filename += '/';
     catalog_filename += m_locale;
     catalog_filename += '/';
     catalog_filename += catalog;
 
+    if (!FileUtil::isRegularFile(catalog_filename.c_str()) && m_locale != "C" && FbStringUtil::haveUTF8()) {
+        // try the UTF-8 catalog, this also picks up situations where
+        // the codeset somehow isn't specified
+
+        // remove everything after @
+        string::size_type index = m_locale.find('.');
+        // erase all characters starting at index
+        if (index != string::npos)
+            m_locale.erase(index); 
+
+        m_locale.append(".UTF-8");
+        m_utf8_translate = true;
+
+        catalog_filename = LOCALEPATH;
+        catalog_filename += '/';
+        catalog_filename += m_locale;
+        catalog_filename += '/';
+        catalog_filename += catalog;
+    }
+
 #ifdef MCLoadBySet
     m_catalog_fd = catopen(catalog_filename.c_str(), MCLoadBySet);
 #else // !MCLoadBySet
@@ -147,16 +168,29 @@ void I18n::openCatalog(const char *catalog) {
 }
 
 
+// Translate_FB means it'll become an FbString that goes to X for Fonts, 
+// No translate means it stays in the local encoding, for printing to the
+// console.
 FbString I18n::getMessage(int set_number, int message_number, 
-                             const char *default_message) const {
+                             const char *default_message, bool translate_fb) const {
 
 #if defined(NLS) && defined(HAVE_CATGETS)
     if (m_catalog_fd != (nl_catd)-1) {
         const char *ret = catgets(m_catalog_fd, set_number, message_number, default_message);
+        // can't translate, leave it in raw ascii (utf-8 compatible)
         if (ret == default_message || ret == NULL)
-            return default_message; // don't recode the default
-
-        return FbStringUtil::LocaleStrToFb(ret);
+            return default_message;
+
+        if (!m_utf8_translate && translate_fb) 
+            // Local input, UTF-8 output
+            return FbStringUtil::LocaleStrToFb(ret);
+        else if (m_utf8_translate && !translate_fb)
+            // UTF-8 input, local output
+            return FbStringUtil::FbStrToLocale(ret);
+        else 
+            // UTF-8 input, UTF-8 output OR
+            // local input, local output
+            return ret;
     }
     else
 #endif // NLS && HAVE_CATGETS
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index cbf241d..9a936d8 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -68,20 +68,36 @@ void catclose(nl_catd cat);
     FbTk::I18n &i18n = *FbTk::I18n::instance()
 
 // ignore the description, it's for helping translators
-#define _FBTEXT(msgset, msgid, default_text, description) \
-    i18n.getMessage(FBNLS::msgset ## Set, FBNLS::msgset ## msgid, default_text)
-    
+
+// Text for X
+#define _FB_XTEXT(msgset, msgid, default_text, description) \
+    i18n.getMessage(FBNLS::msgset ## Set, FBNLS::msgset ## msgid, default_text, true)
+
+// Text for console    
+#define _FB_CONSOLETEXT(msgset, msgid, default_text, description) \
+    i18n.getMessage(FBNLS::msgset ## Set, FBNLS::msgset ## msgid, default_text, false)
+
 // This ensure that FbTk nls stuff is in a kind of namespace of its own
-#define _FBTKTEXT( msgset, msgid, default_text, description) \
-    i18n.getMessage(FBNLS::FbTk ## msgset ## Set, FBNLS::FbTk ## msgset ## msgid, default_text)
+#define _FBTK_XTEXT( msgset, msgid, default_text, description) \
+    i18n.getMessage(FBNLS::FbTk ## msgset ## Set, FBNLS::FbTk ## msgset ## msgid, default_text, true)
+
+#define _FBTK_CONSOLETEXT( msgset, msgid, default_text, description) \
+    i18n.getMessage(FBNLS::FbTk ## msgset ## Set, FBNLS::FbTk ## msgset ## msgid, default_text, false)
 
 #else // no NLS
 
 #define _FB_USES_NLS
-#define _FBTEXT(msgset, msgid, default_text, description) \
+
+#define _FB_XTEXT(msgset, msgid, default_text, description) \
     std::string(default_text)
 
-#define _FBTKTEXT(msgset, msgid, default_text, description) \
+#define _FB_CONSOLETEXT(msgset, msgid, default_text, description) \
+    std::string(default_text)
+
+#define _FBTK_XTEXT(msgset, msgid, default_text, description) \
+    std::string(default_text)
+
+#define _FBTK_CONSOLETEXT(msgset, msgid, default_text, description) \
     std::string(default_text)
 
 #endif // defined NLS
@@ -96,15 +112,17 @@ public:
     inline const nl_catd &getCatalogFd() const { return m_catalog_fd; }
 
     FbString getMessage(int set_number, int message_number, 
-                           const char *default_messsage = 0) const;
+                           const char *default_messsage = 0, bool translate_fb = false) const;
+
     void openCatalog(const char *catalog);
 private:
     I18n();
     ~I18n();
     std::string m_locale;
-    bool m_multibyte;
+    bool m_multibyte, m_utf8_translate;
     nl_catd m_catalog_fd;
 
+
 };
 
 void NLSInit(const char *);
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 7fe9154..64e3db5 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -660,7 +660,7 @@ void ImageControl::createColorTable() {
 
     default:
         _FB_USES_NLS;
-        cerr<<"FbTk::ImageControl: "<<_FBTKTEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X")<<endl;
+        cerr<<"FbTk::ImageControl: "<<_FBTK_CONSOLETEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X")<<endl;
         break;
     }
 }
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index d1c80bc..d8e781d 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -87,8 +87,8 @@ bool ResourceManager::load(const char *filename) {
             resource->setFromString(value.addr);
         else {
             _FB_USES_NLS;
-            cerr<<_FBTKTEXT(Error, FailedRead, "Failed to read", "Couldn't load a resource (following)")<<": "<<resource->name()<<endl;
-            cerr<<_FBTKTEXT(Error, UsingDefault, "Setting default value", "Falling back to default value for resource")<<endl;
+            cerr<<_FBTK_CONSOLETEXT(Error, FailedRead, "Failed to read", "Couldn't load a resource (following)")<<": "<<resource->name()<<endl;
+            cerr<<_FBTK_CONSOLETEXT(Error, UsingDefault, "Setting default value", "Falling back to default value for resource")<<endl;
             resource->setDefaultValue();
         }
     }
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 7af8f08..7626c3b 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -70,12 +70,12 @@ TextureRender::TextureRender(ImageControl &imgctrl,
     _FB_USES_NLS;
     // clamp to "normal" size
     if (width > texture_max_width) {
-        cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigWidth, "Warning! Width > 3200 setting Width = 3200", "Image width seems too big, clamping")<<endl;
+        cerr<<"TextureRender: "<<_FBTK_CONSOLETEXT(Error, BigWidth, "Warning! Width > 3200 setting Width = 3200", "Image width seems too big, clamping")<<endl;
         width = texture_max_width;
     }
 
     if (height > texture_max_height) {
-        cerr<<"TextureRender: "<<_FBTKTEXT(Error, BigHeight, "Warning! Height > 3200 setting Height = 3200", "Image height seems too big, clamping")<<endl;
+        cerr<<"TextureRender: "<<_FBTK_CONSOLETEXT(Error, BigHeight, "Warning! Height > 3200 setting Height = 3200", "Image height seems too big, clamping")<<endl;
         height = texture_max_height;
     }
 
@@ -120,7 +120,7 @@ void TextureRender::allocateColorTables() {
         char sbuf[128];
         sprintf(sbuf, "%ld", (long int) size);
         throw std::string("TextureRender::TextureRender(): " + 
-              std::string(_FBTKTEXT(Error, OutOfMemoryRed, "Out of memory while allocating red buffer.", "")) + string(sbuf));
+              std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryRed, "Out of memory while allocating red buffer.", "")) + string(sbuf));
     }
 
 
@@ -129,7 +129,7 @@ void TextureRender::allocateColorTables() {
         char sbuf[128];
         sprintf(sbuf, "%ld", (long int) size);
         throw std::string("TextureRender::TextureRender(): " + 
-              std::string(_FBTKTEXT(Error, OutOfMemoryGreen, "Out of memory while allocating green buffer.", ""))+ string(sbuf));
+              std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryGreen, "Out of memory while allocating green buffer.", ""))+ string(sbuf));
     }
 
     blue = FB_new_nothrow unsigned char[size];
@@ -137,7 +137,7 @@ void TextureRender::allocateColorTables() {
         char sbuf[128];
         sprintf(sbuf, "%ld", (long int) size);
         throw std::string("TextureRender::TextureRender(): " +
-              std::string(_FBTKTEXT(Error, OutOfMemoryBlue, "Out of memory while allocating blue buffer.", ""))+ string(sbuf));
+              std::string(_FBTK_CONSOLETEXT(Error, OutOfMemoryBlue, "Out of memory while allocating blue buffer.", ""))+ string(sbuf));
     }
 
 
@@ -152,7 +152,7 @@ Pixmap TextureRender::renderSolid(const FbTk::Texture &texture) {
 
     if (pixmap.drawable() == None) {
         _FB_USES_NLS;
-        cerr<<"FbTk::TextureRender::render_solid(): "<<_FBTKTEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
+        cerr<<"FbTk::TextureRender::render_solid(): "<<_FBTK_CONSOLETEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
         return None;
     }
 
@@ -321,7 +321,7 @@ XImage *TextureRender::renderXImage() {
 
     if (! image) {
         _FB_USES_NLS;
-        cerr << "FbTk::TextureRender::renderXImage(): " << _FBTKTEXT(Error, CreateXImage, "Can't create XImage", "Couldn't create an XImage") << "." << endl;
+        cerr << "FbTk::TextureRender::renderXImage(): " << _FBTK_CONSOLETEXT(Error, CreateXImage, "Can't create XImage", "Couldn't create an XImage") << "." << endl;
         return 0;
     }
 
@@ -594,7 +594,7 @@ XImage *TextureRender::renderXImage() {
     default:
         _FB_USES_NLS;
         cerr << "TextureRender::renderXImage(): " <<
-            _FBTKTEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
+            _FBTK_CONSOLETEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
         delete [] d;
         XDestroyImage(image);
         return (XImage *) 0;
@@ -697,7 +697,7 @@ XImage *TextureRender::renderXImage() {
     default:
         _FB_USES_NLS;
         cerr << "TextureRender::renderXImage(): " <<
-            _FBTKTEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
+            _FBTK_CONSOLETEXT(Error, UnsupportedVisual, "Unsupported visual", "A visual is a technical term in X") << endl;
         delete [] d;
         XDestroyImage(image);
         return (XImage *) 0;
@@ -716,7 +716,7 @@ Pixmap TextureRender::renderPixmap() {
 
     if (pixmap.drawable() == None) {
         _FB_USES_NLS;
-        cerr<<"FbTk::TextureRender::renderPixmap(): "<<_FBTKTEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
+        cerr<<"FbTk::TextureRender::renderPixmap(): "<<_FBTK_CONSOLETEXT(Error, CreatePixmap, "Error creating pixmap", "Couldn't create a pixmap - image - for some reason")<<endl;
         return None;
     }
 
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index e3c7f7f..6ff26a9 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -190,7 +190,7 @@ void ThemeManager::loadTheme(Theme &tm) {
             if (!tm.fallback(*resource)) {
                 if (verbose()) {
                     _FB_USES_NLS;
-                    cerr<<_FBTKTEXT(Error, ThemeItem, "Failed to read theme item", "When reading a style, couldn't read a specific item (following)")<<": "<<resource->name()<<endl;
+                    cerr<<_FBTK_CONSOLETEXT(Error, ThemeItem, "Failed to read theme item", "When reading a style, couldn't read a specific item (following)")<<": "<<resource->name()<<endl;
                 }
                 resource->setDefaultValue();
             }
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index edbab62..81aca99 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -52,7 +52,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) {
                                                   PictFormatDepth | PictFormatAlphaMask,
                                                   &pic_format, 0);
     if (format == 0) {
-        cerr<<"FbTk::Transparent: "<<_FBTKTEXT(Error, NoRenderFormat, "Warning: Failed to find valid format for alpha.", "transparency requires a pict format, can't get one...")<<endl;
+        cerr<<"FbTk::Transparent: "<<_FBTK_CONSOLETEXT(Error, NoRenderFormat, "Warning: Failed to find valid format for alpha.", "transparency requires a pict format, can't get one...")<<endl;
         return 0;
     }
 
@@ -60,7 +60,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) {
     Pixmap alpha_pm = XCreatePixmap(disp, drawable,
                                     1, 1, 8);
     if (alpha_pm == 0) {
-        cerr<<"FbTk::Transparent: "<<_FBTKTEXT(Error, NoRenderPixmap, "Warning: Failed to create alpha pixmap.", "XCreatePixmap failed for our transparency pixmap")<<endl;
+        cerr<<"FbTk::Transparent: "<<_FBTK_CONSOLETEXT(Error, NoRenderPixmap, "Warning: Failed to create alpha pixmap.", "XCreatePixmap failed for our transparency pixmap")<<endl;
         return 0;
     }
 
@@ -71,7 +71,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) {
                                              format, CPRepeat, &attr);
     if (alpha_pic == 0) {
         XFreePixmap(disp, alpha_pm);
-        cerr<<"FbTk::Transparent: "<<_FBTKTEXT(Error, NoRenderPicture, "Warning: Failed to create alpha picture.", "XRenderCreatePicture failed")<<endl;
+        cerr<<"FbTk::Transparent: "<<_FBTK_CONSOLETEXT(Error, NoRenderPicture, "Warning: Failed to create alpha picture.", "XRenderCreatePicture failed")<<endl;
         return 0;
     }
 
@@ -234,7 +234,7 @@ void Transparent::setDest(Drawable dest, int screen_num) {
         if (format == 0) {
             _FB_USES_NLS;
             cerr<<"FbTk::Transparent: ";
-            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
+            fprintf(stderr, _FBTK_CONSOLETEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
             cerr<<endl;
         }
         m_dest_pic = XRenderCreatePicture(disp, dest, format, 0, 0);
@@ -273,7 +273,7 @@ void Transparent::setSource(Drawable source, int screen_num) {
         if (format == 0) {
             _FB_USES_NLS;
             cerr<<"FbTk::Transparent: ";
-            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
+            fprintf(stderr, _FBTK_CONSOLETEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
             cerr<<endl;
         }
         m_src_pic = XRenderCreatePicture(disp, m_source, format,
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index f356224..7398625 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -149,7 +149,7 @@ void XFontImp::rotate(FbTk::Orientation orient) {
     XRotFontStruct *rotfont = m_rotfonts[orient];
 
     if (rotfont == 0) {
-        cerr<<"RotFont: "<<_FBTKTEXT(Error, OutOfMemory, "Out of memory", "Something couldn't allocate memory")<<endl;
+        cerr<<"RotFont: "<<_FBTK_CONSOLETEXT(Error, OutOfMemory, "Out of memory", "Something couldn't allocate memory")<<endl;
         return;
     }
    
@@ -215,7 +215,7 @@ void XFontImp::rotate(FbTk::Orientation orient) {
                                   vert_w, vert_h, 8, 0);
 
         if (I1 == None) {                               
-            cerr << "RotFont: " << _FBTKTEXT(Error, CreateXImage, 
+            cerr << "RotFont: " << _FBTK_CONSOLETEXT(Error, CreateXImage, 
                                          "Can't create XImage", 
                                          "XCreateImage failed for some reason")
                  << "." << endl;
@@ -257,7 +257,7 @@ void XFontImp::rotate(FbTk::Orientation orient) {
                           (char *)bitdata, bit_w, bit_h, 8, 0); 
 
         if (I2 == None) {
-            cerr << "XFontImp: " <<_FBTKTEXT(Error, CreateXImage,
+            cerr << "XFontImp: " <<_FBTK_CONSOLETEXT(Error, CreateXImage,
                                           "Can't create XImage",
                                           "XCreateImage failed for some reason") 
                  << "." << endl;