X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3bad22d5566624804a73b3791980bab2d84c8266..e028581fabb68f8f28489bce7b570026c02e8df8:/lib/gdi/font.cpp?ds=sidebyside diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index 2f2823bb..9e175476 100644 --- a/lib/gdi/font.cpp +++ b/lib/gdi/font.cpp @@ -6,10 +6,19 @@ #include #include #include +#include + +#ifndef BYTE_ORDER +#error "no BYTE_ORDER defined!" +#endif // use this for init Freetype... #include #include FT_FREETYPE_H +#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) #include #include @@ -18,21 +27,13 @@ #include #include -//#define HAVE_FRIBIDI -// until we have it in the cdk - -#ifdef HAVE_FRIBIDI #include -#endif #include fontRenderClass *fontRenderClass::instance; static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; -static pthread_mutex_t refcntlck=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; - -static FTC_Font cache_current_font=0; struct fntColorCacheKey { @@ -60,12 +61,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 +102,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 +118,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); @@ -198,19 +199,17 @@ float fontRenderClass::getLineHeight(const gFont& font) return 0; singleLock s(ftlock); FT_Face current_face; - if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, ¤t_face, &fnt->size)<0) + if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, ¤t_face) < 0) || + (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0)) { - delete fnt; eDebug("FTC_Manager_Lookup_Size failed!"); 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 +224,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,15 +236,26 @@ 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) { renderer=render; - font.font.face_id=faceid; - font.font.pix_width = isize; - font.font.pix_height = isize; - font.image_type = ftc_image_grays; + 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; height=isize; if (tabwidth==-1) tabwidth=8*isize; @@ -272,7 +282,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 +290,45 @@ 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 + --lineChars.back(); + ++charCount; + } 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 +339,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; @@ -326,37 +348,49 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly } pGlyph ng; - ng.bbox.setLeft( (flags&GS_ISFIRST|cursor.x()-1)+glyph->left ); + ng.bbox.setLeft( ((flags&GS_ISFIRST)|(cursor.x()-1))+glyph->left ); ng.bbox.setTop( cursor.y() - glyph->top ); 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); + ++charCount; - 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 +402,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 +411,13 @@ 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); + + lineOffsets.push_back(cursor.y()); + lineChars.push_back(charCount); + charCount=0; + + 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 +438,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; @@ -435,9 +452,12 @@ void eTextPara::setFont(Font *fnt, Font *replacement) // we ask for replacment_font first becauseof the cache if (replacement_font) { - if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, - &replacement_font->font.font, &replacement_face, - &replacement_font->size)<0) + 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)) { eDebug("FTC_Manager_Lookup_Size failed!"); return; @@ -445,13 +465,17 @@ void eTextPara::setFont(Font *fnt, Font *replacement) } if (current_font) { - if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, ¤t_font->font.font, ¤t_face, ¤t_font->size)<0) + if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager, + current_font->scaler.face_id, + ¤t_face) < 0) || + (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager, + ¤t_font->scaler, + ¤t_font->size) < 0)) { eDebug("FTC_Manager_Lookup_Size failed!"); return; } } - cache_current_font=¤t_font->font.font; previous=0; use_kerning=FT_HAS_KERNING(current_face); } @@ -459,40 +483,44 @@ 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; - + + if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager, + current_font->scaler.face_id, + ¤t_face) < 0) || + (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager, + ¤t_font->scaler, + ¤t_font->size) < 0)) + { + eDebug("FTC_Manager_Lookup_Size failed!"); + return -1; + } + + 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(); } - - if (¤t_font->font.font != cache_current_font) - { - if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, ¤t_font->font.font, ¤t_face, ¤t_font->size)<0) - { - eDebug("FTC_Manager_Lookup_Size failed!"); - return -1; - } - cache_current_font=¤t_font->font.font; - } - + 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 +528,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; } } @@ -534,22 +562,16 @@ int eTextPara::renderString(const eString &string, int rflags) shape(uc_shape, uc_string); // now do the usual logical->visual reordering -#ifdef HAVE_FRIBIDI + int size=uc_shape.size(); FriBidiCharType dir=FRIBIDI_TYPE_ON; - { - int size=uc_shape.size(); - uc_visual.resize(size); - // gaaanz lahm, aber anders geht das leider nicht, sorry. - FriBidiChar array[size], target[size]; - std::copy(uc_shape.begin(), uc_shape.end(), array); - fribidi_log2vis(array, size, &dir, target, 0, 0, 0); - uc_visual.assign(target, target+size); - } -#else - uc_visual=uc_shape; -#endif - - glyphs.reserve(uc_visual.size()); + uc_visual.resize(size); + // gaaanz lahm, aber anders geht das leider nicht, sorry. + FriBidiChar array[size], target[size]; + std::copy(uc_shape.begin(), uc_shape.end(), array); + fribidi_log2vis(array, size, &dir, target, 0, 0, 0); + uc_visual.assign(target, target+size); + + glyphs.reserve(size); int nextflags = 0; @@ -559,9 +581,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 +623,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 +639,22 @@ nprint: isprintable=0; } if (isprintable) { - FT_UInt index; + FT_UInt index = 0; - 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) - 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 @@ -626,10 +663,19 @@ nprint: isprintable=0; } bboxValid=false; calc_bbox(); -#ifdef HAVE_FRIBIDI if (dir & FRIBIDI_MASK_RTL) + { realign(dirRight); -#endif + doTopBottomReordering=true; + } + + if (charCount) + { + lineOffsets.push_back(cursor.y()); + lineChars.push_back(charCount); + charCount=0; + } + return 0; } @@ -640,14 +686,15 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons if (!current_font) return; - if (¤t_font->font.font != cache_current_font) + if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager, + current_font->scaler.face_id, + ¤t_face) < 0) || + (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager, + ¤t_font->scaler, + ¤t_font->size) < 0)) { - if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, ¤t_font->font.font, ¤t_face, ¤t_font->size)<0) - { - eDebug("FTC_Manager_Lookup_Size failed!"); - return; - } - cache_current_font=¤t_font->font.font; + eDebug("FTC_Manager_Lookup_Size failed!"); + return; } ePtr target; @@ -655,116 +702,214 @@ 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; + + __u16 lookup16_normal[16], lookup16_invert[16], *lookup16; + __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; + } else if (surface->bpp == 16) + { + opcode=2; + for (int i=0; i<16; ++i) + { +#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) + { + 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 +#if BYTE_ORDER == LITTLE_ENDIAN + lookup16_normal[i] = bswap_16(((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3)); +#else + lookup16_normal[i] = ((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3); +#endif + da ^= 0xFF; + } + for (int i=0; i<16; ++i) + lookup16_invert[i]=lookup16_normal[i^0xF]; } else if (surface->bpp == 32) { opcode=3; - if (surface->clut.data) + 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)| - (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; +#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]; } else { eWarning("can't render to %dbpp", surface->bpp); return; } - + 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()) + std::list::reverse_iterator line_offs_it(lineOffsets.rbegin()); + std::list::iterator line_chars_it(lineChars.begin()); + int line_offs=0; + int line_chars=0; + for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i, --line_chars) { - 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; ay>4; - if(b) - *td++=lookup8[b]; - else - td++; + line_offs = *(line_offs_it++); + line_chars = *(line_chars_it++); + } + + if (i->flags & GS_SOFTHYPHEN) + continue; + + if (!(i->flags & GS_INVERT)) + { + lookup8 = lookup8_normal; + lookup16 = lookup16_normal; + lookup32 = lookup32_normal; + } else + { + lookup8 = lookup8_invert; + lookup16 = lookup16_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=(doTopBottomReordering ? line_offs : 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) + { + switch(opcode) { + case 0: // 4bit lookup to 8bit + for (int ay=0; ay>4; + if(b) + *td++=lookup8[b]; + else + td++; + } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; } - } else if (opcode == 1) // 8bit direct - { - register __u8 *td=d; - register int ax; - for (ax=0; axpitch-sx; + d+=buffer_stride; } - } else - { - register __u32 *td=(__u32*)d; - register int ax; - for (ax=0; ax>4; - if(b) - *td++=lookup32[b]; - else - td++; + break; + case 2: // 16bit + for (int ay=0; ay>4; + if(b) + *td++=lookup16[b]; + else + td++; + } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; + } + break; + case 3: // 32bit + for (int ay=0; ay>4; + if(b) + *td++=lookup32[b]; + else + td++; + } + s+=glyph_bitmap->pitch-sx; + d+=buffer_stride; } + default: + break; } - s+=glyph_bitmap->pitch-sx; - d+=buffer_stride; } + } } } @@ -800,9 +945,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: