From b09374735b69af99583f04bf52d65ed28f322b61 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 17 Nov 2023 12:12:05 +0100 Subject: [PATCH] wayland: Cleanup MetaWaylandPointer header Drop some functions that are no longer used outside of MetaWaylandPointer, after interactions between components were reduced. Part-of: --- src/wayland/meta-wayland-pointer.c | 9 ++++++--- src/wayland/meta-wayland-pointer.h | 11 ----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index b6e41810f..b7f668959 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -91,6 +91,9 @@ static void meta_wayland_pointer_set_current (MetaWaylandPointer *pointer, MetaWaylandSurface *surface); +static void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, + MetaWaylandSurface *surface); + static MetaBackend * backend_from_pointer (MetaWaylandPointer *pointer) { @@ -378,7 +381,7 @@ meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer, } } -void +static void meta_wayland_pointer_send_motion (MetaWaylandPointer *pointer, const ClutterEvent *event) { @@ -406,7 +409,7 @@ meta_wayland_pointer_send_motion (MetaWaylandPointer *pointer, meta_wayland_pointer_broadcast_frame (pointer); } -void +static void meta_wayland_pointer_send_button (MetaWaylandPointer *pointer, const ClutterEvent *event) { @@ -945,7 +948,7 @@ focus_surface_alive_notify (MetaWindow *window, sync_focus_surface (pointer); } -void +static void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, MetaWaylandSurface *surface) { diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h index 40ab7eb22..7fd8261e5 100644 --- a/src/wayland/meta-wayland-pointer.h +++ b/src/wayland/meta-wayland-pointer.h @@ -84,20 +84,11 @@ void meta_wayland_pointer_update (MetaWaylandPointer *pointer, gboolean meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer, const ClutterEvent *event); -void meta_wayland_pointer_send_motion (MetaWaylandPointer *pointer, - const ClutterEvent *event); - void meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer, const ClutterEvent *event); -void meta_wayland_pointer_send_button (MetaWaylandPointer *pointer, - const ClutterEvent *event); - void meta_wayland_pointer_broadcast_frame (MetaWaylandPointer *pointer); -void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, - MetaWaylandSurface *surface); - void meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer, MetaWaylandSurface *surface, wl_fixed_t *x, @@ -123,8 +114,6 @@ void meta_wayland_relative_pointer_init (MetaWaylandCompositor *compositor); MetaWaylandSeat *meta_wayland_pointer_get_seat (MetaWaylandPointer *pointer); -void meta_wayland_surface_cursor_update (MetaWaylandSurface *cursor_surface); - void meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer); MetaWaylandSurface * meta_wayland_pointer_get_current_surface (MetaWaylandPointer *pointer);