Merge branch 'bug_539_add_multicontent_pixmap_progress'

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

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index ee228576bfb9852bfb495159a46919c35199f44e..a5db43a9e3af99765f12ae4e91d933c5d38c1899 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -6,10 +6,21 @@
 #include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>

+#include <byteswap.h>
+
+#ifndef BYTE_ORDER
+#error "no BYTE_ORDER defined!"
+#endif

 
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef HAVE_FREETYPE2
+#define FTC_Image_Cache_New(a,b)       FTC_ImageCache_New(a,b)
+#define FTC_Image_Cache_Lookup(a,b,c,d)        FTC_ImageCache_Lookup(a,b,c,d,NULL)
+#define FTC_SBit_Cache_New(a,b)                FTC_SBitCache_New(a,b)
+#define FTC_SBit_Cache_Lookup(a,b,c,d) FTC_SBitCache_Lookup(a,b,c,d,NULL)
+#endif

 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>
 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>


@@ -18,7 +29,7 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 

-//#define HAVE_FRIBIDI
+#define HAVE_FRIBIDI

 // until we have it in the cdk
 
 #ifdef HAVE_FRIBIDI
 // until we have it in the cdk
 
 #ifdef HAVE_FRIBIDI


@@ -30,9 +41,10 @@
 fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

-static pthread_mutex_t refcntlck=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

 
 

+#ifndef HAVE_FREETYPE2

 static FTC_Font cache_current_font=0;
 static FTC_Font cache_current_font=0;

+#endif

 
 struct fntColorCacheKey
 {
 
 struct fntColorCacheKey
 {


@@ -60,12 +72,12 @@ static gLookup &getColor(const gPalette &pal, const gRGB &start, const gRGB &end
        if (i != colorcache.end())
                return i->second;
        gLookup &n=colorcache.insert(std::pair<fntColorCacheKey,gLookup>(key,gLookup())).first->second;
        if (i != colorcache.end())
                return i->second;
        gLookup &n=colorcache.insert(std::pair<fntColorCacheKey,gLookup>(key,gLookup())).first->second;

-       eDebug("[FONT] creating new font color cache entry %02x%02x%02x%02x .. %02x%02x%02x%02x", start.a, start.r, start.g, start.b,
-               end.a, end.r, end.g, end.b);
+//     eDebug("[FONT] creating new font color cache entry %02x%02x%02x%02x .. %02x%02x%02x%02x", start.a, start.r, start.g, start.b,
+//             end.a, end.r, end.g, end.b);

        n.build(16, pal, start, end);
        n.build(16, pal, start, end);

-/*     for (int i=0; i<16; i++)
-               eDebugNoNewLine("%02x|%02x%02x%02x%02x ", (int)n.lookup[i], pal.data[n.lookup[i]].a, pal.data[n.lookup[i]].r, pal.data[n.lookup[i]].g, pal.data[n.lookup[i]].b);
-       eDebug("");*/
+//     for (int i=0; i<16; i++)
+//             eDebugNoNewLine("%02x|%02x%02x%02x%02x ", (int)n.lookup[i], pal.data[n.lookup[i]].a, pal.data[n.lookup[i]].r, pal.data[n.lookup[i]].g, pal.data[n.lookup[i]].b);
+//     eDebug("");

        return n;
 }
 
        return n;
 }
 


@@ -198,19 +210,21 @@ float fontRenderClass::getLineHeight(const gFont& font)
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;

+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, &current_face) < 0) ||
+           (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))
+#else

        if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)
        if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)

+#endif

        {
        {

-               delete fnt;

                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        }
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        }
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);

-       float height=(current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap/2.0)/64;
-       delete fnt;
+       float height=(current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)/64.0;

        return height;
 }
 
        return height;
 }
 

