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

Mac OS X: Fix Init_text()

Browse Source
This commit is contained in:
Thomas BERNARD 2018-11-27 11:30:26 +01:00 committed by Thomas Bernard
parent 8a3e5da6a1
commit d91290f63f
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/text.c
View File

@ -360,21 +360,24 @@ void Init_text(void)
int i,number; int i,number;
char home_dir[MAXPATHLEN]; char home_dir[MAXPATHLEN];
char *font_path_list[3] = { const char *font_path_list[3] = {
"/System/Library/Fonts", "/System/Library/Fonts",
"/Library/Fonts" "/Library/Fonts"
}; };
number = 3; number = 2;
// Make sure we also search into the user's fonts directory // Make sure we also search into the user's fonts directory
CFURLRef url = (CFURLRef) CFCopyHomeDirectoryURLForUser(NULL); //CFURLRef url = (CFURLRef) CFCopyHomeDirectoryURLForUser(NULL);
CFURLGetFileSystemRepresentation(url, true, (UInt8 *) home_dir, MAXPATHLEN); //CFURLGetFileSystemRepresentation(url, true, (UInt8 *) home_dir, MAXPATHLEN);
strcat(home_dir, "/Library/Fonts"); if (getenv("HOME") != NULL)
font_path_list[2] = home_dir; {
snprintf(home_dir, sizeof(home_dir), "%s/Library/Fonts", getenv("HOME"));
font_path_list[number++] = home_dir;
}
for(i=0;i<number;i++) for(i=0;i<number;i++)
For_each_file(*(font_path_list+i),Add_font); For_each_file(*(font_path_list+i),Add_font);
CFRelease(url); //CFRelease(url);
#endif #endif
#elif defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__) #elif defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)