geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Use SDL_SetKeymap() to set the default keymap 

This ensures the AZERTY workaround is applied for backends that
never call SDL_SetKeymap() themselves.
main
Cameron Gutman 2022-07-31 16:10:10 -05:00 committed by Sam Lantinga
parent 8b438f7b51
commit 9515fb2501
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/events/SDL_keyboard.c
View File

@ -560,11 +560,9 @@ SDL_UCS4ToUTF8(Uint32 ch, char *dst)
int
SDL_KeyboardInit(void)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
/* Set the default keymap */
SDL_memcpy(keyboard->keymap, SDL_default_keymap, sizeof(SDL_default_keymap));
return (0);
SDL_SetKeymap(0, SDL_default_keymap, SDL_NUM_SCANCODES, SDL_FALSE);
return 0;
}
void
@ -590,7 +588,7 @@ SDL_GetDefaultKeymap(SDL_Keycode * keymap)
}
void
SDL_SetKeymap(int start, SDL_Keycode * keys, int length, SDL_bool send_event)
SDL_SetKeymap(int start, const SDL_Keycode * keys, int length, SDL_bool send_event)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
SDL_Scancode scancode;

2
src/events/SDL_keyboard_c.h
View File

@ -33,7 +33,7 @@ extern int SDL_KeyboardInit(void);
extern void SDL_GetDefaultKeymap(SDL_Keycode * keymap);
/* Set the mapping of scancode to key codes */
extern void SDL_SetKeymap(int start, SDL_Keycode * keys, int length, SDL_bool send_event);
extern void SDL_SetKeymap(int start, const SDL_Keycode * keys, int length, SDL_bool send_event);
/* Set a platform-dependent key name, overriding the default platform-agnostic
name. Encoded as UTF-8. The string is not copied, thus the pointer given to