m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch from #305 and #525. Use FontConfig on linux to get true type fonts instead of

Browse Source 
the X11 functions.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2050 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues
2013-02-02 08:45:33 +00:00
parent 1dce247656
commit 72d8f5a49d
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/text.c
View File

@@ -38,9 +38,9 @@
#endif
#if defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
// No X11
// No fontconfig
#elif defined(__linux__)
#include <X11/Xlib.h>
#include <fontconfig/fontconfig.h>
#endif
#endif
@@ -326,22 +326,23 @@ void Init_text(void)
#endif
#elif defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
// No X11 : Only use fonts from Grafx2
// No fontconfig : Only use fonts from Grafx2
#elif defined(__linux__)
#ifndef NOTTF
#define USE_XLIB
#define USE_FC
#ifdef USE_XLIB
#ifdef USE_FC
{
int i,number;
Display* dpy = XOpenDisplay(NULL);
char** font_path_list = XGetFontPath(dpy,&number);
XCloseDisplay(dpy);
FcStrList* dirs;
dirs = FcConfigGetFontDirs(NULL);
char* fdir = FcStrListNext(dirs);
while(fdir != NULL)
{
For_each_file(fdir,Add_font);
fdir = FcStrListNext(dirs);
}
for(i=0;i<number;i++)
For_each_file(*(font_path_list+i),Add_font);
XFreeFontPath(font_path_list);
FcStrListDone(dirs);
}
#endif
#endif