1 files changed, 12 insertions, 141 deletions

diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 8d8fbec..42e33c1 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -71,6 +71,7 @@
 #include <typeinfo>
 #include <langinfo.h>
 
+#include <errno.h>
 
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
@@ -87,68 +88,6 @@ namespace {
 #include <locale.h>
 #endif //HAVE_SETLOCALE
 
-#ifdef HAVE_ICONV
-/**
-   Recodes the text from one encoding to another
-   assuming cd is correct
-   @param cd the iconv type
-   @param msg text to be converted
-   @param size number of chars to convert
-   @return the recoded string, or 0 on failure
-*/
-char* recode(iconv_t cd,
-             const char *msg, size_t size) {
-
-    // If empty message, yes this can happen, return
-    if(strlen(msg) == 0 || size == 0) 
-        return 0;
-
-    if(strlen(msg) < size)
-        size = strlen(msg);
-    
-    size_t inbytesleft = size;
-    size_t outbytesleft = 4*inbytesleft;
-    char *new_msg = new char[outbytesleft];
-    char *new_msg_ptr = new_msg;
-    char *msg_ptr = strdup(msg);
-    char *orig_msg_ptr = msg_ptr; // msg_ptr modified in iconv call
-    size_t result = (size_t)(-1);
-
-#ifdef HAVE_CONST_ICONV    
-    result = iconv(cd, (const char**)(&msg_ptr), &inbytesleft, &new_msg, &outbytesleft);
-#else
-    result = iconv(cd, &msg_ptr, &inbytesleft, &new_msg, &outbytesleft);
-#endif  // HAVE_CONST_ICONV
-
-    if (result == (size_t)(-1)) {
-        // iconv can fail for three reasons
-        // 1) Invalid multibyte sequence is encountered in the input
-        // 2) An incomplete multibyte sequence 
-        // 3) The output buffer has no more room for the next converted character.
-        // So we the delete new message and return original message
-        delete[] new_msg_ptr;
-        free(orig_msg_ptr);
-        return 0;
-    }
-    free(orig_msg_ptr);
-
-    *new_msg = '\0';
- 
-    if(inbytesleft != 0) {
-        delete[] new_msg_ptr;
-        return 0;
-    }
-
-    return new_msg_ptr;
-}
-#else
-
-char *recode(int cd,
-             const char *msg, size_t size) {
-    return 0;
-}
-#endif // HAVE_ICONV
-
 // use to map <font1>|<font2>|<font3> => <fontthatworks>
 typedef std::map<std::string, std::string> StringMap;
 typedef StringMap::iterator StringMapIt;
@@ -179,11 +118,6 @@ bool Font::s_multibyte = false;
 bool Font::s_utf8mode = false;
 
 
-void Font::init() {
-    // must be set before the first XFontSet is created
-    setlocale(LC_CTYPE, "");
-}
-
 void Font::shutdown() {
 
     FontCacheIt fit;
@@ -203,12 +137,7 @@ Font::Font(const char *name):
     m_fontimp(0),
     m_shadow(false), m_shadow_color("black", DefaultScreen(App::instance()->display())), 
     m_shadow_offx(2), m_shadow_offy(2),
-    m_halo(false), m_halo_color("white", DefaultScreen(App::instance()->display())),
-#ifdef HAVE_ICONV
-    m_iconv((iconv_t)(-1))
-#else
-    m_iconv(-1)
-#endif // HAVE_ICONV
+    m_halo(false), m_halo_color("white", DefaultScreen(App::instance()->display()))
 {
     // MB_CUR_MAX returns the size of a char in the current locale
     if (MB_CUR_MAX > 1) // more than one byte, then we're multibyte
@@ -224,35 +153,9 @@ Font::Font(const char *name):
     if (locale_codeset && strcmp("UTF-8", locale_codeset) == 0) {
         s_utf8mode = true;
     } else if (locale_codeset != 0) {
-        // if locale isn't UTF-8 we try to
-        // create a iconv pointer so we can
-        // convert non utf-8 strings to utf-8
-
-#ifdef DEBUG
-        cerr<<"FbTk::Font: check UTF-8 convert for codeset = "<<locale_codeset<<endl;
-#endif // DEBUG
-
-#ifdef HAVE_ICONV
-        m_iconv = iconv_open("UTF-8", locale_codeset);
-        if(m_iconv == (iconv_t)(-1)) {
-            cerr<<"FbTk::Font: code error: from "<<locale_codeset<<" to: UTF-8"<<endl;
-            // if we failed with iconv then we can't convert
-            // the strings to utf-8, so we disable utf8 mode
-            s_utf8mode = false;
-        } else {
-            // success, we can now enable utf8mode 
-            // and if antialias is on later we can recode
-            // the non utf-8 string to utf-8 and use utf-8 
-            // drawing functions
-            s_utf8mode = true;
-        }
-#endif // HAVE_ICONV
+        s_utf8mode = FbStringUtil::haveUTF8();
     }
 
-#ifdef DEBUG
-    cerr<<"FbTk::Font m_iconv = "<<m_iconv<<endl;
-#endif // DEBUG
-
     if (name != 0) {
         load(name);
     }
@@ -260,10 +163,6 @@ Font::Font(const char *name):
 }
 
 Font::~Font() {
-#ifdef HAVE_ICONV
-    if (m_iconv != (iconv_t)(-1))
-        iconv_close(m_iconv);
-#endif // HAVE_ICONV
 }
 
 bool Font::load(const std::string &name) {
@@ -333,18 +232,7 @@ bool Font::load(const std::string &name) {
     return false;
 }
 
-unsigned int Font::textWidth(const char * const text, unsigned int size) const {
-#ifdef HAVE_ICONV
-    if (m_fontimp->utf8() && m_iconv != (iconv_t)(-1)) {
-        char* rtext  = recode(m_iconv, text, size);
-        if (rtext != 0)
-            size = strlen(rtext);
-        unsigned int r = m_fontimp->textWidth(rtext ? rtext : text, size);
-        if (rtext != 0)
-            delete[] rtext;
-        return r;
-    }
-#endif // HAVE_ICONV
+unsigned int Font::textWidth(const FbString &text, unsigned int size) const {
     return m_fontimp->textWidth(text, size);
 }
 
@@ -365,53 +253,36 @@ bool Font::validOrientation(FbTk::Orientation orient) {
 }
 
 void Font::drawText(const FbDrawable &w, int screen, GC gc,
-                    const char *text, size_t len, int x, int y, 
+                    const FbString &text, size_t len, int x, int y, 
                     Orientation orient) const {
-    if (text == 0 || len == 0)
+    if (text.empty() || len == 0)
         return;
 
-    char* rtext = 0;
-
     // so we don't end up in a loop with m_shadow
     static bool first_run = true; 
     
-#ifdef HAVE_ICONV
-    if (m_fontimp->utf8() && m_iconv != (iconv_t)(-1) && first_run) {
-        rtext = recode(m_iconv, text, len);
-        if (rtext != 0) {
-            len = strlen(rtext);
-            // ok, we can't use utf8 mode since the string is invalid
-        }
-    } 
-#endif // HAVE_ICONV
-
-    const char *real_text = rtext ? rtext : text;
-
     // draw "effects" first
     if (first_run) {
         if (m_shadow) {
             FbTk::GContext shadow_gc(w);
             shadow_gc.setForeground(m_shadow_color);
             first_run = false;
-            drawText(w, screen, shadow_gc.gc(), real_text, len,
+            drawText(w, screen, shadow_gc.gc(), text, len,
                      x + m_shadow_offx, y + m_shadow_offy, orient);
             first_run = true;
         } else if (m_halo) {
             FbTk::GContext halo_gc(w);
             halo_gc.setForeground(m_halo_color);
             first_run = false;
-            drawText(w, screen, halo_gc.gc(), real_text, len, x + 1, y + 1, orient);
-            drawText(w, screen, halo_gc.gc(), real_text, len, x - 1, y + 1, orient);
-            drawText(w, screen, halo_gc.gc(), real_text, len, x - 1, y - 1, orient);
-            drawText(w, screen, halo_gc.gc(), real_text, len, x + 1, y - 1, orient);
+            drawText(w, screen, halo_gc.gc(), text, len, x + 1, y + 1, orient);
+            drawText(w, screen, halo_gc.gc(), text, len, x - 1, y + 1, orient);
+            drawText(w, screen, halo_gc.gc(), text, len, x - 1, y - 1, orient);
+            drawText(w, screen, halo_gc.gc(), text, len, x + 1, y - 1, orient);
             first_run = true;
         }
     }
 
-    m_fontimp->drawText(w, screen, gc, real_text, len, x, y, orient);
-
-    if (rtext != 0)
-        delete[] rtext;
+    m_fontimp->drawText(w, screen, gc, text, len, x, y, orient);
 
 }