X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3bad22d5566624804a73b3791980bab2d84c8266..540206b4c6f2da5a4e1cd12b61587e3e626b27dd:/lib/gdi/font.cpp diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index 2f2823bb..ce1b3c4b 100644 --- a/lib/gdi/font.cpp +++ b/lib/gdi/font.cpp @@ -18,7 +18,7 @@ #include #include -//#define HAVE_FRIBIDI +#define 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(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) @@ -237,6 +235,13 @@ int fontRenderClass::getFont(ePtr &font, const eString &face, int size, in 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) @@ -272,7 +277,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly int nx=cursor.x(); nx+=glyph->xadvance; - + if ( (rflags&RS_WRAP) && (nx >= area.right()) @@ -280,33 +285,43 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly { int cnt = 0; glyphString::reverse_iterator i(glyphs.rbegin()); + /* find first possibility (from end to begin) to break */ 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; - } - 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; - i->flags|=GS_ISFIRST; + i->flags|=GS_ISFIRST; /* make this a line start */ 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()); - } - 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 - } - else + } else { if (cnt) { @@ -317,7 +332,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly } int xadvance=glyph->xadvance, kern=0; - + if (previous && use_kerning) { FT_Vector delta; @@ -331,32 +346,43 @@ 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; + /* 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() { - 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 != 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() ); @@ -368,8 +394,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 +403,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 +424,11 @@ void eTextPara::setFont(const gFont *font) setFont(fnt, replacement); } -eString eTextPara::replacement_facename; +std::string eTextPara::replacement_facename; +std::set eTextPara::forced_replaces; void eTextPara::setFont(Font *fnt, Font *replacement) { - if (refcnt) - eFatal("mod. after lock"); if (!fnt) return; current_font=fnt; @@ -459,13 +462,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 char *string, int rflags) { singleLock s(ftlock); - if (refcnt) - eFatal("mod. after lock"); - if (!current_font) return -1; @@ -486,13 +486,14 @@ int eTextPara::renderString(const eString &string, int rflags) } std::vector uc_string, uc_visual; - uc_string.reserve(string.length()); + if (string) + uc_string.reserve(strlen(string)); - eString::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 { @@ -500,28 +501,28 @@ int eTextPara::renderString(const eString &string, int rflags) { unicode&=0x1F; unicode<<=6; - if (p != string.end()) + if (*p) 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; - if (p != string.end()) + if (*p) 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; - if (p != string.end()) + if (*p) unicode|=(*p++)&0x3F; unicode<<=6; - if (p != string.end()) + if (*p) unicode|=(*p++)&0x3F; } } @@ -559,9 +560,11 @@ int eTextPara::renderString(const eString &string, int rflags) int isprintable=1; int flags = nextflags; nextflags = 0; + unsigned long chr = *i; + if (!(rflags&RS_DIRECT)) { - switch (*i) + switch (chr) { case '\\': { @@ -599,6 +602,14 @@ newline:isprintable=0; 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: @@ -607,17 +618,22 @@ nprint: isprintable=0; } if (isprintable) { - FT_UInt index; + FT_UInt index = 0; + + /* FIXME: our font doesn't seem to have a hyphen, so use hyphen-minus for it. */ + if (chr == 0x2010) + chr = '-'; - index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i); + 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) - 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) - 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 @@ -655,14 +671,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 +697,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,82 +715,99 @@ 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) + + 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()) + for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i) { - 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; ayflags & GS_SOFTHYPHEN) + continue; + + if (!(i->flags & GS_INVERT)) { - if (!opcode) // 4bit lookup to 8bit - { - register __u8 *td=d; - register int ax; - for (ax=0; ax>4; - if(b) - *td++=lookup8[b]; - else - td++; - } - } else if (opcode == 1) // 8bit direct - { - register __u8 *td=d; - register int ax; - for (ax=0; axgetGlyphBitmap(&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.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) + for (int ay=0; ay>4; - if(b) - *td++=lookup32[b]; - else - td++; + if (!opcode) // 4bit lookup to 8bit + { + register __u8 *td=d; + register int ax; + + for (ax=0; ax>4; + if(b) + *td++=lookup8[b]; + else + td++; + } + } else if (opcode == 1) // 8bit direct + { + register __u8 *td=d; + register int ax; + for (ax=0; ax>4; + if(b) + *td++=lookup32[b]; + else + td++; + } } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; } - s+=glyph_bitmap->pitch-sx; - d+=buffer_stride; - } + } } } @@ -800,9 +843,6 @@ void eTextPara::realign(int dir) // der code hier ist ein wenig merkwuerdig. num++; } - if (!num) // line mit nur einem space - continue; - switch (dir) { case dirRight: