brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Refactor pointer grab checks

Browse Source 
Move the bulk of the implementation inside MetaWaylandPointer
files, like it happens in other places (e.g. MetaWaylandTabletSeat).
This avoids MetaWaylandPointer struct peeking from outside.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3627>
This commit is contained in:
Carlos Garnacho 2024-02-27 13:06:24 +01:00 committed by Marge Bot
parent 84d48254d7
commit 03b504fc38
3 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wayland/meta-wayland-pointer.c
View File

@ -1259,7 +1259,7 @@ pointer_can_grab_surface (MetaWaylandPointer *pointer,
return FALSE; return FALSE;
} }
gboolean static gboolean
meta_wayland_pointer_can_grab_surface (MetaWaylandPointer *pointer, meta_wayland_pointer_can_grab_surface (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
uint32_t serial) uint32_t serial)
@ -1268,6 +1268,32 @@ meta_wayland_pointer_can_grab_surface (MetaWaylandPointer *pointer,
pointer_can_grab_surface (pointer, surface)); pointer_can_grab_surface (pointer, surface));
} }
gboolean
meta_wayland_pointer_get_grab_info (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface,
uint32_t serial,
gboolean require_pressed,
ClutterInputDevice **device_out,
float *x,
float *y)
{
if ((!require_pressed || pointer->button_count > 0) &&
meta_wayland_pointer_can_grab_surface (pointer, surface, serial))
{
if (device_out)
*device_out = pointer->device;
if (x)
*x = pointer->grab_x;
if (y)
*y = pointer->grab_y;
return TRUE;
}
return FALSE;
}
gboolean gboolean
meta_wayland_pointer_can_popup (MetaWaylandPointer *pointer, uint32_t serial) meta_wayland_pointer_can_popup (MetaWaylandPointer *pointer, uint32_t serial)
{ {

10
src/wayland/meta-wayland-pointer.h
View File

@ -100,9 +100,13 @@ void meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
struct wl_resource *seat_resource, struct wl_resource *seat_resource,
uint32_t id); uint32_t id);
gboolean meta_wayland_pointer_can_grab_surface (MetaWaylandPointer *pointer, gboolean meta_wayland_pointer_get_grab_info (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
uint32_t serial); uint32_t serial,
gboolean require_pressed,
ClutterInputDevice **device_out,
float *x,
float *y);
gboolean meta_wayland_pointer_can_popup (MetaWaylandPointer *pointer, gboolean meta_wayland_pointer_can_popup (MetaWaylandPointer *pointer,
uint32_t serial); uint32_t serial);

26
src/wayland/meta-wayland-seat.c
View File

@ -601,23 +601,17 @@ meta_wayland_seat_get_grab_info (MetaWaylandSeat *seat,
} }
} }
if (meta_wayland_seat_has_pointer (seat)) if (meta_wayland_seat_has_pointer (seat) &&
meta_wayland_pointer_get_grab_info (seat->pointer,
surface,
serial,
require_pressed,
device_out,
x, y))
{ {
if ((!require_pressed || seat->pointer->button_count > 0) && if (sequence_out)
meta_wayland_pointer_can_grab_surface (seat->pointer, surface, serial)) *sequence_out = NULL;
{ return TRUE;
if (device_out)
*device_out = seat->pointer->device;
if (sequence_out)
*sequence_out = NULL;
if (x)
*x = seat->pointer->grab_x;
if (y)
*y = seat->pointer->grab_y;
return TRUE;
}
} }
if (meta_wayland_tablet_seat_get_grab_info (seat->tablet_seat, if (meta_wayland_tablet_seat_get_grab_info (seat->tablet_seat,