ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Wayland) Ignore mouse clicks on window decoration (#13412)

This commit is contained in:
Colin Kinloch 2021-12-25 03:08:22 +00:00 committed by GitHub
parent 9e208198f2
commit 0168fe0303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/common/wayland_common.c
View File

@ -162,6 +162,7 @@ static void pointer_handle_enter(void *data,
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
wl->input.mouse.surface = surface;
wl->input.mouse.last_x = wl_fixed_to_int(sx * (wl_fixed_t)wl->buffer_scale); wl->input.mouse.last_x = wl_fixed_to_int(sx * (wl_fixed_t)wl->buffer_scale);
wl->input.mouse.last_y = wl_fixed_to_int(sy * (wl_fixed_t)wl->buffer_scale); wl->input.mouse.last_y = wl_fixed_to_int(sy * (wl_fixed_t)wl->buffer_scale);
wl->input.mouse.x = wl->input.mouse.last_x; wl->input.mouse.x = wl->input.mouse.last_x;
@ -179,6 +180,9 @@ static void pointer_handle_leave(void *data,
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
wl->input.mouse.focus = false; wl->input.mouse.focus = false;
if (wl->input.mouse.surface == surface)
wl->input.mouse.surface = NULL;
} }
static void pointer_handle_motion(void *data, static void pointer_handle_motion(void *data,
@ -203,6 +207,9 @@ static void pointer_handle_button(void *data,
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (wl->input.mouse.surface != wl->surface)
return;
if (state == WL_POINTER_BUTTON_STATE_PRESSED) if (state == WL_POINTER_BUTTON_STATE_PRESSED)
{ {
switch (button) switch (button)
@ -451,6 +458,8 @@ static void wl_surface_enter(void *data, struct wl_surface *wl_surface,
output_info_t *oi; output_info_t *oi;
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
wl->input.mouse.surface = wl_surface;
/* TODO: track all outputs the surface is on, pick highest scale */ /* TODO: track all outputs the surface is on, pick highest scale */
wl_list_for_each(oi, &wl->all_outputs, link) wl_list_for_each(oi, &wl->all_outputs, link)

1
input/common/wayland_common.h
View File

@ -96,6 +96,7 @@ typedef struct input_ctx_wayland_data
struct struct
{ {
struct wl_pointer *surface;
int last_x, last_y; int last_x, last_y;
int x, y; int x, y;
int delta_x, delta_y; int delta_x, delta_y;