Fix macOS custom fonts

dqh-au · dqh-au · commit ec6d2834d2df · 2025-11-17T21:41:47.000Z
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45853 379a1393-f5fb-40a0-bcee-ef074d9b53f7
diff --git a/vice/src/arch/shared/archdep_cbmfont.c b/vice/src/arch/shared/archdep_cbmfont.c
@@ -69,6 +69,7 @@ static const char *font_files[] = {
 # ifdef MACOS_COMPILE
 
 #  include <CoreText/CTFontManager.h>
+#  include <pango/pangocairo.h>
 
 int archdep_register_cbmfont(void)
 {
@@ -106,6 +107,9 @@ int archdep_register_cbmfont(void)
         lib_free(fontPath);
     }
 
+    /* Force Pango to reinitialize so that the available fonts are rescanned */
+    pango_cairo_font_map_set_default(NULL);
+
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ static const char *font_files[] = {`
`69`	`69`	`# ifdef MACOS_COMPILE`
`70`	`70`
`71`	`71`	`# include <CoreText/CTFontManager.h>`
	`72`	`+# include <pango/pangocairo.h>`
`72`	`73`
`73`	`74`	`int archdep_register_cbmfont(void)`
`74`	`75`	`{`
`@@ -106,6 +107,9 @@ int archdep_register_cbmfont(void)`
`106`	`107`	`lib_free(fontPath);`
`107`	`108`	`}`
`108`	`109`
	`110`	`+ /* Force Pango to reinitialize so that the available fonts are rescanned */`
	`111`	`+ pango_cairo_font_map_set_default(NULL);`
	`112`	`+`
`109`	`113`	`return 1;`
`110`	`114`	`}`
`111`	`115`