git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix install path
[enigma2.git]
/
lib
/
gdi
/
font.cpp
diff --git
a/lib/gdi/font.cpp
b/lib/gdi/font.cpp
index f7c62209c3d186d5063482bb1cbffda5696b99e2..4c08b4fcf4e9742f13835888da2150482435d2cd 100644
(file)
--- a/
lib/gdi/font.cpp
+++ b/
lib/gdi/font.cpp
@@
-18,7
+18,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
@@
-60,12
+60,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;
}
@@
-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);
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);
@@
-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 );
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);
- cursor
+=
ePoint(xadvance, 0);
- previous
=
glyphIndex;
+ 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 )
continue;
{
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() );
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
+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.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;
if (maximum.height()<cursor.y())
maximum.setHeight(cursor.y());
previous=0;
@@
-401,6
+406,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)
{
@@
-467,7
+473,7
@@
int eTextPara::renderString(const std::string &string, int rflags)
while(p != string.end())
{
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
{
if (unicode & 0x80) // we have (hopefully) UTF8 here, and we assume that the encoding is VALID
{
@@
-582,9
+588,10
@@
nprint: isprintable=0;
}
if (isprintable)
{
}
if (isprintable)
{
- FT_UInt index;
-
- index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
+ FT_UInt index = 0;
+
+ if (forced_replaces.find(*i) == forced_replaces.end())
+ index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
if (!index)
{
if (!index)
{
@@
-630,14
+637,22
@@
void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
gSurface *surface = target->surface;
register int opcode;
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)
{
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;
@@
-648,15
+663,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)
{
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)
(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);
} else
{
eWarning("can't render to %dbpp", surface->bpp);
@@
-667,9
+684,19
@@
void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
gRegion clip = dc.getClip() & area;
int buffer_stride=surface->stride;
gRegion clip = dc.getClip() & area;
int buffer_stride=surface->stride;
-
+
for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
{
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;
static FTC_SBit glyph_bitmap;
if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
continue;