X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3bad22d5566624804a73b3791980bab2d84c8266..e09118574a32038b352e01a2ed085175406778d7:/lib/gdi/font.cpp diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index 2f2823bb..1f09d1bc 100644 --- a/lib/gdi/font.cpp +++ b/lib/gdi/font.cpp @@ -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(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); -/* 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; } @@ -101,7 +101,7 @@ FT_Error fontRenderClass::FTC_Face_Requester(FTC_FaceID face_id, FT_Face* aface) return 0; } -FTC_FaceID fontRenderClass::getFaceID(const eString &face) +FTC_FaceID fontRenderClass::getFaceID(const std::string &face) { for (fontListEntry *f=font; f; f=f->next) { @@ -117,7 +117,7 @@ FT_Error fontRenderClass::getGlyphBitmap(FTC_Image_Desc *font, FT_ULong glyph_in return res; } -eString fontRenderClass::AddFont(const eString &filename, const eString &name, int scale) +std::string fontRenderClass::AddFont(const std::string &filename, const std::string &name, int scale) { eDebugNoNewLine("[FONT] adding font %s...", filename.c_str()); fflush(stdout); @@ -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); @@ -225,7 +223,7 @@ fontRenderClass::~fontRenderClass() // FT_Done_FreeType(library); } -int fontRenderClass::getFont(ePtr &font, const eString &face, int size, int tabwidth) +int fontRenderClass::getFont(ePtr &font, const std::string &face, int size, int tabwidth) { FTC_FaceID id=getFaceID(face); if (!id) @@ -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; + + glyphString::iterator i(glyphs.begin()); + + boundBox = i->bbox; + ++i; - for ( glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++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()=0) - eFatal("verdammt man der war noch gelockt :/\n"); -} - -void eTextPara::destroy() -{ - singleLock s(refcntlck); - - if (!refcnt--) - delete this; -} - -eTextPara *eTextPara::grab() -{ - singleLock s(refcntlck); - - refcnt++; - return this; } void eTextPara::setFont(const gFont *font) { - if (refcnt) - eFatal("mod. after lock"); ePtr fnt, replacement; fontRenderClass::getInstance()->getFont(fnt, font->family.c_str(), font->pointSize); if (!fnt) @@ -420,12 +405,10 @@ void eTextPara::setFont(const gFont *font) setFont(fnt, replacement); } -eString eTextPara::replacement_facename; +std::string eTextPara::replacement_facename; void eTextPara::setFont(Font *fnt, Font *replacement) { - if (refcnt) - eFatal("mod. after lock"); if (!fnt) return; current_font=fnt; @@ -459,13 +442,10 @@ void eTextPara::setFont(Font *fnt, Font *replacement) void shape (std::vector &string, const std::vector &text); -int eTextPara::renderString(const eString &string, int rflags) +int eTextPara::renderString(const std::string &string, int rflags) { singleLock s(ftlock); - if (refcnt) - eFatal("mod. after lock"); - if (!current_font) return -1; @@ -488,11 +468,11 @@ int eTextPara::renderString(const eString &string, int rflags) std::vector uc_string, uc_visual; uc_string.reserve(string.length()); - eString::const_iterator p(string.begin()); + std::string::const_iterator p(string.begin()); 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 { @@ -655,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; @@ -673,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); @@ -689,18 +679,28 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons } gRegion area(eRect(0, 0, surface->x, surface->y)); - gRegion clip; - clip.intersect(area, dc.getClip()); + 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; 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; @@ -732,6 +732,7 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons { register __u8 *td=d; register int ax; + for (ax=0; ax>4;