enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas on-demand font loading 

* When fonts are added from files we will only load the details
 * The first font is always loaded
 * I know there is a patch for this on the list but this way seems better to me


SVN revision: 21964
This commit is contained in:
Stafford Mitchell Horne 2006-04-09 00:02:47 +00:00
parent c7224e4190
commit 8f207f622f
3 changed files with 64 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -64,6 +64,13 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
int index;
fi = l->data;
if (!fi->ft.size)
{
if (!fi->src->ft.face)
evas_common_font_source_load_complete(fi->src);
evas_common_font_int_load_complete(fi);
}
index = FT_Get_Char_Index(fi->src->ft.face, gl);
if (index != 0)
{
@ -90,7 +97,7 @@ evas_common_font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int
FT_Face pface = NULL;
fi = fn->fonts->data;
im = dst->image->data;
im_w = dst->image->w;
im_h = dst->image->h;

67
legacy/evas/src/lib/engines/common/evas_font_load.c
View File

@ -48,21 +48,33 @@ evas_common_font_source_load(const char *name)
fs->data = NULL;
fs->data_size = 0;
fs->current_size = 0;
error = FT_New_Face(evas_ft_lib, name, 0, &(fs->ft.face));
if (error)
{
free(fs);
return NULL;
}
fs->ft.face = NULL;
fs->name = evas_stringshare_add(name);
fs->file = fs->name;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
fs->ft.orig_upem = fs->ft.face->units_per_EM;
fs->ft.orig_upem = 0;
fs->references = 1;
fonts_src = evas_object_list_prepend(fonts_src, fs);
return fs;
}
int
evas_common_font_source_load_complete(RGBA_Font_Source *fs)
{
int error;
error = FT_New_Face(evas_ft_lib, fs->name, 0, &(fs->ft.face));
if (error) return error;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
if (error) return error;
fs->ft.orig_upem = fs->ft.face->units_per_EM;
return error;
}
RGBA_Font_Source *
evas_common_font_source_find(const char *name)
{
@ -127,7 +139,8 @@ evas_common_font_int_memory_load(const char *name, int size, const void *data, i
if (!fi) return NULL;
fi->src = evas_common_font_source_find(name);
if (!fi->src) fi->src = evas_common_font_source_memory_load(name, data, data_size);
if (!fi->src)
fi->src = evas_common_font_source_memory_load(name, data, data_size);
if (!fi->src)
{
@ -148,6 +161,8 @@ evas_common_font_int_load(const char *name, int size)
fi = evas_common_font_int_find(name, size);
if (fi) return fi;
if (!evas_file_path_is_file(name)) return NULL;
fi = calloc(1, sizeof(RGBA_Font_Int));
if (!fi) return NULL;
@ -168,6 +183,16 @@ evas_common_font_int_load(const char *name, int size)
RGBA_Font_Int *
evas_common_font_int_load_init(RGBA_Font_Int *fi)
{
fi->glyphs = NULL;
fi->usage = 0;
fi->references = 1;
fonts = evas_object_list_prepend(fonts, fi);
return fi;
}
RGBA_Font_Int *
evas_common_font_int_load_complete(RGBA_Font_Int *fi)
{
int error;
@ -214,14 +239,9 @@ evas_common_font_int_load_init(RGBA_Font_Int *fi)
}
}
fi->src->current_size = fi->size;
fi->glyphs = NULL;
fi->usage = 0;
fi->references = 1;
fonts = evas_object_list_prepend(fonts, fi);
return fi;
}
RGBA_Font *
evas_common_font_memory_load(const char *name, int size, const void *data, int data_size)
{
@ -250,6 +270,22 @@ evas_common_font_load(const char *name, int size)
fi = evas_common_font_int_load(name, size);
if (!fi) return NULL;
/* First font, complete load */
if (!fi->ft.size)
{
if (!fi->src->ft.face)
{
if (evas_common_font_source_load_complete(fi->src))
{
fonts = evas_object_list_remove(fonts, fi);
evas_common_font_source_free(fi->src);
free(fi);
return NULL;
}
}
evas_common_font_int_load_complete(fi);
}
fn = calloc(1, sizeof(RGBA_Font));
if (!fn)
{
@ -259,6 +295,7 @@ evas_common_font_load(const char *name, int size)
fn->fonts = evas_list_append(fn->fonts, fi);
fn->hinting = FONT_BYTECODE_HINT;
fi->hinting = fn->hinting;
return fn;
}

6
legacy/evas/src/lib/include/evas_common.h
View File

@ -334,8 +334,8 @@ struct _RGBA_Font_Source
{
Evas_Object_List _list_data;
char *name;
char *file;
const char *name;
const char *file;
void *data;
int data_size;
@ -865,6 +865,7 @@ void evas_common_font_init (void);
void evas_common_font_shutdown (void);
RGBA_Font_Source *evas_common_font_source_memory_load(const char *name, const void *data, int data_size);
RGBA_Font_Source *evas_common_font_source_load (const char *name);
int evas_common_font_source_load_complete(RGBA_Font_Source *fs);
RGBA_Font_Source *evas_common_font_source_find (const char *name);
void evas_common_font_source_free (RGBA_Font_Source *fs);
void evas_common_font_size_use (RGBA_Font *fn);
@ -873,6 +874,7 @@ RGBA_Font *evas_common_font_load (const char *name, int size)
RGBA_Font *evas_common_font_add (RGBA_Font *fn, const char *name, int size);
RGBA_Font *evas_common_font_memory_add (RGBA_Font *fn, const char *name, int size, const void *data, int data_size);
RGBA_Font_Int *evas_common_font_int_load_init (RGBA_Font_Int *fn);
RGBA_Font_Int *evas_common_font_int_load_complete (RGBA_Font_Int *fi);
void evas_common_font_free (RGBA_Font *fn);
void evas_common_font_hinting_set (RGBA_Font *fn, Font_Hint_Flags hinting);
Evas_Bool evas_common_hinting_available (Font_Hint_Flags hinting);