#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);
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)
int nx=cursor.x();
nx+=glyph->xadvance;
-
+
if (
(rflags&RS_WRAP) &&
(nx >= area.right())
{
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)
{
}
int xadvance=glyph->xadvance, kern=0;
-
+
if (previous && use_kerning)
{
FT_Vector delta;
ng.flags = flags;
glyphs.push_back(ng);
- cursor += ePoint(xadvance, 0);
+ /* 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;
}
boundBox = i->bbox;
++i;
- for (i ; 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() );
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=(unsigned char)*p++;
{
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;
}
}
int isprintable=1;
int flags = nextflags;
nextflags = 0;
+ unsigned long chr = *i;
+
if (!(rflags&RS_DIRECT))
{
- switch (*i)
+ switch (chr)
{
case '\\':
{
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:
}
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
} else if (surface->bpp == 32)
{
opcode=3;
- if (surface->clut.data)
- {
- lookup8=getColor(surface->clut, background, foreground).lookup;
- for (int i=0; i<16; ++i)
- 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)
{
- for (int i=0; i<16; ++i)
- lookup32_normal[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];
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)
{
- if (!(i->flags & GS_INVERT))
- {
- lookup8 = lookup8_normal;
- lookup32 = lookup32_normal;
- } else
+ for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
{
- lookup8 = lookup8_invert;
- lookup32 = lookup32_invert;
- }
+ if (i->flags & GS_SOFTHYPHEN)
+ continue;
+
+ 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();
+ 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())
- {
- 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++)
+ __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())
{
- 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
+ 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;
- }
+ }
}
}
num++;
}
- if (!num) // line mit nur einem space
- continue;
-
switch (dir)
{
case dirRight:
git.cweiske.de / enigma2.git / blobdiff