gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't send keyboard and mouse added events during initialization

Browse Source 
Only send them when a device is added post-initialization, as is done on other platforms.
This commit is contained in:
Frank Praznik
2025-01-28 13:02:29 -05:00
parent 2a946e91bc
commit 48f5550651
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/wayland/SDL_waylandevents.c
View File

@@ -1987,7 +1987,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
Wayland_input_init_relative_pointer(input->display); Wayland_input_init_relative_pointer(input->display);
input->pointer_id = SDL_GetNextObjectID(); input->pointer_id = SDL_GetNextObjectID();
SDL_AddMouse(input->pointer_id, WAYLAND_DEFAULT_POINTER_NAME, true); SDL_AddMouse(input->pointer_id, WAYLAND_DEFAULT_POINTER_NAME, !input->display->initializing);
} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) { } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
if (input->relative_pointer) { if (input->relative_pointer) {
zwp_relative_pointer_v1_destroy(input->relative_pointer); zwp_relative_pointer_v1_destroy(input->relative_pointer);
@@ -2028,7 +2028,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
input); input);
input->keyboard_id = SDL_GetNextObjectID(); input->keyboard_id = SDL_GetNextObjectID();
SDL_AddKeyboard(input->keyboard_id, WAYLAND_DEFAULT_KEYBOARD_NAME, true); SDL_AddKeyboard(input->keyboard_id, WAYLAND_DEFAULT_KEYBOARD_NAME, !input->display->initializing);
} else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) { } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) {
wl_keyboard_destroy(input->keyboard); wl_keyboard_destroy(input->keyboard);
input->keyboard = NULL; input->keyboard = NULL;