geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Don't modify the mouse capture flag in relative mode 

If relative mouse mode is explicitly enabled, don't modify the capture flag on button events or the window might report having lost mouse focus if a button is pressed while moving the cursor.
main
Frank Praznik 2022-10-31 12:23:51 -04:00 committed by Sam Lantinga
parent a66cb8cf21
commit 33a430056f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,6 +590,7 @@ pointer_handle_button_common(struct SDL_WaylandInput *input, uint32_t serial,
uint32_t time, uint32_t button, uint32_t state_w) uint32_t time, uint32_t button, uint32_t state_w)
{ {
SDL_WindowData *window = input->pointer_focus; SDL_WindowData *window = input->pointer_focus;
SDL_VideoData *viddata = window->waylandData;
enum wl_pointer_button_state state = state_w; enum wl_pointer_button_state state = state_w;
uint32_t sdl_button; uint32_t sdl_button;
@ -628,11 +629,14 @@ pointer_handle_button_common(struct SDL_WaylandInput *input, uint32_t serial,
input->buttons_pressed &= ~(SDL_BUTTON(sdl_button)); input->buttons_pressed &= ~(SDL_BUTTON(sdl_button));
} }
/* Don't modify the capture flag in relative mode. */
if (!viddata->relative_mouse_mode) {
if (input->buttons_pressed != 0) { if (input->buttons_pressed != 0) {
window->sdlwindow->flags |= SDL_WINDOW_MOUSE_CAPTURE; window->sdlwindow->flags |= SDL_WINDOW_MOUSE_CAPTURE;
} else { } else {
window->sdlwindow->flags &= ~SDL_WINDOW_MOUSE_CAPTURE; window->sdlwindow->flags &= ~SDL_WINDOW_MOUSE_CAPTURE;
} }
}
Wayland_data_device_set_serial(input->data_device, serial); Wayland_data_device_set_serial(input->data_device, serial);
Wayland_primary_selection_device_set_serial(input->primary_selection_device, serial); Wayland_primary_selection_device_set_serial(input->primary_selection_device, serial);