-

 fontRenderClass::~fontRenderClass()
 {
        singleLock s(ftlock);
 fontRenderClass::~fontRenderClass()
 {
        singleLock s(ftlock);


@@ -237,15 +251,33 @@ int fontRenderClass::getFont(ePtr<Font> &font, const std::string &face, int size
        return 0;
 }
 
        return 0;
 }
 

+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
+{
+       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
+       if (is_replacement)
+               eTextPara::setReplacementFont(alias);
+}
+

 DEFINE_REF(Font);
 
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;
 DEFINE_REF(Font);
 
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;

+#ifdef HAVE_FREETYPE2
+       font.face_id = faceid;
+       font.width = isize;
+       font.height = isize;
+       font.flags = FT_LOAD_DEFAULT;
+       scaler.face_id = faceid;
+       scaler.width = isize;
+       scaler.height = isize;
+       scaler.pixel = 1;
+#else

        font.font.face_id=faceid;
        font.font.pix_width     = isize;
        font.font.pix_height = isize;
        font.image_type = ftc_image_grays;
        font.font.face_id=faceid;
        font.font.pix_width     = isize;
        font.font.pix_height = isize;
        font.image_type = ftc_image_grays;

+#endif

        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;
        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;


@@ -272,7 +304,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        int nx=cursor.x();
 
        nx+=glyph->xadvance;
        int nx=cursor.x();
 
        nx+=glyph->xadvance;

-       
+

        if (
                        (rflags&RS_WRAP) && 
                        (nx >= area.right())
        if (
                        (rflags&RS_WRAP) && 
                        (nx >= area.right())


@@ -280,33 +312,45 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        {
                int cnt = 0;
                glyphString::reverse_iterator i(glyphs.rbegin());
        {
                int cnt = 0;
                glyphString::reverse_iterator i(glyphs.rbegin());

+                       /* find first possibility (from end to begin) to break */

                while (i != glyphs.rend())
                {
                while (i != glyphs.rend())
                {

-                       if (i->flags&(GS_ISSPACE|GS_ISFIRST))
+                       if (i->flags&(GS_CANBREAK|GS_ISFIRST)) /* stop on either space/hyphen/shy or start of line (giving up) */

                                break;
                        cnt++;
                        ++i;
                                break;
                        cnt++;
                        ++i;

-               } 
-               if (i != glyphs.rend()
-                       && ((i->flags&(GS_ISSPACE|GS_ISFIRST))==GS_ISSPACE)
-                       && cnt )
+               }
+
+                       /* if ... */
+               if (i != glyphs.rend()  /* ... we found anything */
+                       && (i->flags&GS_CANBREAK) /* ...and this is a space/hyphen/soft-hyphen */
+                       && (!(i->flags & GS_ISFIRST)) /* ...and this is not an start of line (line with just a single space/hyphen) */
+                       && cnt ) /* ... and there are actual non-space characters after this */

                {
                {

-                       --i;
+                               /* if we have a soft-hyphen, and used that for breaking, turn it into a real hyphen */
+                       if (i->flags & GS_SOFTHYPHEN)
+                       {
+                               i->flags &= ~GS_SOFTHYPHEN;
+                               i->flags |= GS_HYPHEN;
+                       }
+                       --i; /* skip the space/hypen/softhyphen */

                        int linelength=cursor.x()-i->x;
                        int linelength=cursor.x()-i->x;

-                       i->flags|=GS_ISFIRST;
+                       i->flags|=GS_ISFIRST; /* make this a line start */

                        ePoint offset=ePoint(i->x, i->y);
                        newLine(rflags);
                        offset-=cursor;
                        ePoint offset=ePoint(i->x, i->y);
                        newLine(rflags);
                        offset-=cursor;

+
+                               /* and move everything to the end into the next line. */

                        do
                        {
                                i->x-=offset.x();
                                i->y-=offset.y();
                                i->bbox.moveBy(-offset.x(), -offset.y());
                        do
                        {
                                i->x-=offset.x();
                                i->y-=offset.y();
                                i->bbox.moveBy(-offset.x(), -offset.y());

-                       }
-                       while (i-- != glyphs.rbegin()); // rearrange them into the next line
+                               --lineChars.back();
+                               ++charCount;
+                       } while (i-- != glyphs.rbegin()); // rearrange them into the next line

                        cursor+=ePoint(linelength, 0);  // put the cursor after that line
                        cursor+=ePoint(linelength, 0);  // put the cursor after that line

-               }
-               else
+               } else

                {
                        if (cnt)
                        {
                {
                        if (cnt)
                        {


@@ -317,7 +361,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        }
 
        int xadvance=glyph->xadvance, kern=0;
        }
 
        int xadvance=glyph->xadvance, kern=0;

-       
+

        if (previous && use_kerning)
        {
                FT_Vector delta;
        if (previous && use_kerning)
        {
                FT_Vector delta;


@@ -326,37 +370,49 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        }
 
        pGlyph ng;
        }
 
        pGlyph ng;

-       ng.bbox.setLeft( (flags&GS_ISFIRST|cursor.x()-1)+glyph->left );
+       ng.bbox.setLeft( ((flags&GS_ISFIRST)|(cursor.x()-1))+glyph->left );

        ng.bbox.setTop( cursor.y() - glyph->top );
        ng.bbox.setWidth( glyph->width );
        ng.bbox.setHeight( glyph->height );
 
        ng.bbox.setTop( cursor.y() - glyph->top );
        ng.bbox.setWidth( glyph->width );
        ng.bbox.setHeight( glyph->height );
 

-       xadvance+=kern;
+       xadvance += kern;
+       ng.bbox.setWidth(xadvance);

 
 

-       ng.x=cursor.x()+kern;
-       ng.y=cursor.y();
-       ng.w=xadvance;
-       ng.font=current_font;
-       ng.glyph_index=glyphIndex;
-       ng.flags=flags;
+       ng.x = cursor.x()+kern;
+       ng.y = cursor.y();
+       ng.w = xadvance;
+       ng.font = current_font;
+       ng.glyph_index = glyphIndex;
+       ng.flags = flags;

        glyphs.push_back(ng);
        glyphs.push_back(ng);

+       ++charCount;

 
 

-       cursor+=ePoint(xadvance, 0);
-       previous=glyphIndex;
+               /* when we have a SHY, don't xadvance. It will either be the last in the line (when used for breaking), or not displayed. */
+       if (!(flags & GS_SOFTHYPHEN))
+               cursor += ePoint(xadvance, 0);
+       previous = glyphIndex;

        return 0;
 }
 
 void eTextPara::calc_bbox()
 {
        return 0;
 }
 
 void eTextPara::calc_bbox()
 {

-       boundBox.setLeft( 32000 );
-       boundBox.setTop( 32000 );
-       boundBox.setRight( -32000 );         // for each glyph image, compute its bounding box, translate it,
-       boundBox.setBottom( -32000 );
-       // and grow the string bbox
+       if (!glyphs.size())
+       {
+               bboxValid = 0;
+               boundBox = eRect();
+               return;
+       }
+       
+       bboxValid = 1;

 
 

-       for ( glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+       glyphString::iterator i(glyphs.begin());
+       
+       boundBox = i->bbox; 
+       ++i;
+
+       for (; i != glyphs.end(); ++i)

        {
        {

-               if ( i->flags & GS_ISSPACE )
+               if (i->flags & (GS_ISSPACE|GS_SOFTHYPHEN))

                        continue;
                if ( i->bbox.left() < boundBox.left() )
                        boundBox.setLeft( i->bbox.left() );
                        continue;
                if ( i->bbox.left() < boundBox.left() )
                        boundBox.setLeft( i->bbox.left() );


@@ -368,8 +424,6 @@ void eTextPara::calc_bbox()
                        boundBox.setBottom( i->bbox.bottom() );
        }
 //     eDebug("boundBox left = %i, top = %i, right = %i, bottom = %i", boundBox.left(), boundBox.top(), boundBox.right(), boundBox.bottom() );
                        boundBox.setBottom( i->bbox.bottom() );
        }
 //     eDebug("boundBox left = %i, top = %i, right = %i, bottom = %i", boundBox.left(), boundBox.top(), boundBox.right(), boundBox.bottom() );

-       if ( glyphs.size() )
-               bboxValid=1;

 }
 
 void eTextPara::newLine(int flags)
 }
 
 void eTextPara::newLine(int flags)


@@ -379,7 +433,13 @@ void eTextPara::newLine(int flags)
        cursor.setX(left);
        previous=0;
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
        cursor.setX(left);
        previous=0;
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);

-       cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap*1/2)>>6);
+
+       lineOffsets.push_back(cursor.y());
+       lineChars.push_back(charCount);
+       charCount=0;
+
+       cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)>>6);
+

        if (maximum.height()<cursor.y())
                maximum.setHeight(cursor.y());
        previous=0;
        if (maximum.height()<cursor.y())
                maximum.setHeight(cursor.y());
        previous=0;


@@ -401,6 +461,7 @@ void eTextPara::setFont(const gFont *font)
 }
 
 std::string eTextPara::replacement_facename;
 }
 
 std::string eTextPara::replacement_facename;

