eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed key names for non-latin keyboard layouts

Browse source
This commit is contained in:
Sam Lantinga 2024-08-05 18:49:19 -07:00
parent ac7df9d01f
commit 4f7c0e7c46
2 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/events/SDL_keyboard.c
View file

@ -57,7 +57,8 @@ typedef struct SDL_Keyboard
Uint8 keystate[SDL_NUM_SCANCODES]; Uint8 keystate[SDL_NUM_SCANCODES];
SDL_Keymap *keymap; SDL_Keymap *keymap;
SDL_bool french_numbers; SDL_bool french_numbers;
SDL_bool non_latin_letters; SDL_bool latin_letters;
SDL_bool thai_keyboard;
Uint32 keycode_options; Uint32 keycode_options;
SDL_bool autorelease_pending; SDL_bool autorelease_pending;
Uint64 hardware_timestamp; Uint64 hardware_timestamp;
@ -229,6 +230,17 @@ SDL_Keymap *SDL_GetCurrentKeymap(void)
{ {
SDL_Keyboard *keyboard = &SDL_keyboard; SDL_Keyboard *keyboard = &SDL_keyboard;
if (keyboard->thai_keyboard) {
// Thai keyboards are QWERTY plus Thai characters, use the default QWERTY keymap
return NULL;
}
if ((keyboard->keycode_options & KEYCODE_OPTION_LATIN_LETTERS) &&
!keyboard->latin_letters) {
// We'll use the default QWERTY keymap
return NULL;
}
return keyboard->keymap; return keyboard->keymap;
} }
@ -253,10 +265,17 @@ void SDL_SetKeymap(SDL_Keymap *keymap, SDL_bool send_event)
} }
// Detect non-Latin keymap // Detect non-Latin keymap
keyboard->non_latin_letters = SDL_TRUE; keyboard->thai_keyboard = SDL_FALSE;
keyboard->latin_letters = SDL_FALSE;
for (int i = SDL_SCANCODE_A; i <= SDL_SCANCODE_D; ++i) { for (int i = SDL_SCANCODE_A; i <= SDL_SCANCODE_D; ++i) {
if (SDL_GetKeymapKeycode(keymap, (SDL_Scancode)i, SDL_KMOD_NONE) <= 0xFF) { SDL_Keycode key = SDL_GetKeymapKeycode(keymap, (SDL_Scancode)i, SDL_KMOD_NONE);
keyboard->non_latin_letters = SDL_FALSE; if (key <= 0xFF) {
keyboard->latin_letters = SDL_TRUE;
break;
}
if (key >= 0x0E00 && key <= 0x0E7F) {
keyboard->thai_keyboard = SDL_TRUE;
break; break;
} }
} }
@ -437,15 +456,12 @@ SDL_Keycode SDL_GetKeyFromScancode(SDL_Scancode scancode, SDL_Keymod modstate, S
SDL_Keycode keycode; SDL_Keycode keycode;
if (key_event) { if (key_event) {
SDL_Keymap *keymap = SDL_GetCurrentKeymap();
SDL_bool numlock = (modstate & SDL_KMOD_NUM) != 0; SDL_bool numlock = (modstate & SDL_KMOD_NUM) != 0;
// We won't be applying any modifiers by default // We won't be applying any modifiers by default
modstate = SDL_KMOD_NONE; modstate = SDL_KMOD_NONE;
if ((keyboard->keycode_options & KEYCODE_OPTION_LATIN_LETTERS) &&
keyboard->non_latin_letters) {
keycode = SDL_GetKeymapKeycode(NULL, scancode, modstate);
} else {
if ((keyboard->keycode_options & KEYCODE_OPTION_FRENCH_NUMBERS) && if ((keyboard->keycode_options & KEYCODE_OPTION_FRENCH_NUMBERS) &&
keyboard->french_numbers && keyboard->french_numbers &&
(scancode >= SDL_SCANCODE_1 && scancode <= SDL_SCANCODE_0)) { (scancode >= SDL_SCANCODE_1 && scancode <= SDL_SCANCODE_0)) {
@ -453,14 +469,16 @@ SDL_Keycode SDL_GetKeyFromScancode(SDL_Scancode scancode, SDL_Keymod modstate, S
modstate |= SDL_KMOD_SHIFT; modstate |= SDL_KMOD_SHIFT;
} }
keycode = SDL_GetKeymapKeycode(keyboard->keymap, scancode, modstate); keycode = SDL_GetKeymapKeycode(keymap, scancode, modstate);
}
if (keyboard->keycode_options & KEYCODE_OPTION_HIDE_NUMPAD) { if (keyboard->keycode_options & KEYCODE_OPTION_HIDE_NUMPAD) {
keycode = SDL_ConvertNumpadKeycode(keycode, numlock); keycode = SDL_ConvertNumpadKeycode(keycode, numlock);
} }
} else { } else {
keycode = SDL_GetKeymapKeycode(keyboard->keymap, scancode, modstate); // Use the real keymap
SDL_Keymap *keymap = keyboard->keymap;
keycode = SDL_GetKeymapKeycode(keymap, scancode, modstate);
} }
return keycode; return keycode;
} }

18
src/events/SDL_keymap.c
View file

@ -1008,17 +1008,11 @@ const char *SDL_GetKeyName(SDL_Keycode key, SDL_bool uppercase)
// SDL_Keycode is defined as the unshifted key on the keyboard, // SDL_Keycode is defined as the unshifted key on the keyboard,
// but the key name is defined as the letter printed on that key, // but the key name is defined as the letter printed on that key,
// which is usually the shifted capital letter. // which is usually the shifted capital letter.
if (key >= 'a' && key <= 'z') { if (key > 0x7F || (key >= 'a' && key <= 'z')) {
key = 'A' + (key - 'a');
} else if (key > 0x7F) {
SDL_Keymap *keymap = SDL_GetCurrentKeymap(); SDL_Keymap *keymap = SDL_GetCurrentKeymap();
SDL_Scancode scancode = SDL_GetKeymapScancode(keymap, key, NULL); SDL_Keymod modstate;
if (scancode != SDL_SCANCODE_UNKNOWN) { SDL_Scancode scancode = SDL_GetKeymapScancode(keymap, key, &modstate);
if (key >= 0x0E00 && key <= 0x0E7F) { if (scancode != SDL_SCANCODE_UNKNOWN && !(modstate & SDL_KMOD_SHIFT)) {
// Thai keyboards are QWERTY plus Thai characters, so let's use the ASCII key names
return SDL_GetScancodeName(scancode);
}
SDL_Keycode capital = SDL_GetKeymapKeycode(keymap, scancode, SDL_KMOD_SHIFT); SDL_Keycode capital = SDL_GetKeymapKeycode(keymap, scancode, SDL_KMOD_SHIFT);
if (capital > 0x7F || (capital >= 'A' && capital <= 'Z')) { if (capital > 0x7F || (capital >= 'A' && capital <= 'Z')) {
key = capital; key = capital;
@ -1083,9 +1077,6 @@ SDL_Keycode SDL_GetKeyFromName(const char *name, SDL_bool uppercase)
// SDL_Keycode is defined as the unshifted key on the keyboard, // SDL_Keycode is defined as the unshifted key on the keyboard,
// but the key name is defined as the letter printed on that key, // but the key name is defined as the letter printed on that key,
// which is usually the shifted capital letter. // which is usually the shifted capital letter.
if (key >= 'A' && key <= 'Z') {
key = 'a' + (key - 'A');
} else if (key > 0x7F) {
SDL_Keymap *keymap = SDL_GetCurrentKeymap(); SDL_Keymap *keymap = SDL_GetCurrentKeymap();
SDL_Keymod modstate; SDL_Keymod modstate;
SDL_Scancode scancode = SDL_GetKeymapScancode(keymap, key, &modstate); SDL_Scancode scancode = SDL_GetKeymapScancode(keymap, key, &modstate);
@ -1093,7 +1084,6 @@ SDL_Keycode SDL_GetKeyFromName(const char *name, SDL_bool uppercase)
key = SDL_GetKeymapKeycode(keymap, scancode, SDL_KMOD_NONE); key = SDL_GetKeymapKeycode(keymap, scancode, SDL_KMOD_NONE);
} }
} }
}
return key; return key;
} }