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);
// FT_Done_FreeType(library);
}
-int fontRenderClass::getFont(ePtr<Font> &font, 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)
DEFINE_REF(Font);
-Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): ref(0), tabwidth(tw)
+Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
{
renderer=render;
font.font.face_id=faceid;
height=isize;
if (tabwidth==-1)
tabwidth=8*isize;
- ref=0;
// font.image_type |= ftc_image_flag_autohinted;
}
{
}
+DEFINE_REF(eTextPara);
+
int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt glyphIndex, int flags, int rflags)
{
FTC_SBit glyph;
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;
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)
eTextPara::~eTextPara()
{
clear();
- if (refcnt>=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<Font> fnt, replacement;
fontRenderClass::getInstance()->getFont(fnt, font->family.c_str(), font->pointSize);
if (!fnt)
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;
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;
std::vector<unsigned long> 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
{
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;
{
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);
}
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;
{
register __u8 *td=d;
register int ax;
+
for (ax=0; ax<sx; ax++)
{
register int b=(*s++)>>4;