Commit 55f74c32850631e736cd6d7e895ae330fff97297
2023-03-29T15:16:59
x11: Don't allow the changing of certain scancodes The X11 driver uses scancodes derived from keysyms to map the scancodes for extended keys to the physical keyboard, however, this can be incorrect when using certain XKB options (e.g. caps:swapescape), which changes the keysyms emitted by certain keys, but does not imply that their scancodes or positions should be altered. Mark selected scancodes as being non-remappable so that their scancodes aren't changed by toggling XKB mapping options.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c
index 2e0576e..5f7c2bb 100644
--- a/src/video/x11/SDL_x11keyboard.c
+++ b/src/video/x11/SDL_x11keyboard.c
@@ -46,6 +46,31 @@ static SDL_ScancodeTable scancode_set[] = {
SDL_SCANCODE_TABLE_XVNC,
};
+static SDL_bool X11_ScancodeIsRemappable(SDL_Scancode scancode)
+{
+ /*
+ * XKB remappings can assign different keysyms for these scancodes, but
+ * as these keys are in fixed positions, the scancodes themselves shouldn't
+ * be switched. Mark them as not being remappable.
+ */
+ switch (scancode) {
+ case SDL_SCANCODE_ESCAPE:
+ case SDL_SCANCODE_CAPSLOCK:
+ case SDL_SCANCODE_NUMLOCKCLEAR:
+ case SDL_SCANCODE_LSHIFT:
+ case SDL_SCANCODE_RSHIFT:
+ case SDL_SCANCODE_LCTRL:
+ case SDL_SCANCODE_RCTRL:
+ case SDL_SCANCODE_LALT:
+ case SDL_SCANCODE_RALT:
+ case SDL_SCANCODE_LGUI:
+ case SDL_SCANCODE_RGUI:
+ return SDL_FALSE;
+ default:
+ return SDL_TRUE;
+ }
+}
+
/* This function only correctly maps letters and numbers for keyboards in US QWERTY layout */
static SDL_Scancode X11_KeyCodeToSDLScancode(_THIS, KeyCode keycode)
{
@@ -266,8 +291,8 @@ int X11_InitKeyboard(_THIS)
if (scancode == data->key_layout[i]) {
continue;
}
- if (default_keymap[scancode] >= SDLK_SCANCODE_MASK) {
- /* Not a character key, safe to remap */
+ if (default_keymap[scancode] >= SDLK_SCANCODE_MASK && X11_ScancodeIsRemappable(scancode)) {
+ /* Not a character key and the scancode is safe to remap */
#ifdef DEBUG_KEYBOARD
SDL_Log("Changing scancode, was %d (%s), now %d (%s)\n", data->key_layout[i], SDL_GetScancodeName(data->key_layout[i]), scancode, SDL_GetScancodeName(scancode));
#endif