mirror of
https://github.com/gnustep/libs-back.git
synced 2025-02-23 11:51:27 +00:00
Optimize -advancementForGlyph:. Cleanups.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@18090 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg
parent
0ec00d1093
commit
31a3037fcb
2 changed files with 97 additions and 97 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2003-11-18 16:57 Alexander Malmberg <alexander@malmberg.org>
|
||||
|
||||
* Source/art/ftfont.m: Remove fallback ivar. Add advancementImgd
|
||||
and a simple glyph size cache for use in -advancementForGlyph:.
|
||||
|
||||
(-initWithFontName:matrix:screenFont:): Set up advancementImgd.
|
||||
(-advancementForGlyph:): Use advancementImgd instead of setting up
|
||||
a FTC_ImageTypeRec on each call. Cache glyph sizes to avoid expensive
|
||||
freetype calls.
|
||||
|
||||
2003-11-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Source/x11/XGServerEvent.m ([XGServer -processEvent:]): New
|
||||
|
|
|
|||
|
|
@ -81,17 +81,19 @@ static BOOL anti_alias_by_default;
|
|||
|
||||
@class FTFaceInfo;
|
||||
|
||||
#define CACHE_SIZE 257
|
||||
|
||||
@interface FTFontInfo : GSFontInfo <FTFontInfo>
|
||||
{
|
||||
@public
|
||||
#ifdef FT212_STUFF
|
||||
FTC_ImageDesc imgd;
|
||||
|
||||
FTC_ImageDesc fallback;
|
||||
FTC_ImageDesc advancementImgd;
|
||||
#else
|
||||
FTC_ImageTypeRec imgd;
|
||||
|
||||
FTC_ImageTypeRec fallback;
|
||||
FTC_ImageTypeRec advancementImgd;
|
||||
#endif
|
||||
|
||||
FTFaceInfo *face_info;
|
||||
|
|
@ -99,6 +101,15 @@ static BOOL anti_alias_by_default;
|
|||
BOOL screenFont;
|
||||
|
||||
|
||||
/*
|
||||
Profiling (2003-11-14) shows that calls to -advancementForGlyph: accounted
|
||||
for roughly 20% of layout time. This cache reduces it to (currently)
|
||||
insignificant levels.
|
||||
*/
|
||||
unsigned int cachedGlyph[CACHE_SIZE];
|
||||
NSSize cachedSize[CACHE_SIZE];
|
||||
|
||||
|
||||
/* Glyph generation */
|
||||
NSGlyph ligature_ff,ligature_fi,ligature_fl,ligature_ffl,ligature_ffi;
|
||||
}
|
||||
|
|
@ -727,11 +738,6 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
|
||||
imgd.font.face_id = (FTC_FaceID)rfi;
|
||||
|
||||
/* TODO: make this configurable */
|
||||
/* fallback = imgd;
|
||||
fallback.font.face_id = @"/usr/local/share/fonts/truetype/CODE2000.TTF";*/
|
||||
|
||||
|
||||
if ((error=FTC_Manager_Lookup_Size(ftc_manager, &imgd.font, &face, &size)))
|
||||
{
|
||||
NSLog(@"FTC_Manager_Lookup_Size() failed for '%@', error %08x!\n", name, error);
|
||||
|
|
@ -773,6 +779,68 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
fontName);*/
|
||||
}
|
||||
|
||||
{
|
||||
float xx, yy;
|
||||
#ifdef FT212_STUFF
|
||||
FTC_ImageDesc cur;
|
||||
#else
|
||||
FTC_ImageTypeRec cur;
|
||||
#endif
|
||||
|
||||
cur = imgd;
|
||||
|
||||
xx = matrix[0];
|
||||
yy = matrix[3];
|
||||
|
||||
if (xx == yy && xx < 16 && xx >= 8)
|
||||
{
|
||||
int rh = face_info->render_hints_hack;
|
||||
if (rh & 0x10000)
|
||||
{
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL;
|
||||
#endif
|
||||
rh = (rh >> 8) & 0xff;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_mono;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_MONO;
|
||||
#endif
|
||||
rh = rh & 0xff;
|
||||
}
|
||||
if (rh & 1)
|
||||
#ifdef FT212_STUFF
|
||||
cur.type |= ftc_image_flag_autohinted;
|
||||
#else
|
||||
cur.flags |= FT_LOAD_FORCE_AUTOHINT;
|
||||
#endif
|
||||
if (!(rh & 2))
|
||||
#ifdef FT212_STUFF
|
||||
cur.type |= ftc_image_flag_unhinted;
|
||||
#else
|
||||
cur.flags |= FT_LOAD_NO_HINTING;
|
||||
#endif
|
||||
}
|
||||
else if (xx < 8)
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays | ftc_image_flag_unhinted;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL | FT_LOAD_NO_HINTING;
|
||||
#endif
|
||||
else
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL;
|
||||
#endif
|
||||
advancementImgd = cur;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
|
|
@ -1003,14 +1071,6 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, uch);
|
||||
cur.font.face_id = imgd.font.face_id;
|
||||
if (!glyph)
|
||||
{
|
||||
cmap.face_id = fallback.font.face_id;
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, uch);
|
||||
if (glyph)
|
||||
cur.font.face_id = fallback.font.face_id;
|
||||
cmap.face_id = imgd.font.face_id;
|
||||
}
|
||||
|
||||
if (use_sbit)
|
||||
{
|
||||
|
|
@ -1398,7 +1458,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
|
||||
if (use_sbit)
|
||||
{
|
||||
if ((error=FTC_SBitCache_Lookup(ftc_sbitcache, &cur, glyph, &sbit, NULL)))
|
||||
if ((error = FTC_SBitCache_Lookup(ftc_sbitcache, &cur, glyph, &sbit, NULL)))
|
||||
{
|
||||
NSLog(@"FTC_SBitCache_Lookup() failed with error %08x (%08x, %08x, %ix%i, %08x)\n",
|
||||
error, glyph, cur.font.face_id, cur.font.pix_width, cur.font.pix_height,
|
||||
|
|
@ -1411,7 +1471,6 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
continue;
|
||||
}
|
||||
|
||||
|
||||
if (!sbit->buffer)
|
||||
{
|
||||
x += sbit->xadvance;
|
||||
|
|
@ -1659,82 +1718,29 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
glyph--;
|
||||
if (screenFont)
|
||||
{
|
||||
/* TODO: try to more efficiently? */
|
||||
/* TODO: set up all this stuff in -init... for the raw metric case */
|
||||
float xx, yy;
|
||||
#ifdef FT212_STUFF
|
||||
FTC_ImageDesc cur;
|
||||
#else
|
||||
FTC_ImageTypeRec cur;
|
||||
#endif
|
||||
int entry = glyph % CACHE_SIZE;
|
||||
FTC_SBit sbit;
|
||||
|
||||
cur = imgd;
|
||||
if (cachedGlyph[entry] == glyph)
|
||||
return cachedSize[entry];
|
||||
|
||||
xx = matrix[0];
|
||||
yy = matrix[3];
|
||||
|
||||
if (xx == yy && xx < 16 && xx >= 8)
|
||||
{
|
||||
int rh = face_info->render_hints_hack;
|
||||
if (rh & 0x10000)
|
||||
{
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL;
|
||||
#endif
|
||||
rh = (rh >> 8) & 0xff;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_mono;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_MONO;
|
||||
#endif
|
||||
rh = rh & 0xff;
|
||||
}
|
||||
if (rh & 1)
|
||||
#ifdef FT212_STUFF
|
||||
cur.type |= ftc_image_flag_autohinted;
|
||||
#else
|
||||
cur.flags |= FT_LOAD_FORCE_AUTOHINT;
|
||||
#endif
|
||||
if (!(rh & 2))
|
||||
#ifdef FT212_STUFF
|
||||
cur.type |= ftc_image_flag_unhinted;
|
||||
#else
|
||||
cur.flags |= FT_LOAD_NO_HINTING;
|
||||
#endif
|
||||
}
|
||||
else if (xx < 8)
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays | ftc_image_flag_unhinted;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL | FT_LOAD_NO_HINTING;
|
||||
#endif
|
||||
else
|
||||
#ifdef FT212_STUFF
|
||||
cur.type = ftc_image_grays;
|
||||
#else
|
||||
cur.flags = FT_LOAD_TARGET_NORMAL;
|
||||
#endif
|
||||
|
||||
if ((error=FTC_SBitCache_Lookup(ftc_sbitcache, &cur, glyph, &sbit, NULL)))
|
||||
if ((error=FTC_SBitCache_Lookup(ftc_sbitcache, &advancementImgd, glyph, &sbit, NULL)))
|
||||
{
|
||||
NSLog(@"FTC_SBitCache_Lookup() failed with error %08x (%08x, %08x, %ix%i, %08x)\n",
|
||||
error, glyph, cur.font.face_id, cur.font.pix_width, cur.font.pix_height,
|
||||
error, glyph, advancementImgd.font.face_id,
|
||||
advancementImgd.font.pix_width, advancementImgd.font.pix_height,
|
||||
#ifdef FT212_STUFF
|
||||
cur.type
|
||||
advancementImgd.type
|
||||
#else
|
||||
cur.flags
|
||||
advancementImgd.flags
|
||||
#endif
|
||||
);
|
||||
return NSZeroSize;
|
||||
}
|
||||
|
||||
return NSMakeSize(sbit->xadvance, sbit->yadvance);
|
||||
cachedGlyph[entry] = glyph;
|
||||
cachedSize[entry] = NSMakeSize(sbit->xadvance, sbit->yadvance);
|
||||
return cachedSize[entry];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1879,14 +1885,6 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
|
|||
ch = [string characterAtIndex: i];
|
||||
cur = &imgd;
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, ch);
|
||||
if (!glyph)
|
||||
{
|
||||
cmap.face_id = fallback.font.face_id;
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, ch);
|
||||
if (glyph)
|
||||
cur = &fallback;
|
||||
cmap.face_id = imgd.font.face_id;
|
||||
}
|
||||
|
||||
/* TODO: shouldn't use sbit cache for this */
|
||||
if (1)
|
||||
|
|
@ -2194,14 +2192,6 @@ add code to avoid loading bitmaps for glyphs */
|
|||
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, *c);
|
||||
cur.font.face_id = imgd.font.face_id;
|
||||
if (!glyph)
|
||||
{
|
||||
cmap.face_id = fallback.font.face_id;
|
||||
glyph = FTC_CMapCache_Lookup(ftc_cmapcache, &cmap, *c);
|
||||
if (glyph)
|
||||
cur.font.face_id = fallback.font.face_id;
|
||||
cmap.face_id = imgd.font.face_id;
|
||||
}
|
||||
|
||||
if (FTC_Manager_Lookup_Size(ftc_manager, &cur.font, &face, 0))
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue