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, 7 deletions

diff --git a/src/Xutil.cc b/src/Xutil.cc
index dfaccf9..2ef9315 100644
--- a/src/Xutil.cc
+++ b/src/Xutil.cc
@@ -46,7 +46,7 @@ namespace Xutil {
 FbTk::FbString getWMName(Window window) {
 
     if (window == None)
-        return "";
+        return FbTk::FbString("");
 
     Display *display = FbTk::App::instance()->display();
 
@@ -55,7 +55,7 @@ FbTk::FbString getWMName(Window window) {
     char **list = 0;
     int num = 0;
     _FB_USES_NLS;
-    string name;
+    FbTk::FbString name;
 
     if (XGetWMName(display, window, &text_prop)) {
         if (text_prop.value && text_prop.nitems > 0) {
@@ -90,9 +90,10 @@ FbTk::FbString getWMName(Window window) {
 
 
 // The name of this particular instance
-string getWMClassName(Window win) {
+FbTk::FbString getWMClassName(Window win) {
+
     XClassHint ch;
-    string instance_name;
+    FbTk::FbString instance_name;
 
     if (XGetClassHint(FbTk::App::instance()->display(), win, &ch) == 0) {
         fbdbg<<"Xutil: Failed to read class hint!"<<endl;
@@ -111,13 +112,13 @@ string getWMClassName(Window win) {
     }
 
     return instance_name;
-
 }
 
 // the name of the general class of the app
-string getWMClassClass(Window win) {
+FbTk::FbString getWMClassClass(Window win) {
+
     XClassHint ch;
-    string class_name;
+    FbTk::FbString class_name;
 
     if (XGetClassHint(FbTk::App::instance()->display(), win, &ch) == 0) {
         fbdbg<<"Xutil: Failed to read class hint!"<<endl;