Change SDL_Keycode type to an enum

This commit is contained in:
Susko3
2024-03-06 19:35:18 +01:00
committed by Sam Lantinga
parent f8844d387c
commit f8cb3c742d
8 changed files with 30 additions and 21 deletions

View File

@@ -1671,7 +1671,7 @@ static void SDLTest_PrintEvent(const SDL_Event *event)
SDL_strlcpy(modstr, "NONE", sizeof (modstr));
}
SDL_Log("SDL EVENT: Keyboard: key %s in window %" SDL_PRIu32 ": scancode 0x%08X = %s, keycode 0x%08" SDL_PRIX32 " = %s, mods = %s",
SDL_Log("SDL EVENT: Keyboard: key %s in window %" SDL_PRIu32 ": scancode 0x%08X = %s, keycode 0x%08X = %s, mods = %s",
(event->type == SDL_EVENT_KEY_DOWN) ? "pressed" : "released",
event->key.windowID,
event->key.keysym.scancode,

View File

@@ -516,6 +516,8 @@ static SDL_Keycode Emscripten_MapKeyCode(const EmscriptenKeyboardEvent *keyEvent
case SDLK_LGUI:
keycode = SDLK_RGUI;
break;
default:
break;
}
} else if (keyEvent->location == DOM_KEY_LOCATION_NUMPAD) {
switch (keycode) {
@@ -564,6 +566,8 @@ static SDL_Keycode Emscripten_MapKeyCode(const EmscriptenKeyboardEvent *keyEvent
case SDLK_DELETE:
keycode = SDLK_KP_PERIOD;
break;
default:
break;
}
}
}

View File

@@ -1381,7 +1381,7 @@ static void Wayland_ReconcileModifiers(struct SDL_WaylandInput *input)
static void Wayland_HandleModifierKeys(struct SDL_WaylandInput *input, SDL_Scancode scancode, SDL_bool pressed)
{
const SDL_KeyCode keycode = SDL_GetKeyFromScancode(scancode);
const SDL_Keycode keycode = SDL_GetKeyFromScancode(scancode);
SDL_Keymod mod;
switch (keycode) {
@@ -1458,7 +1458,7 @@ static void keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
wl_array_for_each (key, keys) {
const SDL_Scancode scancode = Wayland_get_scancode_from_key(input, *key + 8);
const SDL_KeyCode keycode = SDL_GetKeyFromScancode(scancode);
const SDL_Keycode keycode = SDL_GetKeyFromScancode(scancode);
switch (keycode) {
case SDLK_LSHIFT: