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

Prepend key modifier enum values with 'SDL_'

Browse source
This commit is contained in:
Frank Praznik 2022-12-23 20:52:46 -05:00 • committed by Sam Lantinga
parent b7ac14f2bd
commit abdfa809db
23 changed files with 280 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/events/SDL_keyboard.c
View file

@ -850,46 +850,46 @@ static int SDL_SendKeyboardKeyInternal(Uint64 timestamp, Uint8 source, Uint8 sta
/* Update modifiers state if applicable */
switch (keycode) {
case SDLK_LCTRL:
modifier = KMOD_LCTRL;
modifier = SDL_KMOD_LCTRL;
break;
case SDLK_RCTRL:
modifier = KMOD_RCTRL;
modifier = SDL_KMOD_RCTRL;
break;
case SDLK_LSHIFT:
modifier = KMOD_LSHIFT;
modifier = SDL_KMOD_LSHIFT;
break;
case SDLK_RSHIFT:
modifier = KMOD_RSHIFT;
modifier = SDL_KMOD_RSHIFT;
break;
case SDLK_LALT:
modifier = KMOD_LALT;
modifier = SDL_KMOD_LALT;
break;
case SDLK_RALT:
modifier = KMOD_RALT;
modifier = SDL_KMOD_RALT;
break;
case SDLK_LGUI:
modifier = KMOD_LGUI;
modifier = SDL_KMOD_LGUI;
break;
case SDLK_RGUI:
modifier = KMOD_RGUI;
modifier = SDL_KMOD_RGUI;
break;
case SDLK_MODE:
modifier = KMOD_MODE;
modifier = SDL_KMOD_MODE;
break;
default:
modifier = KMOD_NONE;
modifier = SDL_KMOD_NONE;
break;
}
if (SDL_KEYDOWN == type) {
switch (keycode) {
case SDLK_NUMLOCKCLEAR:
keyboard->modstate ^= KMOD_NUM;
keyboard->modstate ^= SDL_KMOD_NUM;
break;
case SDLK_CAPSLOCK:
keyboard->modstate ^= KMOD_CAPS;
keyboard->modstate ^= SDL_KMOD_CAPS;
break;
case SDLK_SCROLLLOCK:
keyboard->modstate ^= KMOD_SCROLL;
keyboard->modstate ^= SDL_KMOD_SCROLL;
break;
default:
keyboard->modstate |= modifier;
@ -919,7 +919,7 @@ static int SDL_SendKeyboardKeyInternal(Uint64 timestamp, Uint8 source, Uint8 sta
has explicitly opted out of this behavior. */
if (keycode == SDLK_TAB &&
state == SDL_PRESSED &&
(keyboard->modstate & KMOD_ALT) &&
(keyboard->modstate & SDL_KMOD_ALT) &&
keyboard->focus &&
(keyboard->focus->flags & SDL_WINDOW_KEYBOARD_GRABBED) &&
(keyboard->focus->flags & SDL_WINDOW_FULLSCREEN) &&
@ -942,7 +942,7 @@ int SDL_SendKeyboardUnicodeKey(Uint64 timestamp, Uint32 ch)
mod = SDL_ASCIIKeyInfoTable[ch].mod;
}
if (mod & KMOD_SHIFT) {
if (mod & SDL_KMOD_SHIFT) {
/* If the character uses shift, press shift down */
SDL_SendKeyboardKey(timestamp, SDL_PRESSED, SDL_SCANCODE_LSHIFT);
}
@ -951,7 +951,7 @@ int SDL_SendKeyboardUnicodeKey(Uint64 timestamp, Uint32 ch)
SDL_SendKeyboardKey(timestamp, SDL_PRESSED, code);
SDL_SendKeyboardKey(timestamp, SDL_RELEASED, code);
if (mod & KMOD_SHIFT) {
if (mod & SDL_KMOD_SHIFT) {
/* If the character uses shift, release shift */
SDL_SendKeyboardKey(timestamp, SDL_RELEASED, SDL_SCANCODE_LSHIFT);
}