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, 8 insertions, 10 deletions

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());
 }