introduced FbTk::BidiString

a 'BidiString' holds both the logical content and the visual reordered
version of the content of a string. this helps to reduce the number of
calls to reorder the string before drawing it (as introduced in the patch
from Ken Bloom) and to be more consistent in menus and textboxes (drawing
cursors and underlining text).

23 files changed, 284 insertions, 276 deletions

diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index 2190a76..79b773a 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -62,8 +62,86 @@ using std::cerr;
 using std::endl;
 #endif // DEBUG
 
+namespace {
+
+#ifdef HAVE_FRIBIDI
+FbTk::FbString makeVisualFromLogical(const FbTk::FbString& src) {
+
+    FriBidiCharType base = FRIBIDI_TYPE_N;
+
+    // reuse allocated memory for reencoding / reordering
+    static std::vector<FriBidiChar> us;
+    static std::vector<FriBidiChar> out_us;
+    static FbTk::FbString result;
+
+    const size_t S = src.size() + 1;
+    const size_t S4 = S * 4;
+
+    if (us.capacity() < S)
+        us.reserve(S);
+    if (out_us.capacity() < S)
+        out_us.reserve(S);
+    if (result.capacity() < S4)
+        result.reserve(S4);
+
+    us.resize(S);
+    FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
+            const_cast<char*>(src.c_str()), S - 1,
+            &us[0]);
+
+    out_us.resize(S);
+    fribidi_log2vis(&us[0], len, &base, &out_us[0], NULL, NULL, NULL);
+
+    result.resize(S4);
+    len = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, &out_us[0], len, &result[0]);
+    result.resize(len); // trim to currently used chars
+
+    return result;
+}
+
+#endif
+
+} // end of anonymous namespace
+
+
 namespace FbTk {
 
+
+BiDiString::BiDiString(const FbString& logical) 
+#ifdef HAVE_FRIBIDI
+    : m_visual_dirty(false)
+#endif
+{
+    if (!logical.empty())
+        setLogical(logical);
+}
+
+const FbString& BiDiString::setLogical(const FbString& logical) {
+    m_logical = logical;
+#if HAVE_FRIBIDI
+    if (m_logical.empty()) {
+        m_visual_dirty = false;
+        m_visual.clear();
+    } else {
+        m_visual_dirty = true;
+    }
+#endif
+}
+
+const FbString& BiDiString::visual() const {
+#if HAVE_FRIBIDI
+    if (m_visual_dirty) {
+        m_visual = ::makeVisualFromLogical(logical());
+    }
+    m_visual_dirty = false;
+    return m_visual;
+#else
+    return m_logical;
+#endif
+}
+
+
+
 namespace FbStringUtil {
 
 enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };
@@ -128,7 +206,6 @@ void shutdown() {
 
 
 
-#ifdef HAVE_ICONV
 /**
    Recodes the text from one encoding to another
    assuming cd is correct
@@ -137,7 +214,9 @@ void shutdown() {
    @param size number of BYTES to convert
    @return the recoded string, or 0 on failure
 */
+string recode(iconv_t cd, const string &in) {
 
+#ifdef HAVE_ICONV
 /**
   --NOTE--
   In the "C" locale, this will strip any high-bit characters
@@ -145,8 +224,6 @@ void shutdown() {
   then you need to set your locale to something UTF-8, OR something
   ISO8859-1.
 */
-string recode(iconv_t cd,
-             const string &in) {
 
     // If empty message, yes this can happen, return
     if (in.empty())
@@ -163,18 +240,18 @@ string recode(iconv_t cd,
     size_t inbytesleft = insize;
     size_t outbytesleft = outsize;
 
+#ifdef HAVE_CONST_ICONV
+    const char* in_ptr = in.data();
+#else
     char * in_ptr = const_cast<char *>(in.data());
+#endif
     size_t result = (size_t)(-1);
     bool again = true;
 
     while (again) {
         again = false;
 
-#ifdef HAVE_CONST_ICONV
-        result = iconv(cd, (const char**)(&in_ptr), &inbytesleft, &out_ptr, &outbytesleft);
-#else
         result = iconv(cd, &in_ptr, &inbytesleft, &out_ptr, &outbytesleft);
-#endif  // HAVE_CONST_ICONV
 
         if (result == (size_t)(-1)) {
             switch(errno) {
@@ -213,13 +290,10 @@ string recode(iconv_t cd,
         free(out);
 
     return ret;
-}
 #else
-string recode(int cd,
-             const string &str) {
     return str;
-}
 #endif // HAVE_ICONV
+}
 
 FbString XStrToFb(const string &src) {
     return recode(iconv_convs[X2FB], src);
@@ -249,59 +323,19 @@ bool haveUTF8() {
 }
 
 
-#ifdef HAVE_FRIBIDI
-
-FbString BidiLog2Vis (const FbString& src) {
-
-    FriBidiCharType base = FRIBIDI_TYPE_N;
-
-    // reuse allocated memory for reencoding / reordering
-    static std::vector<FriBidiChar> us;
-    static std::vector<FriBidiChar> out_us;
-    static FbString result;
-
-    const size_t S = src.size() + 1;
-    const size_t S4 = S * 4;
-
-    if (us.capacity() < S)
-        us.reserve(S);
-    if (out_us.capacity() < S)
-        out_us.reserve(S);
-    if (result.capacity() < S4)
-        result.reserve(S4);
-
-    us.resize(S);
-    FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
-            const_cast<char*>(src.c_str()), S - 1,
-            &us[0]);
-
-    out_us.resize(S);
-    fribidi_log2vis(&us[0], len, &base, &out_us[0], NULL, NULL, NULL);
-
-    result.resize(S4);
-    len = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, &out_us[0], len, &result[0]);
-    result.resize(len); // trim to currently used chars
-
-    return result;
-}
-
-#endif
-
 } // end namespace StringUtil
 
-StringConvertor::StringConvertor(EncodingTarget target):
 #ifdef HAVE_ICONV
-    m_iconv((iconv_t)(-1)) {
+StringConvertor::StringConvertor(EncodingTarget target) : m_iconv((iconv_t)(-1)) {
     if (target == ToLocaleStr)
         m_destencoding = FbStringUtil::locale_codeset;
     else
         m_destencoding = "UTF-8";
 }
 #else
-     m_iconv(-1) {}
+StringConvertor::StringConvertor(EncodingTarget target) { }
 #endif
 
-
 StringConvertor::~StringConvertor() {
 #ifdef HAVE_ICONV
     if (m_iconv != ((iconv_t)-1))
@@ -329,7 +363,7 @@ bool StringConvertor::setSource(const string &encoding) {
 #endif
 }
 
-string StringConvertor::recode(const string &src) {
+FbString StringConvertor::recode(const string &src) {
 #ifdef HAVE_ICONV
     return FbStringUtil::recode(m_iconv, src);
 #else
@@ -337,5 +371,13 @@ string StringConvertor::recode(const string &src) {
 #endif
 }
 
+void StringConvertor::reset() {
+#ifdef HAVE_ICONV
+    if (m_iconv != ((iconv_t)-1))
+        iconv_close(m_iconv);
+    m_iconv = ((iconv_t)(-1));
+#endif
+}
+
 
 } // end namespace FbTk
diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh
index e1a5dc5..55798e5 100644
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@@ -36,6 +36,25 @@ namespace FbTk {
 // (or just plain whatever for now if no utf-8 available)
 typedef std::string FbString;
 
+class BiDiString {
+
+public:
+
+    BiDiString(const FbString& logical = FbString());
+
+    const FbString& logical() const { return m_logical; }
+    const FbString& visual() const;
+
+    const FbString& setLogical(const FbString& logical);
+
+private:
+    FbString m_logical;
+#ifdef HAVE_FRIBIDI
+    mutable FbString m_visual;
+    mutable bool m_visual_dirty;
+#endif
+};
+
 namespace FbStringUtil {
 
 void init();
@@ -52,11 +71,6 @@ std::string FbStrToX(const FbString &src);
 FbString LocaleStrToFb(const std::string &src);
 std::string FbStrToLocale(const FbString &src);
 
-#ifdef HAVE_FRIBIDI
-/// Make Bidi
-FbString BidiLog2Vis (const FbString& src);
-#endif
-
 bool haveUTF8();
 
 } // namespace FbStringUtil
@@ -70,23 +84,14 @@ public:
     ~StringConvertor();
 
     bool setSource(const std::string &encoding);
-    void reset() {
-#ifdef HAVE_ICONV
- if (m_iconv != ((iconv_t)-1))
-     iconv_close(m_iconv);
- m_iconv = ((iconv_t)(-1));
-#endif
-    }
+    void reset();
 
-    std::string recode(const std::string &src);
+    FbString recode(const FbString &src);
 
 private:
 #ifdef HAVE_ICONV
     iconv_t m_iconv;
-#else
-    int m_iconv;
 #endif
-
     std::string m_destencoding;
 };
 
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 28341a7..ea0fbde 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -247,14 +247,8 @@ bool Font::load(const string &name) {
     return false;
 }
 
-unsigned int Font::textWidth(const FbString &text, unsigned int size) const {
-#ifdef HAVE_FRIBIDI
-    const FbString visualOrder(FbTk::FbStringUtil::BidiLog2Vis(text));
-#else
-    const FbString &visualOrder = text;
-#endif
-
-    return m_fontimp->textWidth(visualOrder, size);
+unsigned int Font::textWidth(const char* text, unsigned int size) const {
+    return m_fontimp->textWidth(text, size);
 }
 
 unsigned int Font::height() const {
@@ -274,34 +268,28 @@ bool Font::validOrientation(FbTk::Orientation orient) {
 }
 
 void Font::drawText(const FbDrawable &w, int screen, GC gc,
-                    const FbString &text, size_t len, int x, int y,
+                    const char* text, size_t len, int x, int y,
                     Orientation orient) const {
-    if (text.empty() || len == 0)
-        return;
-
-#ifdef HAVE_FRIBIDI
-    const FbString visualOrder(FbTk::FbStringUtil::BidiLog2Vis(text));
-#else
-    const FbString &visualOrder = text;
-#endif
 
+    if (!text || !*text || len == 0)
+        return;
 
     // draw "effects" first
     if (m_shadow) {
         FbTk::GContext shadow_gc(w);
         shadow_gc.setForeground(m_shadow_color);
-        m_fontimp->drawText(w, screen, shadow_gc.gc(), visualOrder, len,
+        m_fontimp->drawText(w, screen, shadow_gc.gc(), text, len,
                  x + m_shadow_offx, y + m_shadow_offy, orient);
     } else if (m_halo) {
         FbTk::GContext halo_gc(w);
         halo_gc.setForeground(m_halo_color);
-        m_fontimp->drawText(w, screen, halo_gc.gc(), visualOrder, len, x + 1, y + 1, orient);
-        m_fontimp->drawText(w, screen, halo_gc.gc(), visualOrder, len, x - 1, y + 1, orient);
-        m_fontimp->drawText(w, screen, halo_gc.gc(), visualOrder, len, x - 1, y - 1, orient);
-        m_fontimp->drawText(w, screen, halo_gc.gc(), visualOrder, len, x + 1, y - 1, orient);
+        m_fontimp->drawText(w, screen, halo_gc.gc(), text, len, x + 1, y + 1, orient);
+        m_fontimp->drawText(w, screen, halo_gc.gc(), text, len, x - 1, y + 1, orient);
+        m_fontimp->drawText(w, screen, halo_gc.gc(), text, len, x - 1, y - 1, orient);
+        m_fontimp->drawText(w, screen, halo_gc.gc(), text, len, x + 1, y - 1, orient);
     }
 
-    m_fontimp->drawText(w, screen, gc, visualOrder, len, x, y, orient);
+    m_fontimp->drawText(w, screen, gc, text, len, x, y, orient);
 
 
 }
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh
index 28bbf22..fb399d9 100644
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@@ -75,7 +75,11 @@ public:
        @param size length of text in bytes
        @return size of text in pixels
     */
-    unsigned int textWidth(const FbString &text, unsigned int size) const;
+    unsigned int textWidth(const char* text, unsigned int size) const;
+    unsigned int textWidth(const BiDiString &text) const {
+        return textWidth(text.visual().c_str(), text.visual().size());
+    }
+
     unsigned int height() const;
     int ascent() const;
     int descent() const;
@@ -99,8 +103,14 @@ public:
        @param rotate if the text should be drawn rotated (if it's rotated before)
     */
     void drawText(const FbDrawable &w, int screen, GC gc,
-                  const FbString &text, size_t len,
+                  const char* text, size_t len,
                   int x, int y, FbTk::Orientation orient = ROT0) const;
+    void drawText(const FbDrawable &w, int screen, GC gc,
+                  const BiDiString &text,
+                  int x, int y, FbTk::Orientation orient = ROT0) const {
+        drawText(w, screen, gc, text.visual().c_str(), text.visual().size(), x, y, orient);
+    }
+
 
     bool hasShadow() const { return m_shadow; }
     bool hasHalo() const { return m_halo; }
diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh
index 4d7eb16..0578d1a 100644
--- a/src/FbTk/FontImp.hh
+++ b/src/FbTk/FontImp.hh
@@ -40,8 +40,8 @@ class FontImp {
 public:
     virtual ~FontImp() { }
     virtual bool load(const std::string &name) = 0;
-    virtual void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) = 0;
-    virtual unsigned int textWidth(const FbString &text, unsigned int size) const = 0;
+    virtual void drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y, FbTk::Orientation orient) = 0;
+    virtual unsigned int textWidth(const char* text, unsigned int len) const = 0;
     virtual bool validOrientation(FbTk::Orientation orient) { return orient == ROT0; }
     virtual int ascent() const = 0;
     virtual int descent() const = 0;
diff --git a/src/FbTk/ITypeAheadable.hh b/src/FbTk/ITypeAheadable.hh
index 1b0bd03..ebcb935 100644
--- a/src/FbTk/ITypeAheadable.hh
+++ b/src/FbTk/ITypeAheadable.hh
@@ -22,7 +22,7 @@
 #ifndef FBTK_ITYPEAHEADABLE_HH
 #define FBTK_ITYPEAHEADABLE_HH
 
-#include <string>
+#include "FbString.hh"
 
 #ifdef HAVE_CCTYPE
   #include <cctype>
diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh
index 9d2d2ba..2df3f14 100644
--- a/src/FbTk/IntMenuItem.hh
+++ b/src/FbTk/IntMenuItem.hh
@@ -23,6 +23,7 @@
 #define FBTK_INTMENUITEM_HH
 
 #include "MenuItem.hh"
+#include "StringUtil.hh"
 
 namespace FbTk {
 
@@ -39,15 +40,6 @@ public:
         setCloseOnClick(false);
     }
 
-    /* Utility, but doesn't get found in anonymous namespace? */
-    std::string appendIntValue(const std::string &label, int value) {
-        char *buff = new char[label.size() + 16];
-        sprintf(buff, "%s:  %d", label.c_str(), value);
-        std::string ret(buff);
-        delete [] buff;
-        return ret;
-    }
-
     void click(int button, int time, unsigned int mods) {
         static int last_time = -201;
         int inc_val = 1;
@@ -86,11 +78,11 @@ public:
     }
 
     void updateLabel() {
-        setLabel(appendIntValue(m_org_label, m_res));
+        setLabel(m_org_label.logical() + ":  " + FbTk::StringUtil::number2String(m_res));
     }
 
 private:
-    std::string m_org_label; ///< original label
+    FbTk::BiDiString m_org_label; ///< original label
     const int m_max; ///< maximum value the integer can have
     const int m_min; ///< minimum value the integer can have
     Accessor<int> &m_res; ///< resource item to be changed
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index ded5dab..811964c 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -375,8 +375,7 @@ void Menu::enableTitle() {
 
 void Menu::updateMenu() {
     if (m_title_vis) {
-        menu.item_w = theme()->titleFont().textWidth(menu.label,
-                                                    menu.label.size());
+        menu.item_w = theme()->titleFont().textWidth(menu.label);
         menu.item_w += (theme()->bevelWidth() * 2);
     } else
         menu.item_w = 1;
@@ -669,8 +668,7 @@ void Menu::redrawTitle(FbDrawable &drawable) {
 
     const FbTk::Font &font = theme()->titleFont();
     int dx = theme()->bevelWidth();
-    size_t len = menu.label.size();
-    unsigned int l = font.textWidth(menu.label, len) + theme()->bevelWidth()*2;
+    unsigned int l = font.textWidth(menu.label) + theme()->bevelWidth()*2;
 
     switch (theme()->titleFontJustify()) {
     case FbTk::RIGHT:
@@ -686,10 +684,7 @@ void Menu::redrawTitle(FbDrawable &drawable) {
 
     // difference between height based on font, and style-set height
     int height_offset = theme()->titleHeight() - (font.height() + 2*theme()->bevelWidth());
-    font.drawText(drawable, // drawable
-                  screenNumber(),
-                  theme()->titleTextGC().gc(), // graphic context
-                  menu.label, len,  // text string with length
+    font.drawText(drawable, screenNumber(), theme()->titleTextGC().gc(), menu.label,
                   dx, font.ascent() + theme()->bevelWidth() + height_offset/2);  // position
 }
 
@@ -795,7 +790,7 @@ int Menu::drawItem(FbDrawable &drawable, unsigned int index,
     return item_y;
 }
 
-void Menu::setLabel(const FbString &labelstr) {
+void Menu::setLabel(const FbTk::BiDiString &labelstr) {
     //make sure we don't send 0 to std::string
     menu.label = labelstr;
     reconfigure();
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 09bdd8c..a7bb982 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -108,7 +108,7 @@ public:
     void grabInputFocus();
     virtual void reconfigure();
     /// set label string
-    void setLabel(const FbString &labelstr);
+    void setLabel(const FbTk::BiDiString &labelstr);
     /// move menu to x,y
     virtual void move(int x, int y);
     virtual void updateMenu();
@@ -136,7 +136,7 @@ public:
     const FbWindow &fbwindow() const { return menu.window; }
     FbWindow &titleWindow() { return menu.title; }
     FbWindow &frameWindow() { return menu.frame; }
-    const std::string &label() const { return menu.label; }
+    const FbTk::BiDiString &label() const { return menu.label; }
     int x() const { return menu.window.x(); }
     int y() const { return menu.window.y(); }
     unsigned int width() const { return menu.window.width(); }
@@ -225,7 +225,7 @@ private:
         Pixmap frame_pixmap, title_pixmap, hilite_pixmap;
         FbTk::FbWindow window, frame, title;
 
-        std::string label;
+        FbTk::BiDiString label;
         int x_move, y_move, sublevels, persub, minsub, grab_x, grab_y;
 
         unsigned int frame_h, item_w;
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index f995666..c1357fb 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -52,14 +52,14 @@ void MenuItem::drawLine(FbDrawable &draw,
     int font_top = (height - theme->frameFont().height())/2;
     int underline_height = font_top + theme->frameFont().ascent() + 2;
     int bottom = height - bevelW - 1;
-    
+
     text_y += bottom > underline_height ? underline_height : bottom;
-    int text_w = theme->frameFont().textWidth(m_label, m_label.size());
 
-    // width of the searchstring
-    size = size > m_label.length() ? m_label.length() : size;
-    std::string search_string = m_label.substr(0,size);
-    int search_string_w = theme->frameFont().textWidth(search_string, size);
+    int text_w = theme->frameFont().textWidth(label());
+
+    const FbString& visual = m_label.visual();
+    BiDiString search_string(FbString(visual, 0, size > visual.size() ? visual.size() : size));
+    int search_string_w = theme->frameFont().textWidth(search_string);
 
     // pay attention to the text justification
     switch(theme->frameFontJustify()) {
@@ -144,7 +144,7 @@ void MenuItem::draw(FbDrawable &draw,
         }
     }
 
-    if (label().empty())
+    if (label().logical().empty())
         return;
 
     // text is background
@@ -156,8 +156,7 @@ void MenuItem::draw(FbDrawable &draw,
         // Text
         //
         int text_y = y, text_x = x;
-
-        int text_w = theme->frameFont().textWidth(label(), label().size());
+        int text_w = theme->frameFont().textWidth(label());
 
         int height_offset = theme->itemHeight() - (theme->frameFont().height() + 2*theme->bevelWidth());
         text_y = y + theme->bevelWidth() + theme->frameFont().ascent() + height_offset/2;
@@ -175,11 +174,7 @@ void MenuItem::draw(FbDrawable &draw,
             break;
         }
 
-        theme->frameFont().drawText(draw, // drawable
-                                   theme->screenNum(),
-                                   tgc.gc(),
-                                   label().c_str(), label().size(), // text string and lenght
-                                   text_x, text_y); // position
+        theme->frameFont().drawText(draw, theme->screenNum(), tgc.gc(), label(), text_x, text_y);
     }
 
     GC gc = (highlight) ? theme->hiliteTextGC().gc() :
@@ -335,7 +330,7 @@ unsigned int MenuItem::height(const FbTk::ThemeProxy<MenuTheme> &theme) const {
 unsigned int MenuItem::width(const FbTk::ThemeProxy<MenuTheme> &theme) const {
     // textwidth + bevel width on each side of the text
     const unsigned int icon_width = height(theme);
-    const unsigned int normal = theme->frameFont().textWidth(label(), label().size()) +
+    const unsigned int normal = theme->frameFont().textWidth(label()) +
                                 2 * (theme->bevelWidth() + icon_width);
     return m_icon.get() == 0 ? normal : normal + icon_width;
 }
@@ -349,9 +344,9 @@ void MenuItem::updateTheme(const FbTk::ThemeProxy<MenuTheme> &theme) {
 
 }
 
-void MenuItem::showSubmenu() { 
-    if (submenu() != 0) 
-        submenu()->show(); 
+void MenuItem::showSubmenu() {
+    if (submenu() != 0)
+        submenu()->show();
 }
 
 } // end namespace FbTk
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 9150849..2149559 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -41,7 +41,7 @@ template <class T> class ThemeProxy;
 class MenuItem : public FbTk::ITypeAheadable {
 public:
     MenuItem()
-        : m_label(""),
+        : m_label(BiDiString("")),
           m_menu(0),
           m_submenu(0),
           m_enabled(true),
@@ -49,7 +49,7 @@ public:
           m_close_on_click(true),
           m_toggle_item(false)
     { }
-    explicit MenuItem(const FbString &label)
+    explicit MenuItem(const BiDiString &label)
         : m_label(label),
           m_menu(0),
           m_submenu(0),
@@ -59,7 +59,7 @@ public:
           m_toggle_item(false)
     { }
 
-    MenuItem(const FbString &label, Menu &host_menu)
+    MenuItem(const BiDiString &label, Menu &host_menu)
         : m_label(label),
           m_menu(&host_menu),
           m_submenu(0),
@@ -69,7 +69,7 @@ public:
           m_toggle_item(false)
     { }
     /// create a menu item with a specific command to be executed on click
-    MenuItem(const FbString &label, RefCount<Command<void> > &cmd, Menu *menu = 0)
+    MenuItem(const BiDiString &label, RefCount<Command<void> > &cmd, Menu *menu = 0)
         : m_label(label),
           m_menu(menu),
           m_submenu(0),
@@ -80,7 +80,7 @@ public:
           m_toggle_item(false)
     { }
 
-    MenuItem(const FbString &label, Menu *submenu, Menu *host_menu = 0)
+    MenuItem(const BiDiString &label, Menu *submenu, Menu *host_menu = 0)
         : m_label(label),
           m_menu(host_menu),
           m_submenu(submenu),
@@ -94,7 +94,7 @@ public:
     void setCommand(RefCount<Command<void> > &cmd) { m_command = cmd; }
     virtual void setSelected(bool selected) { m_selected = selected; }
     virtual void setEnabled(bool enabled) { m_enabled = enabled; }
-    virtual void setLabel(const FbString &label) { m_label = label; }
+    virtual void setLabel(const BiDiString &label) { m_label = label; }
     virtual void setToggleItem(bool val) { m_toggle_item = val; }
     void setCloseOnClick(bool val) { m_close_on_click = val; }
     void setIcon(const std::string &filename, int screen_num);
@@ -103,7 +103,7 @@ public:
         @name accessors
     */
     //@{
-    virtual const std::string &label() const { return m_label; }
+    virtual const FbTk::BiDiString& label() const { return m_label; }
     virtual const PixmapWithMask *icon() const {
         return m_icon.get() ? m_icon->pixmap.get() : 0;
     }
@@ -115,7 +115,7 @@ public:
     // iType functions
     virtual void setIndex(int index) { m_index = index; }
     virtual int getIndex() { return m_index; }
-    const std::string &iTypeString() const { return m_label; }
+    const FbString &iTypeString() const { return m_label.visual(); }
     virtual void drawLine(FbDrawable &draw,
                       const FbTk::ThemeProxy<MenuTheme> &theme,
                       size_t size,
@@ -148,7 +148,7 @@ public:
     Menu *menu() { return m_menu; }
 
 private:
-    FbString m_label; ///< label of this item
+    BiDiString m_label; ///< label of this item
     Menu *m_menu; ///< the menu we live in
     Menu *m_submenu; ///< a submenu, 0 if we don't have one
     RefCount<Command<void> > m_command; ///< command to be executed
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index 6fd8fee..ed67c83 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -26,14 +26,14 @@
 
 namespace FbTk {
 
-MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbString &label):
+MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbTk::BiDiString &label):
     MenuItem(label),
     m_button_exe(0),
     m_buttons(buttons) {
     init(buttons);
 }
 
-MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbString &label, Menu *submenu):
+MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbTk::BiDiString &label, Menu *submenu):
     MenuItem(label, submenu),
     m_button_exe(0),
     m_buttons(buttons) {
diff --git a/src/FbTk/MultiButtonMenuItem.hh b/src/FbTk/MultiButtonMenuItem.hh
index 5d67bdf..0a9c5e6 100644
--- a/src/FbTk/MultiButtonMenuItem.hh
+++ b/src/FbTk/MultiButtonMenuItem.hh
@@ -30,8 +30,8 @@ namespace FbTk {
 /// Handles commands for the specified numbers of buttons
 class MultiButtonMenuItem: public FbTk::MenuItem {
 public:
-    MultiButtonMenuItem(int buttons, const FbString &label);  
-    MultiButtonMenuItem(int buttons, const FbString &label, Menu *submenu);
+    MultiButtonMenuItem(int buttons, const FbTk::BiDiString& label);  
+    MultiButtonMenuItem(int buttons, const FbTk::BiDiString& label, Menu *submenu);
     virtual ~MultiButtonMenuItem();
     /// sets command to specified button
     void setCommand(int button, FbTk::RefCount<FbTk::Command<void> > &cmd);
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc
index 87e18e8..74771a6 100644
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -75,7 +75,7 @@ TextBox::~TextBox() {
 
 }
 
-void TextBox::setText(const std::string &text) {
+void TextBox::setText(const FbTk::BiDiString &text) {
     m_text = text;
     m_start_pos = 0;
     cursorEnd();
@@ -129,7 +129,9 @@ void TextBox::cursorBackward() {
 
 void TextBox::backspace() {
     if (m_start_pos || cursorPosition()) {
-        m_text.erase(m_start_pos + cursorPosition() - 1, 1);
+        FbString t = text();
+        t.erase(m_start_pos + cursorPosition() - 1, 1);
+        m_text.setLogical(t);
         if (cursorPosition())
             setCursorPosition(cursorPosition() - 1);
         else
@@ -140,23 +142,28 @@ void TextBox::backspace() {
 
 void TextBox::deleteForward() {
     if (m_start_pos + m_cursor_pos < m_end_pos) {
-        m_text.erase(m_start_pos + m_cursor_pos, 1);
+        FbString t = text();
+        t.erase(m_start_pos + m_cursor_pos, 1);
+        m_text.setLogical(t);
         adjustEndPos();
     }
 }
 
 void TextBox::insertText(const std::string &val) {
-    m_text.insert(m_start_pos + cursorPosition(), val);
+    FbString t = text();
+    t.insert(m_start_pos + cursorPosition(), val);
+    m_text.setLogical(t);
     m_cursor_pos += val.size();
     m_end_pos += val.size();
- 
+
     adjustPos();
 }
 
 void TextBox::killToEnd() {
     if (cursorPosition() >= 0 && cursorPosition() < static_cast<signed>(text().size())) {
-        m_text.erase(cursorPosition());
-        setText(m_text);
+        FbString t = text();
+        t.erase(cursorPosition());
+        setText(t);
     }
 }
 
@@ -168,13 +175,13 @@ void TextBox::clear() {
         setGC(DefaultGC(FbTk::App::instance()->display(), screenNumber()));
 
     font().drawText(*this, screenNumber(), 
-                    gc(),                     
-                    text().c_str() + m_start_pos, 
-                    m_end_pos - m_start_pos, 
+                    gc(),
+                    m_text.visual().c_str() + m_start_pos,
+                    m_end_pos - m_start_pos,
                     0, center_pos); // pos
 
     // draw cursor position
-    int cursor_pos = font().textWidth(text().c_str() + m_start_pos, m_cursor_pos) + 1;
+    int cursor_pos = font().textWidth(m_text.visual().c_str() + m_start_pos, m_cursor_pos) + 1;
     drawLine(gc(), cursor_pos, center_pos, cursor_pos, center_pos - font().height());
 }
 
@@ -202,9 +209,7 @@ void TextBox::buttonPressEvent(XButtonEvent &event) {
         int tmp = 0;
         for(i = m_start_pos; i <= m_end_pos; i++) {
             tmp = abs(static_cast<int>
-                      (event.x - font().
-                       textWidth(m_text.c_str() + m_start_pos, 
-                                 i - m_start_pos)));
+                      (event.x - font().textWidth(m_text.visual().c_str() + m_start_pos, i - m_start_pos)));
 
             if (tmp < delta) {
                 delta = tmp;
@@ -244,7 +249,7 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
             }
                 break;
             case XK_Right:
-                if (m_text.size() && m_cursor_pos < m_text.size()){
+                if (!m_text.logical().empty() && m_cursor_pos < m_text.logical().size()){
                     unsigned int pos = findEmptySpaceRight();
                     if (pos > m_start_pos)
                         pos -= m_start_pos;
@@ -264,7 +269,9 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
 
             case XK_BackSpace: {
                     unsigned int pos = findEmptySpaceLeft();
-                    m_text.erase(pos, m_cursor_pos - pos + m_start_pos);
+                    FbString t = text();
+                    t.erase(pos, m_cursor_pos - pos + m_start_pos);
+                    m_text.setLogical(t);
 
                     if (pos < m_start_pos){
                         m_start_pos  = pos;
@@ -278,10 +285,12 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
                 }
                 break;
             case XK_Delete: {
-                    if (!m_text.size() || m_cursor_pos >= m_text.size())
+                    if (text().empty() || m_cursor_pos >= text().size())
                         break;
                     unsigned int pos = findEmptySpaceRight();
-                    m_text.erase(m_cursor_pos + m_start_pos, pos - (m_cursor_pos + m_start_pos));
+                    FbString t = text();
+                    t.erase(m_cursor_pos + m_start_pos, pos - (m_cursor_pos + m_start_pos));
+                    m_text.setLogical(t);
                     adjustPos();
                 }
                 break;
@@ -368,15 +377,17 @@ void TextBox::adjustEndPos() {
 }
 
 void TextBox::adjustStartPos() {
-    
-    int text_width = font().textWidth(text(), m_end_pos);
+
+    const char* visual = m_text.visual().c_str();
+
+    int text_width = font().textWidth(visual, m_end_pos);
     if (text_width < static_cast<signed>(width()))
         return;
 
     int start_pos = 0;
     while (text_width > static_cast<signed>(width())) {
         start_pos++;
-        text_width = font().textWidth(text().c_str() + start_pos, m_end_pos - start_pos);
+        text_width = font().textWidth(visual + start_pos, m_end_pos - start_pos);
     }
 
     // adjust cursorPosition() according relative to change to m_start_pos
@@ -387,12 +398,12 @@ void TextBox::adjustStartPos() {
 unsigned int TextBox::findEmptySpaceLeft(){
 
     // found the first left space symbol
-    int pos = m_text.rfind(' ', (m_start_pos + m_cursor_pos) > 0 ? 
+    int pos = text().rfind(' ', (m_start_pos + m_cursor_pos) > 0 ? 
                                  m_start_pos + m_cursor_pos - 1 : 0);
 
     // do we have one more space symbol near?
     int next_pos = -1;
-    while (pos > 0 && (next_pos = m_text.rfind(' ', pos - 1)) > -1){
+    while (pos > 0 && (next_pos = text().rfind(' ', pos - 1)) > -1){
         if (next_pos + 1 < pos)
             break;
         pos = next_pos;
@@ -406,18 +417,18 @@ unsigned int TextBox::findEmptySpaceLeft(){
 unsigned int TextBox::findEmptySpaceRight(){
 
     // found the first right space symbol
-    int pos = m_text.find(' ', m_start_pos + m_cursor_pos);
+    int pos = text().find(' ', m_start_pos + m_cursor_pos);
 
     // do we have one more space symbol near?
     int next_pos = -1;
-    while (pos > -1 && pos < static_cast<signed>(m_text.size()) && (next_pos = m_text.find(' ', pos + 1)) > -1 ){
+    while (pos > -1 && pos < static_cast<signed>(text().size()) && (next_pos = text().find(' ', pos + 1)) > -1 ){
 
         if (next_pos - 1 > pos)
             break;
         pos = next_pos;
     }
     if (pos < 0)
-        pos = m_text.size() - 1;
+        pos = text().size() - 1;
 
     return pos + 1; // (+1) - sets cursor at the right.
 
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh
index d313dca..7b42bd1 100644
--- a/src/FbTk/TextBox.hh
+++ b/src/FbTk/TextBox.hh
@@ -24,8 +24,7 @@
 
 #include "FbWindow.hh"
 #include "EventHandler.hh"
-
-#include <string>
+#include "FbString.hh"
 
 namespace FbTk {
 
@@ -37,7 +36,7 @@ public:
     TextBox(const FbWindow &parent, const Font &font, const std::string &text);
     virtual ~TextBox();
 
-    void setText(const std::string &text);
+    void setText(const FbTk::BiDiString &text);
     void setFont(const Font &font);
     void setGC(GC gc);
     void setCursorPosition(int cursor);    
@@ -60,7 +59,7 @@ public:
     void buttonPressEvent(XButtonEvent &event);
     void keyPressEvent(XKeyEvent &event);
 
-    const std::string &text() const { return m_text; }
+    const FbString &text() const { return m_text.logical(); }
     const Font &font() const { return *m_font; }
     GC gc() const { return m_gc; }
     int cursorPosition() const { return m_cursor_pos; }
@@ -76,7 +75,7 @@ private:
     void adjustPos();
 
     const FbTk::Font *m_font;
-    std::string m_text;
+    BiDiString m_text;
     GC m_gc;
     std::string::size_type m_cursor_pos, m_start_pos, m_end_pos;
 };
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 04aa367..c31e3d6 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -28,7 +28,7 @@ namespace FbTk {
 
 TextButton::TextButton(const FbTk::FbWindow &parent,
                        FbTk::Font &font,
-                       const std::string &text):
+                       const FbTk::BiDiString &text):
     FbTk::Button(parent, 0, 0, 10, 10),
     m_font(&font),
     m_text(text),
@@ -81,8 +81,8 @@ bool TextButton::setOrientation(FbTk::Orientation orient) {
     return true;
 }
 
-void TextButton::setText(const std::string &text) {
-    if (m_text != text) {
+void TextButton::setText(const FbTk::BiDiString &text) {
+    if (m_text.logical() != text.logical()) {
         m_text = text;
         updateBackground(false);
         clear();
@@ -126,7 +126,7 @@ void TextButton::clearArea(int x, int y,
 
 
 unsigned int TextButton::textWidth() const {
-    return font().textWidth(text(), text().size());
+    return font().textWidth(text());
 }
 
 void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) {
@@ -135,15 +135,15 @@ void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) {
 }
 
 void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
-    unsigned int textlen = text().size();
-    // do text alignment
-
-    unsigned int textw = width(), texth = height();
+    const FbString& visual = text().visual();
+    unsigned int textlen = visual.size();
+    unsigned int textw = width();
+    unsigned int texth = height();
     translateSize(m_orientation, textw, texth);
 
     int align_x = FbTk::doAlignment(textw - x_offset - m_left_padding - m_right_padding,
                                     bevel(), justify(), font(),
-                                    text().data(), text().size(),
+                                    visual.data(), visual.size(),
                                     textlen); // return new text len
 
     // center text by default
@@ -161,25 +161,24 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
     font().drawText(*drawable,
                     screenNumber(),
                     gc(), // graphic context
-                    text(), textlen, // string and string size
+                    visual.c_str(), textlen, // string and string size
                     textx, texty, m_orientation); // position
 }
 
 
 bool TextButton::textExceeds(int x_offset) {
-    
-    unsigned int textlen = text().size();
-    // do text alignment
 
-    unsigned int textw = width(), texth = height();
+    const FbString& visual = text().visual();
+    unsigned int textlen = visual.size();
+    unsigned int textw = width();
+    unsigned int texth = height();
     translateSize(m_orientation, textw, texth);
 
     FbTk::doAlignment(textw - x_offset - m_left_padding - m_right_padding,
-                      bevel(), justify(), font(), text().data(), text().size(),
+                      bevel(), justify(), font(), visual.data(), visual.size(),
                       textlen); // return new text len
 
-    return text().size()>textlen;
-    
+    return visual.size()>textlen;
 }
 
 void TextButton::exposeEvent(XExposeEvent &event) {
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index 6ddcd8f..a1c8b0e 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -23,8 +23,7 @@
 #define FBTK_TEXTBUTTON_HH
 
 #include "Button.hh"
-
-#include <string>
+#include "FbString.hh"
 
 namespace FbTk {
 
@@ -34,11 +33,11 @@ class Font;
 class TextButton: public FbTk::Button, FbTk::FbWindowRenderer {
 public:
     TextButton(const FbTk::FbWindow &parent, 
-               FbTk::Font &font, const std::string &text);
+               FbTk::Font &font, const FbTk::BiDiString &text);
 
     void setJustify(FbTk::Justify just);
     bool setOrientation(FbTk::Orientation orient);
-    void setText(const std::string &text);
+    void setText(const FbTk::BiDiString &text);
     void setFont(FbTk::Font &font);
     void setTextPadding(unsigned int padding);
     void setTextPaddingLeft(unsigned int leftpadding);
@@ -60,7 +59,7 @@ public:
     void renderForeground(FbDrawable &drawable);
 
     FbTk::Justify justify() const { return m_justify; }
-    const std::string &text() const { return m_text; }
+    const BiDiString &text() const { return m_text; }
     FbTk::Font &font() const { return *m_font; }
     FbTk::Orientation orientation() const { return m_orientation; }
     unsigned int textWidth() const;
@@ -75,7 +74,7 @@ protected:
 
 private:
     FbTk::Font *m_font;
-    std::string m_text;
+    BiDiString m_text;
     FbTk::Justify m_justify;
     FbTk::Orientation m_orientation;
 
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index 257a2a0..fa88593 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -97,8 +97,9 @@ bool XFontImp::load(const string &fontname) {
     return true;
 }
 
-void XFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) {
-    if (m_fontstruct == 0)
+void XFontImp::drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y, FbTk::Orientation orient) {
+
+    if (!text || !*text || m_fontstruct == 0)
         return;
 
     // use roated font functions?
@@ -107,21 +108,18 @@ void XFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString &
         return;
     }
 
-    string localestr = text;
-    localestr.erase(len, string::npos);
-    localestr = FbStringUtil::FbStrToLocale(localestr);
+    std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, 0, len));
 
     XSetFont(w.display(), gc, m_fontstruct->fid);
     XDrawString(w.display(), w.drawable(), gc, x, y, localestr.data(), localestr.size());
 }
 
-unsigned int XFontImp::textWidth(const FbString &text, unsigned int size) const {
-    if (text.empty() || m_fontstruct == 0)
+unsigned int XFontImp::textWidth(const char* text, unsigned int size) const {
+
+    if (!text || !*text || m_fontstruct == 0)
         return 0;
 
-    string localestr = text;
-    localestr.erase(size, string::npos);
-    localestr = FbStringUtil::FbStrToLocale(localestr);
+    std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, size));
 
     return XTextWidth(m_fontstruct, localestr.data(), localestr.size());
 }
diff --git a/src/FbTk/XFontImp.hh b/src/FbTk/XFontImp.hh
index 3ba027c..ccebbb7 100644
--- a/src/FbTk/XFontImp.hh
+++ b/src/FbTk/XFontImp.hh
@@ -32,11 +32,11 @@ public:
     explicit XFontImp(const char *filename = 0);
     ~XFontImp();
     bool load(const std::string &filename);
-    unsigned int textWidth(const FbString &text, unsigned int size) const;
+    unsigned int textWidth(const char* text, unsigned int len) const;
     unsigned int height() const;
     int ascent() const;
     int descent() const { return m_fontstruct ? m_fontstruct->descent : 0; }
-    void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient);
+    void drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y, FbTk::Orientation orient);
 
     bool validOrientation(FbTk::Orientation orient);
 
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 80eb2c4..15c8212 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -77,7 +77,10 @@ bool XftFontImp::load(const std::string &name) {
     return true;
 }
 
-void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient) {
+void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y, FbTk::Orientation orient) {
+
+    if (!text || !*text)
+        return;
 
     if (!validOrientation(orient))
         return;
@@ -98,12 +101,11 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
         break;
     }
 
-    XftFont *font = m_xftfonts[orient];
+    Visual* def_visual = DefaultVisual(w.display(), screen);
+    Colormap def_colmap = DefaultColormap(w.display(), screen);
 
-    XftDraw *draw = XftDrawCreate(w.display(),
-                                  w.drawable(),
-                                  DefaultVisual(w.display(), screen),
-                                  DefaultColormap(w.display(), screen));
+    XftFont *font = m_xftfonts[orient];
+    XftDraw *draw = XftDrawCreate(w.display(), w.drawable(), def_visual, def_colmap);
 
     XGCValues gc_val;
 
@@ -114,7 +116,7 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
     // get red, green, blue values
     XColor xcol;
     xcol.pixel = gc_val.foreground;
-    XQueryColor(w.display(), DefaultColormap(w.display(), screen), &xcol);
+    XQueryColor(w.display(), def_colmap, &xcol);
 
     // convert xcolor to XftColor
     XRenderColor rendcol;
@@ -123,10 +125,7 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
     rendcol.blue = xcol.blue;
     rendcol.alpha = 0xFFFF;
     XftColor xftcolor;
-    XftColorAllocValue(w.display(), 
-                       DefaultVisual(w.display(), screen), 
-                       DefaultColormap(w.display(), screen),
-                       &rendcol, &xftcolor);
+    XftColorAllocValue(w.display(), def_visual, def_colmap, &rendcol, &xftcolor);
 
     // draw string
 #ifdef HAVE_XFT_UTF8_STRING
@@ -134,39 +133,25 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
         // check the string size,
         // if the size is zero we use the XftDrawString8 function instead.
         XGlyphInfo ginfo;
-        XftTextExtentsUtf8(w.display(),
-                           m_xftfonts[ROT0],
-                           (XftChar8 *)text.data(), len,
-                           &ginfo);
+        XftTextExtentsUtf8(w.display(), m_xftfonts[ROT0], (XftChar8 *)text, len, &ginfo);
         if (ginfo.xOff != 0) {
-            XftDrawStringUtf8(draw,
-                              &xftcolor,
-                              font,
-                              x, y,
-                              (XftChar8 *)(text.data()), len);
-            XftColorFree(w.display(), 
-                         DefaultVisual(w.display(), screen),
-                         DefaultColormap(w.display(), screen), &xftcolor);
+            XftDrawStringUtf8(draw, &xftcolor, font, x, y, (XftChar8 *)text, len);
+            XftColorFree(w.display(), def_visual, def_colmap, &xftcolor);
             XftDrawDestroy(draw);
             return;
         }
     }
 #endif // HAVE_XFT_UTF8_STRING
 
-    XftDrawString8(draw,
-                   &xftcolor,
-                   font,
-                   x, y,
-                   (XftChar8 *)(text.data()), len);
+    XftDrawString8(draw, &xftcolor, font, x, y, (XftChar8 *)text, len);
 
 
-    XftColorFree(w.display(), 
-                 DefaultVisual(w.display(), screen),
-                 DefaultColormap(w.display(), screen), &xftcolor);
+    XftColorFree(w.display(), def_visual, def_colmap, &xftcolor);
     XftDrawDestroy(draw);
 }
 
-unsigned int XftFontImp::textWidth(const FbString &text, unsigned int len) const {
+unsigned int XftFontImp::textWidth(const char* text, unsigned int len) const {
+
     if (m_xftfonts[ROT0] == 0)
         return 0;
 
@@ -180,7 +165,7 @@ unsigned int XftFontImp::textWidth(const FbString &text, unsigned int len) const
     if (m_utf8mode) {
         XftTextExtentsUtf8(disp,
                            font,
-                           (XftChar8 *)text.data(), len,
+                           (XftChar8 *)text, len,
                            &ginfo);
         if (ginfo.xOff != 0)
             return ginfo.xOff;
@@ -189,9 +174,7 @@ unsigned int XftFontImp::textWidth(const FbString &text, unsigned int len) const
     }
 #endif  //HAVE_XFT_UTF8_STRING
 
-    std::string localestr = text;
-    localestr.erase(len, std::string::npos);
-    localestr = FbStringUtil::FbStrToLocale(localestr);
+    std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, len));
 
     XftTextExtents8(disp,
                     font,
diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh
index 3d2dc55..fd24762 100644
--- a/src/FbTk/XftFontImp.hh
+++ b/src/FbTk/XftFontImp.hh
@@ -34,8 +34,8 @@ public:
     XftFontImp(const char *fontname, bool utf8);
     ~XftFontImp();
     bool load(const std::string &name);
-    void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y , FbTk::Orientation orient);
-    unsigned int textWidth(const FbString &text, unsigned int len) const;
+    void drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y , FbTk::Orientation orient);
+    unsigned int textWidth(const char* text, unsigned int len) const;
     unsigned int height() const;
     int ascent() const { return m_xftfonts[0] ? m_xftfonts[0]->ascent : 0; }
     int descent() const { return m_xftfonts[0] ? m_xftfonts[0]->descent : 0; }
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 3ce913d..7613a40 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -189,10 +189,10 @@ bool XmbFontImp::load(const string &fontname) {
     return true;
 }
 
-void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const FbString &text,
+void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const char* text,
                           size_t len, int x, int y, FbTk::Orientation orient) {
 
-    if (m_fontset == 0)
+    if (!text || !*text || m_fontset == 0)
         return;
 
     if (orient == ROT0) {
@@ -200,13 +200,11 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const FbS
         if (m_utf8mode) {
             Xutf8DrawString(d.display(), d.drawable(), m_fontset,
                             main_gc, x, y,
-                            text.data(), len);
+                            text, len);
         } else
 #endif //X_HAVE_UTF8_STRING
             {
-                string localestr = text;
-                localestr.erase(len, string::npos);
-                localestr = FbStringUtil::FbStrToLocale(localestr);
+                std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, 0, len));
                 XmbDrawString(d.display(), d.drawable(), m_fontset,
                               main_gc, x, y,
                               localestr.data(), localestr.size());
@@ -239,13 +237,11 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const FbS
     if (m_utf8mode) {
         Xutf8DrawString(dpy, canvas.drawable(), m_fontset,
                              font_gc.gc(), xpos, ypos,
-                             text.data(), len);
+                             text, len);
     } else
 #endif //X_HAVE_UTF8_STRING
     {
-        string localestr = text;
-        localestr.erase(len, string::npos);
-        localestr = FbStringUtil::FbStrToLocale(localestr);
+        std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, 0, len));
         XmbDrawString(dpy, canvas.drawable(), m_fontset,
                            font_gc.gc(), xpos, ypos,
                            localestr.data(), localestr.size());
@@ -277,25 +273,21 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const FbS
 
 }
 
-unsigned int XmbFontImp::textWidth(const FbString &text, unsigned int len) const {
+unsigned int XmbFontImp::textWidth(const char* text, unsigned int len) const {
+
     if (m_fontset == 0)
         return 0;
 
     XRectangle ink, logical;
 #ifdef X_HAVE_UTF8_STRING
     if (m_utf8mode) {
-        Xutf8TextExtents(m_fontset, text.data(), len,
-                         &ink, &logical);
+        Xutf8TextExtents(m_fontset, text, len, &ink, &logical);
         if (logical.width != 0)
             return logical.width;
     }
 #endif // X_HAVE_UTF8_STRING
 
-    string localestr = text;
-    if (len > localestr.length())
-        len = localestr.length();
-    localestr.erase(len, string::npos);
-    localestr = FbStringUtil::FbStrToLocale(localestr);
+    std::string localestr = FbStringUtil::FbStrToLocale(FbString(text, len));
     XmbTextExtents(m_fontset, localestr.data(), localestr.size(),
                    &ink, &logical);
     return logical.width;
diff --git a/src/FbTk/XmbFontImp.hh b/src/FbTk/XmbFontImp.hh
index e2f916a..d3e586a 100644
--- a/src/FbTk/XmbFontImp.hh
+++ b/src/FbTk/XmbFontImp.hh
@@ -32,8 +32,8 @@ public:
     XmbFontImp(const char *fontname, bool utf8);
     ~XmbFontImp();
     bool load(const std::string &name);
-    virtual void drawText(const FbDrawable &w, int screen, GC gc, const FbString &text, size_t len, int x, int y, FbTk::Orientation orient);
-    unsigned int textWidth(const FbString &text, unsigned int len) const;
+    virtual void drawText(const FbDrawable &w, int screen, GC gc, const char* text, size_t len, int x, int y, FbTk::Orientation orient);
+    unsigned int textWidth(const char* text, unsigned int len) const;
     unsigned int height() const;
     int ascent() const { return m_setextents ? -m_setextents->max_ink_extent.y : 0; }
     int descent() const { return m_setextents ? m_setextents->max_ink_extent.height + m_setextents->max_ink_extent.y : 0; }