From 782fa833f4ab903a17863dde71106f98c76964bd Mon Sep 17 00:00:00 2001
From: David Gow <[EMAIL REDACTED]>
Date: Sun, 7 Nov 2021 15:01:38 +0800
Subject: [PATCH] Make SDL12COMPAT_USE_KEYBOARD_LAYOUT's default
platform-specific.
It looks like (at least out of the top three of Windows, Mac, and
Linux), only Windows forces the use of the US layout. Mac (at least from
a cursory reading of the code), translates according to the keyboard
layout, as does X11 (albeit with some bugs).
In this case, set the default to disable layout translation only on
Win32, and have it enabled by default on other platforms.
This does break DOSBox, but only when "usescancodes = false" (or
potentially if keyboard layouts changed some of the non-printable
character keys which would break out scancode fallback). Since this is
not the default, hopefully people won't encounter it...?
---
src/SDL12_compat.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index d523595..4eb8c5c 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -923,7 +923,17 @@ static char *WindowTitle = NULL;
static char *WindowIconTitle = NULL;
static SDL_Surface *VideoIcon20 = NULL;
static int EnabledUnicode = 0;
+/* Windows SDL1.2 never uses translated keyboard layouts for compatibility with
+DirectInput, which didn't support them. Other platforms (MacOS, Linux) seem to,
+but with varying levels of bugginess. So default to Translated Layouts on
+all non-Windows platforms (but have an option to change this, as many apps are
+buggy with non-US layouts, or provide their own keyboard layout translation,
+such as DOSBox. */
+#if !defined(_WIN32)
+static SDL_bool TranslateKeyboardLayout = SDL_TRUE;
+#else
static SDL_bool TranslateKeyboardLayout = SDL_FALSE;
+#endif
static int VideoDisplayIndex = 0;
static SDL_bool SupportSysWM = SDL_FALSE;
static SDL_bool CDRomInit = SDL_FALSE;
@@ -1734,7 +1744,10 @@ Init12Video(void)
SDL_DisplayMode mode;
int i;
- TranslateKeyboardLayout = (!layout_env || SDL20_atoi(layout_env)) ? SDL_TRUE : SDL_FALSE;
+ /* Only override this if the env var is set, as the default is platform-specific. */
+ if (layout_env) {
+ TranslateKeyboardLayout = SDL20_atoi(layout_env) ? SDL_TRUE : SDL_FALSE;
+ }
IsDummyVideo = ((driver != NULL) && (SDL20_strcmp(driver, "dummy") == 0)) ? SDL_TRUE : SDL_FALSE;