#include <lib/base/init.h>
#include <lib/base/init_num.h>
-//#define HAVE_FRIBIDI
+#define HAVE_FRIBIDI
// until we have it in the cdk
#ifdef HAVE_FRIBIDI
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);
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;
- for ( glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+ glyphString::iterator i(glyphs.begin());
+
+ boundBox = i->bbox;
+ ++i;
+
+ for (; 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)
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;
}
std::string eTextPara::replacement_facename;
+std::set<int> eTextPara::forced_replaces;
void eTextPara::setFont(Font *fnt, Font *replacement)
{
void
shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &text);
-int eTextPara::renderString(const std::string &string, int rflags)
+int eTextPara::renderString(const char *string, int rflags)
{
singleLock s(ftlock);
}
std::vector<unsigned long> uc_string, uc_visual;
- uc_string.reserve(string.length());
+ if (string)
+ uc_string.reserve(strlen(string));
- std::string::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
{
{
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;
}
}
}
if (isprintable)
{
- FT_UInt index;
-
- index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
+ FT_UInt index = 0;
+
+ if (forced_replaces.find(*i) == forced_replaces.end())
+ index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
if (!index)
{
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 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; ay<sy; ay++)
+ if (!(i->flags & GS_INVERT))
{
- if (!opcode) // 4bit lookup to 8bit
- {
- register __u8 *td=d;
- register int ax;
-
- for (ax=0; ax<sx; ax++)
- {
- register int b=(*s++)>>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<sx; ax++)
- {
- register int b=*s++;
- *td++^=b;
- }
- } else
+ 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;
+ 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<sy; ay++)
{
- register __u32 *td=(__u32*)d;
- register int ax;
- for (ax=0; ax<sx; ax++)
- {
- register int b=(*s++)>>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<sx; ax++)
+ {
+ register int b=(*s++)>>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<sx; ax++)
+ {
+ register int b=*s++;
+ *td++^=b;
+ }
+ } else
+ {
+ register __u32 *td=(__u32*)d;
+ register int ax;
+ for (ax=0; ax<sx; ax++)
+ {
+ register int b=(*s++)>>4;
+ if(b)
+ *td++=lookup32[b];
+ else
+ td++;
+ }
}
+ s+=glyph_bitmap->pitch-sx;
+ d+=buffer_stride;
}
- s+=glyph_bitmap->pitch-sx;
- d+=buffer_stride;
- }
+ }
}
}
git.cweiske.de / enigma2.git / blobdiff