+std::set<int> eTextPara::forced_replaces;

 
 void eTextPara::setFont(Font *fnt, Font *replacement)
 {
 
 void eTextPara::setFont(Font *fnt, Font *replacement)
 {


@@ -413,9 +474,18 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {

+#ifdef HAVE_FREETYPE2
+               if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                           replacement_font->scaler.face_id,
+                                           &replacement_face) < 0) ||
+                   (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                           &replacement_font->scaler,
+                                           &replacement_font->size) < 0))
+#else

                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
                                &replacement_font->font.font, &replacement_face, 
                                &replacement_font->size)<0)
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
                                &replacement_font->font.font, &replacement_face, 
                                &replacement_font->size)<0)

+#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;


@@ -423,13 +493,24 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
        }
        if (current_font)
        {
        }
        if (current_font)
        {

+#ifdef HAVE_FREETYPE2
+               if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                           current_font->scaler.face_id,
+                                           &current_face) < 0) ||
+                   (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                           &current_font->scaler,
+                                           &current_font->size) < 0))
+#else

                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)

+#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }

+#ifndef HAVE_FREETYPE2

        cache_current_font=&current_font->font.font;
        cache_current_font=&current_font->font.font;

+#endif

        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }
        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }


@@ -437,19 +518,25 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
 void
 shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &text);
 
 void
 shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &text);
 

