just show hdd info when there is one

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

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 187512d505ea45ddf0f746640147a4d33740dc49..1f09d1bc25cddd51505fb15c1a75fcc7ac74a1d2 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -205,12 +205,10 @@ float fontRenderClass::getLineHeight(const gFont& font)
                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;
 }
 
-
 fontRenderClass::~fontRenderClass()
 {
        singleLock s(ftlock);
@@ -331,30 +329,39 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        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);
 
-       cursor+=ePoint(xadvance, 0);
-       previous=glyphIndex;
+       cursor += ePoint(xadvance, 0);
+       previous = glyphIndex;
        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 ; i != glyphs.end(); ++i)
        {
                if ( i->flags & GS_ISSPACE )
                        continue;
@@ -368,8 +375,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() );
-       if ( glyphs.size() )
-               bboxValid=1;
 }
 
 void eTextPara::newLine(int flags)
@@ -379,7 +384,7 @@ 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+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap*1/2)>>6);
+       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;
@@ -467,7 +472,7 @@ int eTextPara::renderString(const std::string &string, int rflags)
 
        while(p != string.end())
        {
-               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
                {
@@ -630,14 +635,22 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        gSurface *surface = target->surface;
 
        register int opcode;
-       gColor *lookup8=0;
-       __u32 lookup32[16];
-               
+
+       gColor *lookup8, lookup8_invert[16];
+       gColor *lookup8_normal=0;
+
+       __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;
+       
        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;
@@ -648,15 +661,17 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                {
                        lookup8=getColor(surface->clut, background, foreground).lookup;
                        for (int i=0; i<16; ++i)
-                               lookup32[i]=((surface->clut.data[lookup8[i]].a<<24)|
+                               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)
-                               lookup32[i]=(0x010101*i)|0xFF000000;
+                               lookup32_normal[i]=(0x010101*i)|0xFF000000;
                }
+               for (int i=0; i<16; ++i)
+                       lookup32_invert[i]=lookup32_normal[i^0xF];
        } else
        {
                eWarning("can't render to %dbpp", surface->bpp);
@@ -667,9 +682,19 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;
-
+       
        for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
        {
+               if (!(i->flags & GS_INVERT))
+               {
+                       lookup8 = lookup8_normal;
+                       lookup32 = lookup32_normal;
+               } else
+               {
+                       lookup8 = lookup8_invert;
+                       lookup32 = lookup32_invert;
+               }
+               
                static FTC_SBit glyph_bitmap;
                if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
                        continue;