Skip to content

Commit 82125ec

Browse files
committed
x11: Be more aggressive about finding _any_ usable messagebox font.
Fixes #4800. Fixes #11910.
1 parent 4231848 commit 82125ec

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/video/x11/SDL_x11messagebox.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,16 @@
4545
#define MIN_DIALOG_WIDTH 200 // Minimum dialog width
4646
#define MIN_DIALOG_HEIGHT 100 // Minimum dialog height
4747

48-
static const char g_MessageBoxFontLatin1[] = "-*-*-medium-r-normal--0-120-*-*-p-0-iso8859-1";
49-
static const char g_MessageBoxFont[] = "-*-*-medium-r-normal--*-120-*-*-*-*-*-*";
48+
static const char g_MessageBoxFontLatin1[] =
49+
"-*-*-medium-r-normal--0-120-*-*-p-0-iso8859-1";
50+
51+
static const char g_MessageBoxFont[] =
52+
"-*-*-medium-r-normal--*-120-*-*-*-*-iso10646-1," // explicitly unicode (iso10646-1)
53+
"-*-*-medium-r-*--*-120-*-*-*-*-iso10646-1," // explicitly unicode (iso10646-1)
54+
"-*-*-*-*-*--*-*-*-*-*-*-iso10646-1," // just give me anything Unicode.
55+
"-*-*-medium-r-normal--*-120-*-*-*-*-iso8859-1," // explicitly latin1, in case low-ASCII works out.
56+
"-*-*-medium-r-*--*-120-*-*-*-*-iso8859-1," // explicitly latin1, in case low-ASCII works out.
57+
"-*-*-*-*-*--*-*-*-*-*-*-iso8859-1"; // just give me anything latin1.
5058

5159
static const SDL_MessageBoxColor g_default_colors[SDL_MESSAGEBOX_COLOR_COUNT] = {
5260
{ 56, 54, 53 }, // SDL_MESSAGEBOX_COLOR_BACKGROUND,

0 commit comments

Comments
 (0)