-int eTextPara::renderString(const std::string &string, int rflags)
+int eTextPara::renderString(const char *string, int rflags)

 {
        singleLock s(ftlock);
        
        if (!current_font)
                return -1;
 {
        singleLock s(ftlock);
        
        if (!current_font)
                return -1;

-               
-       if (cursor.y()==-1)
+
+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                   current_font->scaler.face_id,
+                                   &current_face) < 0) ||
+           (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                   &current_font->scaler,
+                                   &current_font->size) < 0))

        {
        {

-               cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
-               left=cursor.x();
+               eDebug("FTC_Manager_Lookup_Size failed!");
+               return -1;

        }
        }

-               
+#else

        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)


@@ -459,15 +546,28 @@ int eTextPara::renderString(const std::string &string, int rflags)
                }
                cache_current_font=&current_font->font.font;
        }
                }
                cache_current_font=&current_font->font.font;
        }

-       
+#endif
+
+       if (!current_face)
+               eFatal("eTextPara::renderString: no current_face");
+       if (!current_face->size)
+               eFatal("eTextPara::renderString: no current_face->size");
+
+       if (cursor.y()==-1)
+       {
+               cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
+               left=cursor.x();
+       }
+

        std::vector<unsigned long> uc_string, uc_visual;
        std::vector<unsigned long> uc_string, uc_visual;

-       uc_string.reserve(string.length());
+       if (string)
+               uc_string.reserve(strlen(string));

        
        

-       std::string::const_iterator p(string.begin());
+       const char *p = string ? string : "";

 
 

