Revert "lib/gdi/font.cpp: call libfribidi for single lines on multi line texts to...

[enigma2.git] / lib / gdi / font.cpp

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 1d3c34dac5a824ec317616d71695827c7ec436b7..dfac144c752d41c7506f59972fdb0a573a4ab6c4 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -595,60 +595,22 @@ int eTextPara::renderString(const char *string, int rflags)
        shape(uc_shape, uc_string);
        
                // now do the usual logical->visual reordering
-       int size=uc_shape.size();
-#ifdef HAVE_FRIBIDI
-       bool mustRealign=false;
-       int pos=0, spos=0;
-       uc_visual.resize(size);
-       // gaaanz lahm, aber anders geht das leider nicht, sorry.
-       FriBidiChar array[size], target[size];
-       std::copy(uc_shape.begin(), uc_shape.end(), array);
-
-       bool line_open = false;
-       while(pos < size)
+#ifdef HAVE_FRIBIDI    
+       FriBidiCharType dir=FRIBIDI_TYPE_ON;
        {
-               int incr=1;
-               bool line_end = false;
-               if (!line_open)
-                       line_open = true;
-               switch((unsigned long)array[pos])
-               {
-               case '\\':
-                       if (pos+1 == size || (unsigned long)array[pos+1] != 'n')
-                               break;
-                       ++incr;
-               case 0x8A:
-               case 0xE08A:
-               case '\n':
-                       line_end = true;
-               default:
-                       break;
-               }
-               if (line_end || pos+incr >= size)
-               {
-                       int len = pos - spos;
-                       if (len)
-                       {
-                               FriBidiCharType dir=FRIBIDI_TYPE_ON;
-                               fribidi_log2vis(array+spos, len, &dir, target+spos, 0, 0, 0);
-                               if (!mustRealign && dir&FRIBIDI_MASK_RTL)
-                                       mustRealign = true;
-                       }
-                       target[pos] = array[pos];
-                       if (incr > 1)
-                               target[pos+1] = array[pos+1];
-                       spos = pos+incr;
-                       line_open = false;
-               }
-               pos += incr;
+               int size=uc_shape.size();
+               uc_visual.resize(size);
+               // gaaanz lahm, aber anders geht das leider nicht, sorry.
+               FriBidiChar array[size], target[size];
+               std::copy(uc_shape.begin(), uc_shape.end(), array);
+               fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
+               uc_visual.assign(target, target+size);
        }
-
-       uc_visual.assign(target, target+size);
 #else
        uc_visual=uc_shape;
 #endif
 
-       glyphs.reserve(size);
+       glyphs.reserve(uc_visual.size());
        
        int nextflags = 0;
        
@@ -741,7 +703,7 @@ nprint:     isprintable=0;
        bboxValid=false;
        calc_bbox();
 #ifdef HAVE_FRIBIDI
-       if (mustRealign)
+       if (dir & FRIBIDI_MASK_RTL)
                realign(dirRight);
 #endif
        return 0;