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

Revert to old fontconfig searching 

SVN revision: 21969
This commit is contained in:
Stafford Mitchell Horne 2006-04-09 02:42:21 +00:00
parent f0b6819b6b
commit 34b43317af
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -312,19 +312,31 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
if (!font) /* Search using fontconfig */
{
FcPattern *p_nm = NULL;
FcChar8 *s;
FcFontSet *set;
FcResult res;
int i;
p_nm = FcNameParse(name);
FcConfigSubstitute(NULL, p_nm, FcMatchPattern);
FcDefaultSubstitute(p_nm);
/* do matching */
p_nm = FcFontMatch(NULL, p_nm, &res);
res = FcPatternGetString(p_nm, FC_FILE, 0, &s);
if (res == FcResultMatch)
font = evas->engine.func->font_load(evas->engine.data.output, s,
size);
set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res);
/* Do loading for all in family */
for (i = 0; i < set->nfont; i++)
{
FcValue filename;
FcPatternGet(set->fonts[i], FC_FILE, 0, &filename);
if (font)
evas->engine.func->font_add(evas->engine.data.output, font, filename.u.s, size);
else
font = evas->engine.func->font_load(evas->engine.data.output, filename.u.s, size);
}
FcFontSetDestroy(set);
FcPatternDestroy(p_nm);
}
#endif