Browse Source

x11: Be more aggressive about finding _any_ usable messagebox font.

Fixes #4800.
Fixes #11910.
Ryan C. Gordon 3 months ago
parent
commit
82125ec1d8
1 changed files with 10 additions and 2 deletions
  1. 10 2
      src/video/x11/SDL_x11messagebox.c

+ 10 - 2
src/video/x11/SDL_x11messagebox.c

@@ -45,8 +45,16 @@
 #define MIN_DIALOG_WIDTH  200 // Minimum dialog width
 #define MIN_DIALOG_HEIGHT 100 // Minimum dialog height
 
-static const char g_MessageBoxFontLatin1[] = "-*-*-medium-r-normal--0-120-*-*-p-0-iso8859-1";
-static const char g_MessageBoxFont[] = "-*-*-medium-r-normal--*-120-*-*-*-*-*-*";
+static const char g_MessageBoxFontLatin1[] =
+    "-*-*-medium-r-normal--0-120-*-*-p-0-iso8859-1";
+
+static const char g_MessageBoxFont[] =
+    "-*-*-medium-r-normal--*-120-*-*-*-*-iso10646-1,"  // explicitly unicode (iso10646-1)
+    "-*-*-medium-r-*--*-120-*-*-*-*-iso10646-1,"  // explicitly unicode (iso10646-1)
+    "-*-*-*-*-*--*-*-*-*-*-*-iso10646-1,"  // just give me anything Unicode.
+    "-*-*-medium-r-normal--*-120-*-*-*-*-iso8859-1,"  // explicitly latin1, in case low-ASCII works out.
+    "-*-*-medium-r-*--*-120-*-*-*-*-iso8859-1,"  // explicitly latin1, in case low-ASCII works out.
+    "-*-*-*-*-*--*-*-*-*-*-*-iso8859-1";  // just give me anything latin1.
 
 static const SDL_MessageBoxColor g_default_colors[SDL_MESSAGEBOX_COLOR_COUNT] = {
     { 56, 54, 53 },    // SDL_MESSAGEBOX_COLOR_BACKGROUND,