From acf65c31d2569ca9e33a4d2d8de8480d88f87a15 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Wed, 20 Dec 2017 11:28:19 +0100 Subject: [PATCH] Load additional fonts from the ~/.config/grafx2/fonts directory Load in fact from the /fonts/ subdirectory of the config directory, wherever it is (it depends a lot on the platform) under WIN32 it is %APPDATA%/GrafX2/fonts MacOS ~/Library/Preferences/com.googlecode.grafx2/fonts etc. see http://pulkomandy.tk/projects/GrafX2/ticket/56 --- src/text.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/text.c b/src/text.c index f4d905cf..a4694180 100644 --- a/src/text.c +++ b/src/text.c @@ -285,8 +285,10 @@ void Init_text(void) font_list_start = NULL; Nb_fonts=0; // Parcours du répertoire "fonts" - strcpy(directory_name, Data_directory); - strcat(directory_name, FONTS_SUBDIRECTORY); + snprintf(directory_name, sizeof(directory_name), "%s%s", Data_directory,FONTS_SUBDIRECTORY); + For_each_file(directory_name, Add_font); + // fonts subdirectory in Config_directory + snprintf(directory_name, sizeof(directory_name), "%s%s", Config_directory, "/fonts"); For_each_file(directory_name, Add_font); #if defined(__WIN32__)