encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: defer pointer confine creation until pointer unlock 

It is a protocol error to attempt to create a pointer confine (i.e.
`SDL_SetWindowGrab`) while a locked pointer is active, and vice-versa.
Instead of aborting due to a protocol error, this commit makes SDL
gracefully downgrade locked pointers to confines when appropriate.
This commit is contained in:
Tudor Brindus 2020-07-21 13:14:24 -04:00
parent a720d1a294
commit c094332825
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ struct SDL_WaylandInput {
SDL_WaylandDataDevice *data_device; SDL_WaylandDataDevice *data_device;
struct zwp_relative_pointer_v1 *relative_pointer; struct zwp_relative_pointer_v1 *relative_pointer;
struct zwp_confined_pointer_v1 *confined_pointer; struct zwp_confined_pointer_v1 *confined_pointer;
SDL_Window *confined_pointer_window;
SDL_WindowData *pointer_focus; SDL_WindowData *pointer_focus;
SDL_WindowData *keyboard_focus; SDL_WindowData *keyboard_focus;
@ -1211,6 +1212,14 @@ lock_pointer_to_window(SDL_Window *window,
w->locked_pointer = locked_pointer; w->locked_pointer = locked_pointer;
} }
static void pointer_confine_destroy(struct SDL_WaylandInput *input)
{
if (input->confined_pointer) {
zwp_confined_pointer_v1_destroy(input->confined_pointer);
input->confined_pointer = NULL;
}
}
int Wayland_input_lock_pointer(struct SDL_WaylandInput *input) int Wayland_input_lock_pointer(struct SDL_WaylandInput *input)
{ {
SDL_VideoDevice *vd = SDL_GetVideoDevice(); SDL_VideoDevice *vd = SDL_GetVideoDevice();
@ -1227,6 +1236,10 @@ int Wayland_input_lock_pointer(struct SDL_WaylandInput *input)
if (!input->pointer) if (!input->pointer)
return -1; return -1;
/* If we have a pointer confine active, we must destroy it here because
* creating a locked pointer otherwise would be a protocol error. */
pointer_confine_destroy(input);
if (!input->relative_pointer) { if (!input->relative_pointer) {
relative_pointer = relative_pointer =
zwp_relative_pointer_manager_v1_get_relative_pointer( zwp_relative_pointer_manager_v1_get_relative_pointer(
@ -1265,6 +1278,9 @@ int Wayland_input_unlock_pointer(struct SDL_WaylandInput *input)
d->relative_mouse_mode = 0; d->relative_mouse_mode = 0;
if (input->confined_pointer_window)
Wayland_input_confine_pointer(input->confined_pointer_window, input);
return 0; return 0;
} }
@ -1302,6 +1318,13 @@ int Wayland_input_confine_pointer(SDL_Window *window, struct SDL_WaylandInput *i
if (input->confined_pointer) if (input->confined_pointer)
Wayland_input_unconfine_pointer(input); Wayland_input_unconfine_pointer(input);
input->confined_pointer_window = window;
/* We cannot create a confine if the pointer is already locked. Defer until
* the pointer is unlocked. */
if (d->relative_mouse_mode)
return 0;
confined_pointer = confined_pointer =
zwp_pointer_constraints_v1_confine_pointer(d->pointer_constraints, zwp_pointer_constraints_v1_confine_pointer(d->pointer_constraints,
w->surface, w->surface,
@ -1318,11 +1341,8 @@ int Wayland_input_confine_pointer(SDL_Window *window, struct SDL_WaylandInput *i
int Wayland_input_unconfine_pointer(struct SDL_WaylandInput *input) int Wayland_input_unconfine_pointer(struct SDL_WaylandInput *input)
{ {
if (input->confined_pointer) { pointer_confine_destroy(input);
zwp_confined_pointer_v1_destroy(input->confined_pointer); input->confined_pointer_window = NULL;
input->confined_pointer = NULL;
}
return 0; return 0;
} }