notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support for <dir prefix="relative"> in "fonts.conf"

Browse source
This commit is contained in:
Bill Kendrick 2025-02-22 13:06:43 -08:00
parent e04bfc651a
commit 7f1ab23292
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/fonts.c
View file

@ -30,6 +30,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <locale.h> #include <locale.h>
#include <libgen.h> /* for dirname() */
#include <errno.h> #include <errno.h>
#include <libintl.h> #include <libintl.h>
@ -64,7 +66,7 @@ enum {
/* /*
The following section renames global variables defined in SDL2_Pango.h to avoid errors during linking. The following section renames global variables defined in SDL2_Pango.h to avoid errors during linking.
It is okay to rename these variables because they are constants. It is okay to rename these variables because they are constants.
SDL2_Pango.h is included by fonts.h. SDL2_Pango.h is included by fonts.h.
*/ */
#define _MATRIX_WHITE_BACK _MATRIX_WHITE_BACK2 #define _MATRIX_WHITE_BACK _MATRIX_WHITE_BACK2
#define MATRIX_WHITE_BACK MATRIX_WHITE_BACK2 #define MATRIX_WHITE_BACK MATRIX_WHITE_BACK2
@ -1244,7 +1246,7 @@ char * * malloc_fontconfig_config_paths(int num_to_malloc, int * num_actually_ma
else if (xmlStrcmp(prefix, (const xmlChar *) "relative") == 0) else if (xmlStrcmp(prefix, (const xmlChar *) "relative") == 0)
fontconfig_prefix = FC_PREFIX_RELATIVE; fontconfig_prefix = FC_PREFIX_RELATIVE;
xmlFree(prefix); xmlFree(prefix);
} }
/* Note: As we already look for both system and user fonts on Windows, /* Note: As we already look for both system and user fonts on Windows,
@ -1259,7 +1261,7 @@ char * * malloc_fontconfig_config_paths(int num_to_malloc, int * num_actually_ma
#ifdef __linux__ #ifdef __linux__
#ifndef __ANDROID__ #ifndef __ANDROID__
wordexp_t result; wordexp_t result;
wordexp(path_str, &result, 0); wordexp(path_str, &result, 0);
if (result.we_wordv == NULL) if (result.we_wordv == NULL)
{ {
@ -1294,8 +1296,21 @@ char * * malloc_fontconfig_config_paths(int num_to_malloc, int * num_actually_ma
} }
else if (fontconfig_prefix == FC_PREFIX_RELATIVE) else if (fontconfig_prefix == FC_PREFIX_RELATIVE)
{ {
/* FIXME */ char *fc_cfg_path_copy, *dname;
printf("fonts.conf <dir prefix=\"relative\"> not supported yet!\n");
fc_cfg_path_copy = strdup(fontconfig_config_paths[i]);
dname = dirname(fc_cfg_path_copy);
snprintf(prefix_path, sizeof(prefix_path), "%s/", dname);
free(fc_cfg_path_copy);
/* Per dirname(3):
These functions may return pointers to statically
allocated memory which may be overwritten by
subsequent calls. Alternatively, they may return a
pointer to some part of path, so that the string
referred to by path should not be modified or
freed until the pointer returned by the function
is no longer required.
*/
} }
if (prefix_path[0] != '\0') if (prefix_path[0] != '\0')
@ -1303,8 +1318,8 @@ char * * malloc_fontconfig_config_paths(int num_to_malloc, int * num_actually_ma
char * tmp_str; char * tmp_str;
size_t len; size_t len;
len = strlen(path_str) + strlen(prefix_path); len = strlen(path_str) + strlen(prefix_path) + 1;
tmp_str = (char *) malloc(sizeof(char *) * (len + 1)); tmp_str = (char *) malloc(sizeof(char *) * len);
if (tmp_str != NULL) if (tmp_str != NULL)
{ {
snprintf(tmp_str, len, "%s%s", prefix_path, path_str); snprintf(tmp_str, len, "%s%s", prefix_path, path_str);