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).

1 files changed, 13 insertions, 18 deletions

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