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

wayland: Avoid MetaWaylandPointer struct peeking in touchpad gestures

Browse Source 
Use getters for the MetaWaylandPointerClient and MetaWaylandSurface for
the logical focus.

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

10
src/wayland/meta-wayland-pointer-gesture-hold.c
View File

@ -35,10 +35,12 @@ handle_hold_begin (MetaWaylandPointer *pointer,
{ {
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
MetaWaylandSeat *seat; MetaWaylandSeat *seat;
MetaWaylandSurface *focus_surface;
struct wl_resource *resource; struct wl_resource *resource;
uint32_t serial, fingers; uint32_t serial, fingers;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
focus_surface = meta_wayland_pointer_get_focus_surface (pointer);
seat = meta_wayland_pointer_get_seat (pointer); seat = meta_wayland_pointer_get_seat (pointer);
serial = wl_display_next_serial (seat->wl_display); serial = wl_display_next_serial (seat->wl_display);
fingers = clutter_event_get_touchpad_gesture_finger_count (event); fingers = clutter_event_get_touchpad_gesture_finger_count (event);
@ -49,7 +51,7 @@ handle_hold_begin (MetaWaylandPointer *pointer,
{ {
zwp_pointer_gesture_hold_v1_send_begin (resource, serial, zwp_pointer_gesture_hold_v1_send_begin (resource, serial,
clutter_event_get_time (event), clutter_event_get_time (event),
pointer->focus_surface->resource, focus_surface->resource,
fingers); fingers);
} }
} }
@ -63,7 +65,7 @@ broadcast_end (MetaWaylandPointer *pointer,
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
struct wl_resource *resource; struct wl_resource *resource;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
wl_resource_for_each (resource, &pointer_client->hold_gesture_resources) wl_resource_for_each (resource, &pointer_client->hold_gesture_resources)
{ {
@ -101,7 +103,7 @@ meta_wayland_pointer_gesture_hold_handle_event (MetaWaylandPointer *pointer,
if (clutter_event_type (event) != CLUTTER_TOUCHPAD_HOLD) if (clutter_event_type (event) != CLUTTER_TOUCHPAD_HOLD)
return FALSE; return FALSE;
if (!pointer->focus_client) if (!meta_wayland_pointer_get_focus_client (pointer))
return FALSE; return FALSE;
switch (clutter_event_get_gesture_phase (event)) switch (clutter_event_get_gesture_phase (event))

12
src/wayland/meta-wayland-pointer-gesture-pinch.c
View File

@ -37,10 +37,12 @@ handle_pinch_begin (MetaWaylandPointer *pointer,
{ {
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
MetaWaylandSeat *seat; MetaWaylandSeat *seat;
MetaWaylandSurface *focus_surface;
struct wl_resource *resource; struct wl_resource *resource;
uint32_t serial, fingers; uint32_t serial, fingers;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
focus_surface = meta_wayland_pointer_get_focus_surface (pointer);
seat = meta_wayland_pointer_get_seat (pointer); seat = meta_wayland_pointer_get_seat (pointer);
serial = wl_display_next_serial (seat->wl_display); serial = wl_display_next_serial (seat->wl_display);
fingers = clutter_event_get_touchpad_gesture_finger_count (event); fingers = clutter_event_get_touchpad_gesture_finger_count (event);
@ -51,7 +53,7 @@ handle_pinch_begin (MetaWaylandPointer *pointer,
{ {
zwp_pointer_gesture_pinch_v1_send_begin (resource, serial, zwp_pointer_gesture_pinch_v1_send_begin (resource, serial,
clutter_event_get_time (event), clutter_event_get_time (event),
pointer->focus_surface->resource, focus_surface->resource,
fingers); fingers);
} }
} }
@ -64,7 +66,7 @@ handle_pinch_update (MetaWaylandPointer *pointer,
struct wl_resource *resource; struct wl_resource *resource;
gdouble dx, dy, scale, rotation; gdouble dx, dy, scale, rotation;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
clutter_event_get_gesture_motion_delta (event, &dx, &dy); clutter_event_get_gesture_motion_delta (event, &dx, &dy);
rotation = clutter_event_get_gesture_pinch_angle_delta (event); rotation = clutter_event_get_gesture_pinch_angle_delta (event);
scale = clutter_event_get_gesture_pinch_scale (event); scale = clutter_event_get_gesture_pinch_scale (event);
@ -89,7 +91,7 @@ broadcast_end (MetaWaylandPointer *pointer,
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
struct wl_resource *resource; struct wl_resource *resource;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources) wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
{ {
@ -127,7 +129,7 @@ meta_wayland_pointer_gesture_pinch_handle_event (MetaWaylandPointer *pointer,
if (clutter_event_type (event) != CLUTTER_TOUCHPAD_PINCH) if (clutter_event_type (event) != CLUTTER_TOUCHPAD_PINCH)
return FALSE; return FALSE;
if (!pointer->focus_client) if (!meta_wayland_pointer_get_focus_client (pointer))
return FALSE; return FALSE;
switch (clutter_event_get_gesture_phase (event)) switch (clutter_event_get_gesture_phase (event))

12
src/wayland/meta-wayland-pointer-gesture-swipe.c
View File

@ -37,10 +37,12 @@ handle_swipe_begin (MetaWaylandPointer *pointer,
{ {
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
MetaWaylandSeat *seat; MetaWaylandSeat *seat;
MetaWaylandSurface *focus_surface;
struct wl_resource *resource; struct wl_resource *resource;
uint32_t serial, fingers; uint32_t serial, fingers;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
focus_surface = meta_wayland_pointer_get_focus_surface (pointer);
seat = meta_wayland_pointer_get_seat (pointer); seat = meta_wayland_pointer_get_seat (pointer);
serial = wl_display_next_serial (seat->wl_display); serial = wl_display_next_serial (seat->wl_display);
fingers = clutter_event_get_touchpad_gesture_finger_count (event); fingers = clutter_event_get_touchpad_gesture_finger_count (event);
@ -51,7 +53,7 @@ handle_swipe_begin (MetaWaylandPointer *pointer,
{ {
zwp_pointer_gesture_swipe_v1_send_begin (resource, serial, zwp_pointer_gesture_swipe_v1_send_begin (resource, serial,
clutter_event_get_time (event), clutter_event_get_time (event),
pointer->focus_surface->resource, focus_surface->resource,
fingers); fingers);
} }
} }
@ -64,7 +66,7 @@ handle_swipe_update (MetaWaylandPointer *pointer,
struct wl_resource *resource; struct wl_resource *resource;
gdouble dx, dy; gdouble dx, dy;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
clutter_event_get_gesture_motion_delta (event, &dx, &dy); clutter_event_get_gesture_motion_delta (event, &dx, &dy);
wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources) wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
@ -85,7 +87,7 @@ broadcast_end (MetaWaylandPointer *pointer,
MetaWaylandPointerClient *pointer_client; MetaWaylandPointerClient *pointer_client;
struct wl_resource *resource; struct wl_resource *resource;
pointer_client = pointer->focus_client; pointer_client = meta_wayland_pointer_get_focus_client (pointer);
wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources) wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
{ {
@ -123,7 +125,7 @@ meta_wayland_pointer_gesture_swipe_handle_event (MetaWaylandPointer *pointer,
if (clutter_event_type (event) != CLUTTER_TOUCHPAD_SWIPE) if (clutter_event_type (event) != CLUTTER_TOUCHPAD_SWIPE)
return FALSE; return FALSE;
if (!pointer->focus_client) if (!meta_wayland_pointer_get_focus_client (pointer))
return FALSE; return FALSE;
switch (clutter_event_get_gesture_phase (event)) switch (clutter_event_get_gesture_phase (event))