Allow a fallback font for characters above 0xFFFF to be specified. There is no scanning of this range as most fonts don't have any characters here. Symbola is selected if it is installed.

1 files changed, 15 insertions, 2 deletions

diff --git a/amiga/gui.c b/amiga/gui.c
index 1eb561da6..b7f3285aa 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -604,13 +604,13 @@ static nserror ami_set_options(struct nsoption_s *defaults)
 		BPTR lock = 0;
 		/* Search for some likely candidates */
 
-		if((lock = Lock("FONTS:Code2000.font", ACCESS_READ)))
+		if((lock = Lock("FONTS:Code2000.otag", ACCESS_READ)))
 		{
 			UnLock(lock);
 			nsoption_set_charp(font_unicode, 
 					   (char *)strdup("Code2000"));
 		}
-		else if((lock = Lock("FONTS:Bitstream Cyberbit.font", ACCESS_READ)))
+		else if((lock = Lock("FONTS:Bitstream Cyberbit.otag", ACCESS_READ)))
 		{
 			UnLock(lock);
 			nsoption_set_charp(font_unicode,
@@ -618,6 +618,19 @@ static nserror ami_set_options(struct nsoption_s *defaults)
 		}
 	}
 
+	if (nsoption_charp(font_surrogate) == NULL) {
+		BPTR lock = 0;
+		/* Search for some likely candidates -
+		 * Ideally we should pick a font during the scan process which announces it
+		 * contains UCR_SURROGATES, but nothing appears to have the tag.
+		 */
+		if((lock = Lock("FONTS:Symbola.otag", ACCESS_READ))) {
+			UnLock(lock);
+			nsoption_set_charp(font_surrogate, 
+					   (char *)strdup("Symbola"));
+		}
+	}
+
 	if(popupmenu_lib_ok == FALSE)
 		nsoption_set_bool(context_menu, false);