// use this for init Freetype...
#include <ft2build.h>
#include FT_FREETYPE_H
+#ifdef HAVE_FREETYPE2
+#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)
+#endif
#include <lib/base/eerror.h>
#include <lib/gdi/lcd.h>
fontRenderClass *fontRenderClass::instance;
static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
-static pthread_mutex_t refcntlck=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
+#ifndef HAVE_FREETYPE2
static FTC_Font cache_current_font=0;
+#endif
struct fntColorCacheKey
{
return 0;
singleLock s(ftlock);
FT_Face current_face;
+#ifdef HAVE_FREETYPE2
+ if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, ¤t_face) < 0) ||
+ (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))
+#else
if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, ¤t_face, &fnt->size)<0)
+#endif
{
- delete fnt;
eDebug("FTC_Manager_Lookup_Size failed!");
return 0;
}
Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
{
renderer=render;
+#ifdef HAVE_FREETYPE2
+ 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;
+#else
font.font.face_id=faceid;
font.font.pix_width = isize;
font.font.pix_height = isize;
font.image_type = ftc_image_grays;
+#endif
height=isize;
if (tabwidth==-1)
tabwidth=8*isize;
i->x-=offset.x();
i->y-=offset.y();
i->bbox.moveBy(-offset.x(), -offset.y());
+ --lineChars.back();
+ ++charCount;
} while (i-- != glyphs.rbegin()); // rearrange them into the next line
cursor+=ePoint(linelength, 0); // put the cursor after that line
} else
ng.glyph_index = glyphIndex;
ng.flags = flags;
glyphs.push_back(ng);
+ ++charCount;
/* 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.setX(left);
previous=0;
int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
+
+ 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()<cursor.y())
maximum.setHeight(cursor.y());
previous=0;
// we ask for replacment_font first becauseof the cache
if (replacement_font)
{
+#ifdef HAVE_FREETYPE2
+ 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))
+#else
if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager,
&replacement_font->font.font, &replacement_face,
&replacement_font->size)<0)
+#endif
{
eDebug("FTC_Manager_Lookup_Size failed!");
return;
}
if (current_font)
{
+#ifdef HAVE_FREETYPE2
+ 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))
+#else
if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, ¤t_font->font.font, ¤t_face, ¤t_font->size)<0)
+#endif
{
eDebug("FTC_Manager_Lookup_Size failed!");
return;
}
}
+#ifndef HAVE_FREETYPE2
cache_current_font=¤t_font->font.font;
+#endif
previous=0;
use_kerning=FT_HAS_KERNING(current_face);
}
if (!current_font)
return -1;
-
- if (cursor.y()==-1)
+
+#ifdef HAVE_FREETYPE2
+ 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))
{
- cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
- left=cursor.x();
+ eDebug("FTC_Manager_Lookup_Size failed!");
+ return -1;
}
-
+#else
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)
}
cache_current_font=¤t_font->font.font;
}
-
+#endif
+
+ 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();
+ }
+
std::vector<unsigned long> uc_string, uc_visual;
if (string)
uc_string.reserve(strlen(string));
shape(uc_shape, uc_string);
// now do the usual logical->visual reordering
-#ifdef HAVE_FRIBIDI
+ int size=uc_shape.size();
+#ifdef HAVE_FRIBIDI
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);
- }
+ 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());
+ glyphs.reserve(size);
int nextflags = 0;
calc_bbox();
#ifdef HAVE_FRIBIDI
if (dir & FRIBIDI_MASK_RTL)
+ {
realign(dirRight);
+ doTopBottomReordering=true;
+ }
#endif
+
+ if (charCount)
+ {
+ lineOffsets.push_back(cursor.y());
+ lineChars.push_back(charCount);
+ charCount=0;
+ }
+
return 0;
}
if (!current_font)
return;
+#ifdef HAVE_FREETYPE2
+ 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;
+ }
+#else
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)
}
cache_current_font=¤t_font->font.font;
}
+#endif
ePtr<gPixmap> target;
dc.getPixmap(target);
gRegion clip = dc.getClip() & area;
int buffer_stride=surface->stride;
-
+
for (unsigned int c = 0; c < clip.rects.size(); ++c)
{
- for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+ std::list<int>::reverse_iterator line_offs_it(lineOffsets.rbegin());
+ std::list<int>::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)
{
+ while(!line_chars)
+ {
+ line_offs = *(line_offs_it++);
+ line_chars = *(line_chars_it++);
+ }
+
if (i->flags & GS_SOFTHYPHEN)
continue;
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();
-
+ 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;