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

WIP Trying to get SDL_Pango (& FontConfig) to see our locale fonts

Browse source
This commit is contained in:
Bill Kendrick 2023-06-12 22:13:19 -07:00
parent fcba197c90
commit 794ea691e8
2 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -77,9 +77,13 @@ https://tuxpaint.org/
+ Gujarati: Lohit Gujarati + Gujarati: Lohit Gujarati
+ Hebrew: Nachlieli CLM + Hebrew: Nachlieli CLM
+ Hindi: Lohit Devanagari + Hindi: Lohit Devanagari
+ Japanese: TBD + Japanese: TBD <<FIXME>>
+ Korean: Baekmuk Gulim
+ Thai: Garuda + Thai: Garuda
+ Tibetan: Tsampa Keyboard + Tibetan: Tsampa Keyboard
(This returns us to how Tux Paint behaved when we used
SDL_ttf to directly load fonts for the UI, and used TTF font files
that we ship in the `fonts/locale/` directory.)
Closes https://sourceforge.net/p/tuxpaint/feature-requests/240/ Closes https://sourceforge.net/p/tuxpaint/feature-requests/240/
Bill Kendrick <bill@newbreedsoftware.com> (code) Bill Kendrick <bill@newbreedsoftware.com> (code)

42
src/tuxpaint.c
View file

@ -2317,6 +2317,8 @@ char *safe_strncat(char *dest, const char *src, size_t n);
char *safe_strncpy(char *dest, const char *src, size_t n); char *safe_strncpy(char *dest, const char *src, size_t n);
int safe_snprintf(char *str, size_t size, const char *format, ...); int safe_snprintf(char *str, size_t size, const char *format, ...);
static int generate_fontconfig_cache_real(void);
#define MAX_UTF8_CHAR_LENGTH 6 #define MAX_UTF8_CHAR_LENGTH 6
#define USEREVENT_TEXT_UPDATE 1 #define USEREVENT_TEXT_UPDATE 1
@ -8125,6 +8127,8 @@ void show_fonts(void) {
int i, n_families; int i, n_families;
char * * family_names; char * * family_names;
generate_fontconfig_cache_real();
fontmap = pango_ft2_font_map_new(); fontmap = pango_ft2_font_map_new();
pango_font_map_list_families(fontmap, &families, &n_families); pango_font_map_list_families(fontmap, &families, &n_families);
@ -9322,9 +9326,47 @@ static int generate_fontconfig_cache_real(void)
TuxPaint_Font *tmp_font; TuxPaint_Font *tmp_font;
SDL_Surface *tmp_surf; SDL_Surface *tmp_surf;
SDL_Color black = { 0, 0, 0, 0 }; SDL_Color black = { 0, 0, 0, 0 };
FcBool fontAddStatus;
const char * locale_fontdir;
DEBUG_PRINTF("-- Hello from generate_fontconfig_cache() (thread # %d)\n", SDL_ThreadID()); DEBUG_PRINTF("-- Hello from generate_fontconfig_cache() (thread # %d)\n", SDL_ThreadID());
/* Add Tux Paint's own set of fonts to FontConfig,
so SDL2_Pango can find and use them */
locale_fontdir = "/usr/local/share/tuxpaint/fonts"; // FIXME
fontAddStatus = FcConfigAppFontAddDir(FcConfigGetCurrent(), (const FcChar8 *) locale_fontdir);
if (fontAddStatus == FcFalse)
{
fprintf(stderr, "Unable to add font dir %s\n", locale_fontdir);
}
/* ARGH: Why is '/usr/local/share/tuxpaint/fonts' not
coming back in the list of font dirs (below)?!
I tried both of these & they did not help.
Documentation out there is very vague; Google barely helping.
-bjk 2023.06.12
*/
printf("Rescanning fonts..."); fflush(stdout);
FcDirCacheRead(locale_fontdir, FcTrue /* force */, FcConfigGetCurrent());
FcDirCacheRescan(locale_fontdir, FcConfigGetCurrent());
printf("done\n");
if (SDL_TRUE) // FIXME
{
FcStrList *str_list;
FcChar8 *path;
str_list = FcConfigGetFontDirs(FcConfigGetCurrent());
printf("FontConfigGetFontDirs():\n");
while ((path = FcStrListNext(str_list)) != NULL) {
printf(" * %s\n", (const char *) path);
}
printf("\n");
}
tmp_font = TuxPaint_Font_OpenFont(PANGO_DEFAULT_FONT, NULL, 12); /* always just using the default font for the purpose of getting FontConfig to generate its cache */ tmp_font = TuxPaint_Font_OpenFont(PANGO_DEFAULT_FONT, NULL, 12); /* always just using the default font for the purpose of getting FontConfig to generate its cache */
if (tmp_font != NULL) if (tmp_font != NULL)