-       while(p != string.end())
+       while (*p)

        {
        {

-               unsigned int unicode=*p++;
+               unsigned int unicode=(unsigned char)*p++;

 
                if (unicode & 0x80) // we have (hopefully) UTF8 here, and we assume that the encoding is VALID
                {
 
                if (unicode & 0x80) // we have (hopefully) UTF8 here, and we assume that the encoding is VALID
                {


@@ -475,28 +575,28 @@ int eTextPara::renderString(const std::string &string, int rflags)
                        {
                                unicode&=0x1F;
                                unicode<<=6;
                        {
                                unicode&=0x1F;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                        } else if ((unicode & 0xF0)==0xE0) // three bytes
                        {
                                unicode&=0x0F;
                                unicode<<=6;
                                        unicode|=(*p++)&0x3F;
                        } else if ((unicode & 0xF0)==0xE0) // three bytes
                        {
                                unicode&=0x0F;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;
                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                        } else if ((unicode & 0xF8)==0xF0) // four bytes
                        {
                                unicode&=0x07;
                                unicode<<=6;
                                        unicode|=(*p++)&0x3F;
                        } else if ((unicode & 0xF8)==0xF0) // four bytes
                        {
                                unicode&=0x07;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;
                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;
                                        unicode|=(*p++)&0x3F;
                                unicode<<=6;

-                               if (p != string.end())
+                               if (*p)

                                        unicode|=(*p++)&0x3F;
                        }
                }
                                        unicode|=(*p++)&0x3F;
                        }
                }


@@ -509,22 +609,20 @@ int eTextPara::renderString(const std::string &string, int rflags)
        shape(uc_shape, uc_string);
        
                // now do the usual logical->visual reordering
        shape(uc_shape, uc_string);
        
                // now do the usual logical->visual reordering

-#ifdef HAVE_FRIBIDI    
+       int size=uc_shape.size();
+#ifdef HAVE_FRIBIDI

        FriBidiCharType dir=FRIBIDI_TYPE_ON;
        FriBidiCharType dir=FRIBIDI_TYPE_ON;

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

 #else
        uc_visual=uc_shape;
 #endif
 
 #else
        uc_visual=uc_shape;
 #endif
 

-       glyphs.reserve(uc_visual.size());
+       glyphs.reserve(size);

        
        int nextflags = 0;
        
        
        int nextflags = 0;
        


@@ -534,9 +632,11 @@ int eTextPara::renderString(const std::string &string, int rflags)
                int isprintable=1;
                int flags = nextflags;
                nextflags = 0;
                int isprintable=1;
                int flags = nextflags;
                nextflags = 0;

+               unsigned long chr = *i;
+

                if (!(rflags&RS_DIRECT))
                {
                if (!(rflags&RS_DIRECT))
                {

-                       switch (*i)
+                       switch (chr)

                        {
                        case '\\':
                        {
                        {
                        case '\\':
                        {


@@ -574,6 +674,14 @@ newline:isprintable=0;
                        case 0x87: case 0xE087:
 nprint:        isprintable=0;
                                break;
                        case 0x87: case 0xE087:
 nprint:        isprintable=0;
                                break;

+                       case 0xAD: // soft-hyphen
+                               flags |= GS_SOFTHYPHEN;
+                               chr = 0x2010; /* hyphen */
+                               break;
+                       case 0x2010:
+                       case '-':
+                               flags |= GS_HYPHEN;
+                               break;

                        case ' ':
                                flags|=GS_ISSPACE;
                        default:
                        case ' ':
                                flags|=GS_ISSPACE;
                        default:


@@ -582,17 +690,22 @@ nprint:   isprintable=0;
                }
                if (isprintable)
                {
                }
                if (isprintable)
                {

-                       FT_UInt index;
+                       FT_UInt index = 0;

 
 

-                       index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
+                               /* FIXME: our font doesn't seem to have a hyphen, so use hyphen-minus for it. */
+                       if (chr == 0x2010)
+                               chr = '-';
+
+                       if (forced_replaces.find(chr) == forced_replaces.end())
+                               index=(rflags&RS_DIRECT)? chr : FT_Get_Char_Index(current_face, chr);

 
                        if (!index)
                        {
                                if (replacement_face)
 
                        if (!index)
                        {
                                if (replacement_face)

-                                       index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(replacement_face, *i);
+                                       index=(rflags&RS_DIRECT)? chr : FT_Get_Char_Index(replacement_face, chr);

 
                                if (!index)
 
                                if (!index)

-                                       eDebug("unicode %d ('%c') not present", *i, *i);
+                                       eDebug("unicode U+%4lx not present", chr);

                                else
                                        appendGlyph(replacement_font, replacement_face, index, flags, rflags);
                        } else
                                else
                                        appendGlyph(replacement_font, replacement_face, index, flags, rflags);
                        } else


@@ -603,8 +716,19 @@ nprint:    isprintable=0;
        calc_bbox();
 #ifdef HAVE_FRIBIDI
        if (dir & FRIBIDI_MASK_RTL)
        calc_bbox();
 #ifdef HAVE_FRIBIDI
        if (dir & FRIBIDI_MASK_RTL)

+       {

                realign(dirRight);
                realign(dirRight);

+               doTopBottomReordering=true;
+       }

 #endif
 #endif

+
+       if (charCount)
+       {
+               lineOffsets.push_back(cursor.y());
+               lineChars.push_back(charCount);
+               charCount=0;
+       }
+

        return 0;
 }
 
        return 0;
 }
 


@@ -615,6 +739,18 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        if (!current_font)
                return;
 
        if (!current_font)
                return;
 

+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                   current_font->scaler.face_id,
+                                   &current_face) < 0) ||
+           (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                   &current_font->scaler,
+                                   &current_font->size) < 0))
+       {
+               eDebug("FTC_Manager_Lookup_Size failed!");
+               return;
+       }
+#else

        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)


@@ -624,121 +760,221 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                }
                cache_current_font=&current_font->font.font;
        }
                }
                cache_current_font=&current_font->font.font;
        }

