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

wayland: Set the keyboard and mouse names to match XWayland

Browse Source
This commit is contained in:
Frank Praznik
2024-03-23 16:57:38 -04:00
committed by Sam Lantinga
parent 72fc6f86e5
commit 87714ce5b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,9 @@
#define XKB_MOD_NAME_MODE "Mod5" #define XKB_MOD_NAME_MODE "Mod5"
#endif #endif
/* Keyboard and mouse names to match XWayland */
#define WAYLAND_DEFAULT_KEYBOARD_NAME "Virtual core keyboard"
#define WAYLAND_DEFAULT_POINTER_NAME "Virtual core pointer"
struct SDL_WaylandTouchPoint struct SDL_WaylandTouchPoint
{ {
@@ -1715,7 +1718,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
wl_pointer_add_listener(input->pointer, &pointer_listener, input); wl_pointer_add_listener(input->pointer, &pointer_listener, input);
input->pointer_id = SDL_GetNextObjectID(); input->pointer_id = SDL_GetNextObjectID();
SDL_AddMouse(input->pointer_id, NULL, SDL_TRUE); SDL_AddMouse(input->pointer_id, WAYLAND_DEFAULT_POINTER_NAME, SDL_TRUE);
} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) { } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
if (input->cursor_shape) { if (input->cursor_shape) {
wp_cursor_shape_device_v1_destroy(input->cursor_shape); wp_cursor_shape_device_v1_destroy(input->cursor_shape);
@@ -1748,7 +1751,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, NULL, SDL_TRUE); SDL_AddKeyboard(input->keyboard_id, WAYLAND_DEFAULT_KEYBOARD_NAME, SDL_TRUE);
} 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;