From: Enlightenment C. <no...@cv...> - 2007-12-22 11:49:59
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/dox Modified Files: text.c ttfont.c Log Message: edox: Add ../ttfonts to TT font path. =================================================================== RCS file: /cvs/e/e16/e/dox/text.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- text.c 22 Dec 2007 11:48:04 -0000 1.25 +++ text.c 22 Dec 2007 11:49:56 -0000 1.26 @@ -78,7 +78,7 @@ { *ss = ' '; word(s2, 1, w); - sprintf(s, "%s/%s.ttf", docdir, w); + sprintf(s, "%s.ttf", w); word(s2, 2, w); ts->efont = Efont_load(s, atoi(w)); if (ts->efont) =================================================================== RCS file: /cvs/e/e16/e/dox/ttfont.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ttfont.c 17 Jan 2007 01:10:40 -0000 1.21 +++ ttfont.c 22 Dec 2007 11:49:56 -0000 1.22 @@ -78,9 +78,18 @@ Efont * Efont_load(const char *file, int size) { + static char fp_set = 0; char s[4096]; Efont *f; Imlib_Font ff; + + if (!fp_set) + { + imlib_add_path_to_font_path(docdir); + sprintf(s, "%s/../ttfonts", docdir); + imlib_add_path_to_font_path(s); + fp_set = 1; + } Esnprintf(s, sizeof(s), "%s/%d", file, size); ff = imlib_load_font(s); |