+#endif

 
        ePtr<gPixmap> target;
        dc.getPixmap(target);
        gSurface *surface = target->surface;
 
        register int opcode;
 
        ePtr<gPixmap> target;
        dc.getPixmap(target);
        gSurface *surface = target->surface;
 
        register int opcode;

-       gColor *lookup8=0;
-       __u32 lookup32[16];
-               
+
+       gColor *lookup8, lookup8_invert[16];
+       gColor *lookup8_normal=0;
+
+       __u16 lookup16_normal[16], lookup16_invert[16], *lookup16;
+       __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;
+

        if (surface->bpp == 8)
        {
                if (surface->clut.data)
                {
        if (surface->bpp == 8)
        {
                if (surface->clut.data)
                {

-                       lookup8=getColor(surface->clut, background, foreground).lookup;
+                       lookup8_normal=getColor(surface->clut, background, foreground).lookup;
+                       
+                       int i;
+                       for (i=0; i<16; ++i)
+                               lookup8_invert[i] = lookup8_normal[i^0xF];
+                       

                        opcode=0;
                } else
                        opcode=1;
                        opcode=0;
                } else
                        opcode=1;

+       } else if (surface->bpp == 16)
+       {
+               opcode=2;
+               for (int i=0; i<16; ++i)
+               {
+#define BLEND(y, x, a) (y + (((x-y) * a)>>8))
+                       unsigned char da = background.a, dr = background.r, dg = background.g, db = background.b;
+                       int sa = i * 16;
+                       if (sa < 256)
+                       {
+                               dr = BLEND(background.r, foreground.r, sa) & 0xFF;
+                               dg = BLEND(background.g, foreground.g, sa) & 0xFF;
+                               db = BLEND(background.b, foreground.b, sa) & 0xFF;
+                       }
+#undef BLEND
+#if BYTE_ORDER == LITTLE_ENDIAN
+                       lookup16_normal[i] = bswap_16(((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3));
+#else
+                       lookup16_normal[i] = ((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3);
+#endif
+                       da ^= 0xFF;
+               }
+               for (int i=0; i<16; ++i)
+                       lookup16_invert[i]=lookup16_normal[i^0xF];

        } else if (surface->bpp == 32)
        {
                opcode=3;
        } else if (surface->bpp == 32)
        {
                opcode=3;

-               if (surface->clut.data)
+               for (int i=0; i<16; ++i)

                {
                {

-                       lookup8=getColor(surface->clut, background, foreground).lookup;
-                       for (int i=0; i<16; ++i)
-                               lookup32[i]=((surface->clut.data[lookup8[i]].a<<24)|
-                                       (surface->clut.data[lookup8[i]].r<<16)|
-                                       (surface->clut.data[lookup8[i]].g<<8)|
-                                       (surface->clut.data[lookup8[i]].b))^0xFF000000;
-               } else
-               {
-                       for (int i=0; i<16; ++i)
-                               lookup32[i]=(0x010101*i)|0xFF000000;
+#define BLEND(y, x, a) (y + (((x-y) * a)>>8))
+
+                       unsigned char da = background.a, dr = background.r, dg = background.g, db = background.b;
+                       int sa = i * 16;
+                       if (sa < 256)
+                       {
+                               da = BLEND(background.a, foreground.a, sa) & 0xFF;
+                               dr = BLEND(background.r, foreground.r, sa) & 0xFF;
+                               dg = BLEND(background.g, foreground.g, sa) & 0xFF;
+                               db = BLEND(background.b, foreground.b, sa) & 0xFF;
+                       }
+#undef BLEND
+                       da ^= 0xFF;
+                       lookup32_normal[i]=db | (dg << 8) | (dr << 16) | (da << 24);;

                }
                }

+               for (int i=0; i<16; ++i)
+                       lookup32_invert[i]=lookup32_normal[i^0xF];

        } else
        {
                eWarning("can't render to %dbpp", surface->bpp);
                return;
        }
        } else
        {
                eWarning("can't render to %dbpp", surface->bpp);
                return;
        }

-       
+

        gRegion area(eRect(0, 0, surface->x, surface->y));
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;
 
        gRegion area(eRect(0, 0, surface->x, surface->y));
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;
 

-       for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+       for (unsigned int c = 0; c < clip.rects.size(); ++c)

        {
        {

-               static FTC_SBit glyph_bitmap;
-               if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
-                       continue;
-               int rx=i->x+glyph_bitmap->left + offset.x();
-               int ry=i->y-glyph_bitmap->top  + offset.y();
-               __u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
-               __u8 *s=glyph_bitmap->buffer;
-               register int sx=glyph_bitmap->width;
-               int sy=glyph_bitmap->height;
-               if ((sy+ry) >= clip.extends.bottom())
-                       sy=clip.extends.bottom()-ry;
-               if ((sx+rx) >= clip.extends.right())
-                       sx=clip.extends.right()-rx;
-               if (rx < clip.extends.left())
-               {
-                       int diff=clip.extends.left()-rx;
-                       s+=diff;
-                       sx-=diff;
-                       rx+=diff;
-                       d+=diff*surface->bypp;
-               }
-               if (ry < clip.extends.top())
+               std::list<int>::reverse_iterator line_offs_it(lineOffsets.rbegin());
+               std::list<int>::iterator line_chars_it(lineChars.begin());
+               int line_offs=0;
+               int line_chars=0;
+               for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i, --line_chars)

                {
                {

-                       int diff=clip.extends.top()-ry;
-                       s+=diff*glyph_bitmap->pitch;
-                       sy-=diff;
-                       ry+=diff;
-                       d+=diff*buffer_stride;
-               }
-               if (sx>0)
-                       for (int ay=0; ay<sy; ay++)
+                       while(!line_chars)

                        {
                        {

-                               if (!opcode)            // 4bit lookup to 8bit
-                               {
-                                       register __u8 *td=d;
-                                       register int ax;
-                                       for (ax=0; ax<sx; ax++)
-                                       {       
-                                               register int b=(*s++)>>4;
-                                               if(b)
-                                                       *td++=lookup8[b];
-                                               else
-                                                       td++;
+                               line_offs = *(line_offs_it++);
+                               line_chars = *(line_chars_it++);
+                       }
+
+                       if (i->flags & GS_SOFTHYPHEN)
+                               continue;
+
+                       if (!(i->flags & GS_INVERT))
+                       {
+                               lookup8 = lookup8_normal;
+                               lookup16 = lookup16_normal;
+                               lookup32 = lookup32_normal;
+                       } else
+                       {
+                               lookup8 = lookup8_invert;
+                               lookup16 = lookup16_invert;
+                               lookup32 = lookup32_invert;
+                       }
+
+                       static FTC_SBit glyph_bitmap;
+                       if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
+                               continue;
+                       int rx=i->x+glyph_bitmap->left + offset.x();
+                       int ry=(doTopBottomReordering ? line_offs : i->y) - glyph_bitmap->top + offset.y();
+
+                       __u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
+                       __u8 *s=glyph_bitmap->buffer;
+                       register int sx=glyph_bitmap->width;
+                       int sy=glyph_bitmap->height;
+                       if ((sy+ry) >= clip.rects[c].bottom())
+                               sy=clip.rects[c].bottom()-ry;
+                       if ((sx+rx) >= clip.rects[c].right())
+                               sx=clip.rects[c].right()-rx;
+                       if (rx < clip.rects[c].left())
+                       {
+                               int diff=clip.rects[c].left()-rx;
+                               s+=diff;
+                               sx-=diff;
+                               rx+=diff;
+                               d+=diff*surface->bypp;
+                       }
+                       if (ry < clip.rects[c].top())
+                       {
+                               int diff=clip.rects[c].top()-ry;
+                               s+=diff*glyph_bitmap->pitch;
+                               sy-=diff;
+                               ry+=diff;
+                               d+=diff*buffer_stride;
+                       }
+                       if (sx>0)
+                       {
+                               switch(opcode) {
+                               case 0: // 4bit lookup to 8bit
+                                       for (int ay=0; ay<sy; ay++)
+                                       {
+                                               register __u8 *td=d;
+                                               register int ax;
+                                               for (ax=0; ax<sx; ax++)
+                                               {
+                                                       register int b=(*s++)>>4;
+                                                       if(b)
+                                                               *td++=lookup8[b];
+                                                       else
+                                                               td++;
+                                               }
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;

                                        }
                                        }

-                               } else if (opcode == 1) // 8bit direct
-                               {
-                                       register __u8 *td=d;
-                                       register int ax;
-                                       for (ax=0; ax<sx; ax++)
-                                       {       
-                                               register int b=*s++;
-                                               *td++^=b;
+                                       break;
+                               case 1: // 8bit direct
+                                       for (int ay=0; ay<sy; ay++)
+                                       {
+                                               register __u8 *td=d;
+                                               register int ax;
+                                               for (ax=0; ax<sx; ax++)
+                                               {
+                                                       register int b=*s++;
+                                                       *td++^=b;
+                                               }
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;

                                        }
                                        }

-                               } else
-                               {
-                                       register __u32 *td=(__u32*)d;
-                                       register int ax;
-                                       for (ax=0; ax<sx; ax++)
-                                       {       
-                                               register int b=(*s++)>>4;
-                                               if(b)
-                                                       *td++=lookup32[b];
-                                               else
-                                                       td++;
+                                       break;
+                               case 2: // 16bit
+                                       for (int ay=0; ay<sy; ay++)
+                                       {
+                                               register __u16 *td=(__u16*)d;
+                                               register int ax;
+                                               for (ax=0; ax<sx; ax++)
+                                               {
+                                                       register int b=(*s++)>>4;
+                                                       if(b)
+                                                               *td++=lookup16[b];
+                                                       else
+                                                               td++;
+                                               }
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;
+                                       }
+                                       break;
+                               case 3: // 32bit
+                                       for (int ay=0; ay<sy; ay++)
+                                       {
+                                               register __u32 *td=(__u32*)d;
+                                               register int ax;
+                                               for (ax=0; ax<sx; ax++)
+                                               {
+                                                       register int b=(*s++)>>4;
+                                                       if(b)
+                                                               *td++=lookup32[b];
+                                                       else
+                                                               td++;
+                                               }
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;

                                        }
                                        }

+                               default:
+                                       break;

                                }
                                }

-                               s+=glyph_bitmap->pitch-sx;
-                               d+=buffer_stride;

                        }
                        }

+               }

        }
 }
 
        }
 }
 


@@ -774,9 +1010,6 @@ void eTextPara::realign(int dir)   // der code hier ist ein wenig merkwuerdig.
                        num++;
                }
 
                        num++;
                }
 

-               if (!num)               // line mit nur einem space
-                       continue;
-

                switch (dir)
                {
                case dirRight:
                switch (dir)
                {
                case dirRight: