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

Make sure the window is valid in SDL_SetKeyboardFocus()

Browse source
This commit is contained in:
Sam Lantinga 2023-03-03 09:09:11 -08:00
parent f1c3d3be97
commit e3d90c694c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/events/SDL_keyboard.c
View file

@ -746,10 +746,17 @@ SDL_GetKeyboardFocus(void)
return keyboard->focus; return keyboard->focus;
} }
void SDL_SetKeyboardFocus(SDL_Window *window) int SDL_SetKeyboardFocus(SDL_Window *window)
{ {
SDL_VideoDevice *video = SDL_GetVideoDevice();
SDL_Keyboard *keyboard = &SDL_keyboard; SDL_Keyboard *keyboard = &SDL_keyboard;
if (window) {
if (!video || window->magic != &video->window_magic || window->is_destroying) {
return SDL_SetError("Invalid window");
}
}
if (keyboard->focus && window == NULL) { if (keyboard->focus && window == NULL) {
/* We won't get anymore keyboard messages, so reset keyboard state */ /* We won't get anymore keyboard messages, so reset keyboard state */
SDL_ResetKeyboard(); SDL_ResetKeyboard();
@ -773,7 +780,6 @@ void SDL_SetKeyboardFocus(SDL_Window *window)
/* Ensures IME compositions are committed */ /* Ensures IME compositions are committed */
if (SDL_EventEnabled(SDL_EVENT_TEXT_INPUT)) { if (SDL_EventEnabled(SDL_EVENT_TEXT_INPUT)) {
SDL_VideoDevice *video = SDL_GetVideoDevice();
if (video && video->StopTextInput) { if (video && video->StopTextInput) {
video->StopTextInput(video); video->StopTextInput(video);
} }
@ -793,6 +799,7 @@ void SDL_SetKeyboardFocus(SDL_Window *window)
} }
} }
} }
return 0;
} }
static int SDL_SendKeyboardKeyInternal(Uint64 timestamp, SDL_KeyboardFlags flags, Uint8 state, SDL_Scancode scancode, SDL_Keycode keycode) static int SDL_SendKeyboardKeyInternal(Uint64 timestamp, SDL_KeyboardFlags flags, Uint8 state, SDL_Scancode scancode, SDL_Keycode keycode)

2
src/events/SDL_keyboard_c.h
View file

@ -42,7 +42,7 @@ extern void SDL_SetKeymap(int start, const SDL_Keycode *keys, int length, SDL_bo
extern void SDL_SetScancodeName(SDL_Scancode scancode, const char *name); extern void SDL_SetScancodeName(SDL_Scancode scancode, const char *name);
/* Set the keyboard focus window */ /* Set the keyboard focus window */
extern void SDL_SetKeyboardFocus(SDL_Window *window); extern int SDL_SetKeyboardFocus(SDL_Window *window);
/* Send a character from an on-screen keyboard as scancode and modifier key events, /* Send a character from an on-screen keyboard as scancode and modifier key events,
currently assuming ASCII characters on a US keyboard layout currently assuming ASCII characters on a US keyboard layout