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 77c8de94e373682106f487257cc6d59ae61829f7..dfac144c752d41c7506f59972fdb0a573a4ab6c4 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -10,6 +10,12 @@
 // 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>


@@ -30,9 +36,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
 {


@@ -198,9 +205,13 @@ 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;
        }
                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        }


@@ -235,15 +246,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;


@@ -270,7 +299,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())


@@ -278,33 +307,43 @@ 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
+                       } 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)
                        {


@@ -315,7 +354,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;


@@ -340,7 +379,9 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        ng.flags = flags;
        glyphs.push_back(ng);
 
        ng.flags = flags;
        glyphs.push_back(ng);
 

-       cursor += ePoint(xadvance, 0);
+               /* 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;
 }
        previous = glyphIndex;
        return 0;
 }


@@ -363,7 +404,7 @@ void eTextPara::calc_bbox()
 
        for (; i != glyphs.end(); ++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() );


@@ -419,9 +460,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;


@@ -429,13 +479,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);
 }


@@ -449,13 +510,19 @@ int eTextPara::renderString(const char *string, int rflags)
        
        if (!current_font)
                return -1;
        
        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)


@@ -465,7 +532,19 @@ int eTextPara::renderString(const char *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;
        if (string)
                uc_string.reserve(strlen(string));
        std::vector<unsigned long> uc_string, uc_visual;
        if (string)
                uc_string.reserve(strlen(string));


@@ -482,28 +561,28 @@ int eTextPara::renderString(const char *string, int rflags)
                        {
                                unicode&=0x1F;
                                unicode<<=6;
                        {
                                unicode&=0x1F;
                                unicode<<=6;

-                               if (p)
+                               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)
+                               if (*p)

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

-                               if (p)
+                               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)
+                               if (*p)

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

-                               if (p)
+                               if (*p)

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

-                               if (p)
+                               if (*p)

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


@@ -541,9 +620,11 @@ int eTextPara::renderString(const char *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 '\\':
                        {


@@ -581,6 +662,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:


@@ -590,17 +679,21 @@ nprint:   isprintable=0;
                if (isprintable)
                {
                        FT_UInt index = 0;
                if (isprintable)
                {
                        FT_UInt index = 0;

-                       
-                       if (forced_replaces.find(*i) == forced_replaces.end())
-                               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


@@ -623,6 +716,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)


@@ -632,6 +737,7 @@ 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);
 
        ePtr<gPixmap> target;
        dc.getPixmap(target);


@@ -660,18 +766,23 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        } else if (surface->bpp == 32)
        {
                opcode=3;
        } else if (surface->bpp == 32)
        {
                opcode=3;

-               if (surface->clut.data)
-               {
-                       lookup8=getColor(surface->clut, background, foreground).lookup;
-                       for (int i=0; i<16; ++i)
-                               lookup32_normal[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)

                {
                {

-                       for (int i=0; i<16; ++i)
-                               lookup32_normal[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];
                }
                for (int i=0; i<16; ++i)
                        lookup32_invert[i]=lookup32_normal[i^0xF];


@@ -690,6 +801,9 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        {
                for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
                {
        {
                for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
                {

+                       if (i->flags & GS_SOFTHYPHEN)
+                               continue;
+

                        if (!(i->flags & GS_INVERT))
                        {
                                lookup8 = lookup8_normal;
                        if (!(i->flags & GS_INVERT))
                        {
                                lookup8 = lookup8_normal;


@@ -807,9 +921,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: