mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-14 13:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Handle the relative pointer manager appearing after the seat has been initialized

Browse Source
This commit is contained in:
Frank Praznik
2024-12-19 14:26:51 -05:00
parent 4bfc8f84f7
commit 7c8171da92
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1944,6 +1944,22 @@ static const struct wl_keyboard_listener keyboard_listener = {
keyboard_handle_repeat_info, // Version 4 keyboard_handle_repeat_info, // Version 4
}; };
void Wayland_input_init_relative_pointer(SDL_VideoData *d)
{
struct SDL_WaylandInput *input = d->input;
if (!d->relative_pointer_manager) {
return;
}
if (input->pointer && !input->relative_pointer) {
input->relative_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(input->display->relative_pointer_manager, input->pointer);
zwp_relative_pointer_v1_add_listener(input->relative_pointer,
&relative_pointer_listener,
input);
}
}
static void seat_handle_capabilities(void *data, struct wl_seat *seat, static void seat_handle_capabilities(void *data, struct wl_seat *seat,
enum wl_seat_capability caps) enum wl_seat_capability caps)
{ {
@@ -1959,12 +1975,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
wl_pointer_set_user_data(input->pointer, input); wl_pointer_set_user_data(input->pointer, input);
wl_pointer_add_listener(input->pointer, &pointer_listener, input); wl_pointer_add_listener(input->pointer, &pointer_listener, input);
if (input->display->relative_pointer_manager) { Wayland_input_init_relative_pointer(input->display);
input->relative_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(input->display->relative_pointer_manager, input->pointer);
zwp_relative_pointer_v1_add_listener(input->relative_pointer,
&relative_pointer_listener,
input);
}
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, true);

1
src/video/wayland/SDL_waylandevents_c.h
View File

@@ -162,6 +162,7 @@ extern void Wayland_create_text_input(SDL_VideoData *d);
extern void Wayland_input_initialize_seat(SDL_VideoData *d); extern void Wayland_input_initialize_seat(SDL_VideoData *d);
extern void Wayland_display_destroy_input(SDL_VideoData *d); extern void Wayland_display_destroy_input(SDL_VideoData *d);
extern void Wayland_input_init_relative_pointer(SDL_VideoData *d);
extern bool Wayland_input_enable_relative_pointer(struct SDL_WaylandInput *input); extern bool Wayland_input_enable_relative_pointer(struct SDL_WaylandInput *input);
extern bool Wayland_input_disable_relative_pointer(struct SDL_WaylandInput *input); extern bool Wayland_input_disable_relative_pointer(struct SDL_WaylandInput *input);

1
src/video/wayland/SDL_waylandvideo.c
View File

@@ -1224,6 +1224,7 @@ static void display_handle_global(void *data, struct wl_registry *registry, uint
d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1); d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
} else if (SDL_strcmp(interface, "zwp_relative_pointer_manager_v1") == 0) { } else if (SDL_strcmp(interface, "zwp_relative_pointer_manager_v1") == 0) {
d->relative_pointer_manager = wl_registry_bind(d->registry, id, &zwp_relative_pointer_manager_v1_interface, 1); d->relative_pointer_manager = wl_registry_bind(d->registry, id, &zwp_relative_pointer_manager_v1_interface, 1);
Wayland_input_init_relative_pointer(d);
} else if (SDL_strcmp(interface, "zwp_pointer_constraints_v1") == 0) { } else if (SDL_strcmp(interface, "zwp_pointer_constraints_v1") == 0) {
d->pointer_constraints = wl_registry_bind(d->registry, id, &zwp_pointer_constraints_v1_interface, 1); d->pointer_constraints = wl_registry_bind(d->registry, id, &zwp_pointer_constraints_v1_interface, 1);
} else if (SDL_strcmp(interface, "zwp_keyboard_shortcuts_inhibit_manager_v1") == 0) { } else if (SDL_strcmp(interface, "zwp_keyboard_shortcuts_inhibit_manager_v1") == 0) {