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);
-/* 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 0;
}
-FTC_FaceID fontRenderClass::getFaceID(const eString &face)
+FTC_FaceID fontRenderClass::getFaceID(const std::string &face)
{
for (fontListEntry *f=font; f; f=f->next)
{
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);
{
if (!instance)
return 0;
- Font *fnt = getFont( font.family.c_str(), font.pointSize);
+ ePtr<Font> fnt;
+ getFont(fnt, font.family.c_str(), font.pointSize);
if (!fnt)
return 0;
singleLock s(ftlock);
FT_Face current_face;
if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, ¤t_face, &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);
+ while(font)
+ {
+ fontListEntry *f=font;
+ font=font->next;
+ delete f;
+ }
// auskommentiert weil freetype und enigma die kritische masse des suckens ueberschreiten.
// FTC_Manager_Done(cacheManager);
// FT_Done_FreeType(library);
}
-Font *fontRenderClass::getFont(const eString &face, int size, int tabwidth)
+int fontRenderClass::getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth)
{
FTC_FaceID id=getFaceID(face);
if (!id)
- return 0;
- return new Font(this, id, size * ((fontListEntry*)id)->scale / 100, tabwidth);
+ {
+ font = 0;
+ return -1;
+ }
+ font = new Font(this, id, size * ((fontListEntry*)id)->scale / 100, tabwidth);
+ return 0;
}
+DEFINE_REF(Font);
+
Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
{
renderer=render;
height=isize;
if (tabwidth==-1)
tabwidth=8*isize;
- ref=0;
// font.image_type |= ftc_image_flag_autohinted;
}
{
}
-void Font::lock()
-{
- ref++;
-}
-
-void Font::unlock()
-{
- ref--;
- if (!ref)
- delete this;
-}
+DEFINE_REF(eTextPara);
int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags)
{
)
{
int cnt = 0;
- glyphString::iterator i(glyphs.end());
- --i;
- while (i != glyphs.begin())
+ glyphString::reverse_iterator i(glyphs.rbegin());
+ while (i != glyphs.rend())
{
if (i->flags&(GS_ISSPACE|GS_ISFIRST))
break;
cnt++;
- --i;
+ ++i;
}
- if (i != glyphs.begin() && ((i->flags&(GS_ISSPACE|GS_ISFIRST))==GS_ISSPACE) && (++i != glyphs.end())) // skip space
+ if (i != glyphs.rend()
+ && ((i->flags&(GS_ISSPACE|GS_ISFIRST))==GS_ISSPACE)
+ && cnt )
{
+ --i;
int linelength=cursor.x()-i->x;
i->flags|=GS_ISFIRST;
ePoint offset=ePoint(i->x, i->y);
newLine(rflags);
offset-=cursor;
- while (i != glyphs.end()) // rearrange them into the next line
+ do
{
i->x-=offset.x();
i->y-=offset.y();
i->bbox.moveBy(-offset.x(), -offset.y());
- ++i;
}
- cursor+=ePoint(linelength, 0); // put the cursor after that line
- } else
+ while (i-- != glyphs.rbegin()); // rearrange them into the next line
+ cursor+=ePoint(linelength, 0); // put the cursor after that line
+ }
+ else
{
- if (cnt)
+ if (cnt)
{
newLine(rflags);
flags|=GS_ISFIRST;
}
pGlyph ng;
-
- ng.bbox.setLeft( (flags&GS_ISFIRST|glyphs.empty()?cursor.x():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;
-
- ng.x=cursor.x()+kern;
+ xadvance += kern;
+ ng.bbox.setWidth(xadvance);
- ng.y=cursor.y();
- ng.w=xadvance;
- ng.font=current_font;
- ng.font->lock();
- 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;
if ( i->bbox.left() < boundBox.left() )
boundBox.setLeft( i->bbox.left() );
if ( i->bbox.top() < boundBox.top() )
boundBox.setBottom( i->bbox.bottom() );
}
// eDebug("boundBox left = %i, top = %i, right = %i, bottom = %i", boundBox.left(), boundBox.top(), boundBox.right(), boundBox.bottom() );
- bboxValid=1;
}
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;
eTextPara::~eTextPara()
{
clear();
- if (refcnt>=0)
- eFatal("verdammt man der war noch gelockt :/\n");
}
-void eTextPara::destroy()
+void eTextPara::setFont(const gFont *font)
{
- 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");
- Font *fnt=fontRenderClass::getInstance()->getFont(font.family.c_str(), font.pointSize);
+ ePtr<Font> fnt, replacement;
+ fontRenderClass::getInstance()->getFont(fnt, font->family.c_str(), font->pointSize);
if (!fnt)
- eWarning("FONT '%s' MISSING!", font.family.c_str());
- setFont(fnt,
- fontRenderClass::getInstance()->getFont(replacement_facename.c_str(), font.pointSize));
+ eWarning("FONT '%s' MISSING!", font->family.c_str());
+ fontRenderClass::getInstance()->getFont(replacement, replacement_facename.c_str(), font->pointSize);
+ 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;
- if (current_font && !current_font->ref)
- delete current_font;
current_font=fnt;
replacement_font=replacement;
singleLock s(ftlock);
void
shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &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;
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
{
glyphs.reserve(uc_visual.size());
+ int nextflags = 0;
+
for (std::vector<unsigned long>::const_iterator i(uc_visual.begin());
i != uc_visual.end(); ++i)
{
int isprintable=1;
- int flags=0;
+ int flags = nextflags;
+ nextflags = 0;
if (!(rflags&RS_DIRECT))
{
switch (*i)
case '\n':
newline:isprintable=0;
newLine(rflags);
- flags|=GS_ISFIRST;
+ nextflags|=GS_ISFIRST;
break;
case '\r':
case 0x86: case 0xE086:
return 0;
}
-void eTextPara::blit(gPixmapDC &dc, const ePoint &offset, const gRGB &background, const gRGB &foreground)
+void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, const gRGB &foreground)
{
singleLock s(ftlock);
ePtr<gPixmap> target;
dc.getPixmap(target);
+ gSurface *surface = target->surface;
register int opcode;
- gColor *lookup8=0;
- __u32 lookup32[16];
-
- if (target->bpp == 8)
+
+ gColor *lookup8, lookup8_invert[16];
+ gColor *lookup8_normal=0;
+
+ __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;
+
+ if (surface->bpp == 8)
{
- if (target->clut.data)
+ if (surface->clut.data)
{
- lookup8=getColor(target->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 (target->bpp == 32)
+ } else if (surface->bpp == 32)
{
opcode=3;
- if (target->clut.data)
+ if (surface->clut.data)
{
- lookup8=getColor(target->clut, background, foreground).lookup;
+ lookup8=getColor(surface->clut, background, foreground).lookup;
for (int i=0; i<16; ++i)
- lookup32[i]=((target->clut.data[lookup8[i]].a<<24)|
- (target->clut.data[lookup8[i]].r<<16)|
- (target->clut.data[lookup8[i]].g<<8)|
- (target->clut.data[lookup8[i]].b))^0xFF000000;
+ 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", target->bpp);
+ eWarning("can't render to %dbpp", surface->bpp);
return;
}
- eRect clip(0, 0, target->x, target->y);
- clip&=dc.getClip();
-
- int buffer_stride=target->stride;
+ gRegion area(eRect(0, 0, surface->x, surface->y));
+ 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*)(target->data)+buffer_stride*ry+rx*target->bypp;
+
+ __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.bottom())
- sy=clip.bottom()-ry;
- if ((sx+rx) >= clip.right())
- sx=clip.right()-rx;
- if (rx < clip.left())
+ 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.left()-rx;
+ int diff=clip.extends.left()-rx;
s+=diff;
sx-=diff;
rx+=diff;
- d+=diff*target->bypp;
+ d+=diff*surface->bypp;
}
- if (ry < clip.top())
+ if (ry < clip.extends.top())
{
- int diff=clip.top()-ry;
+ int diff=clip.extends.top()-ry;
s+=diff*glyph_bitmap->pitch;
sy-=diff;
ry+=diff;
{
register __u8 *td=d;
register int ax;
+
for (ax=0; ax<sx; ax++)
{
register int b=(*s++)>>4;
linelength+=c->w;
num++;
}
+
if (!num) // line mit nur einem space
continue;
{
singleLock s(ftlock);
- for (glyphString::iterator i(glyphs.begin()); i!=glyphs.end(); ++i)
- i->font->unlock();
+ current_font = 0;
+ replacement_font = 0;
glyphs.clear();
}
git.cweiske.de / enigma2.git / blobdiff