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, 12 insertions, 2 deletions

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