[mutter/wip/carlosg/crossings: 5/7] wayland: Drop meta_wayland_compositor_repick()




commit 006a7e53f3caa5463adeda3b3d335a40ff4d4641
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Dec 22 18:01:36 2020 +0100

    wayland: Drop meta_wayland_compositor_repick()
    
    This is now unused, thus the whole call chain from this function
    to meta_wayland_pointer_repick() can be removed.

 src/wayland/meta-wayland-pointer.c | 22 ----------------------
 src/wayland/meta-wayland-pointer.h |  2 --
 src/wayland/meta-wayland-seat.c    |  9 ---------
 src/wayland/meta-wayland-seat.h    |  2 --
 src/wayland/meta-wayland.c         |  6 ------
 src/wayland/meta-wayland.h         |  2 --
 6 files changed, 43 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index f1486646fa..69917e7520 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -1009,28 +1009,6 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer      *pointer,
   return meta_wayland_popup_create (popup_surface, grab);
 }
 
-void
-meta_wayland_pointer_repick (MetaWaylandPointer *pointer)
-{
-  MetaBackend *backend = meta_get_backend ();
-  ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
-
-  graphene_point_t point;
-  ClutterActor *new_actor;
-
-  clutter_stage_get_device_coords (stage, pointer->device, NULL, &point);
-  new_actor =
-    clutter_stage_get_actor_at_pos (stage, CLUTTER_PICK_REACTIVE,
-                                    point.x, point.y);
-
-  clutter_stage_update_device (stage,
-                               pointer->device, NULL,
-                               point,
-                               CLUTTER_CURRENT_TIME,
-                               new_actor,
-                               TRUE);
-}
-
 void
 meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
                                               MetaWaylandSurface *surface,
diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h
index 529177b8cb..5eda5276f4 100644
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -124,8 +124,6 @@ MetaWaylandPopup *meta_wayland_pointer_start_popup_grab (MetaWaylandPointer
 
 void meta_wayland_pointer_end_popup_grab (MetaWaylandPointer *pointer);
 
-void meta_wayland_pointer_repick (MetaWaylandPointer *pointer);
-
 void meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
                                                     MetaWaylandSurface *surface,
                                                     wl_fixed_t         *x,
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 258c0cbd71..f32173a085 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -432,15 +432,6 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
   return FALSE;
 }
 
-void
-meta_wayland_seat_repick (MetaWaylandSeat *seat)
-{
-  if (!meta_wayland_seat_has_pointer (seat))
-    return;
-
-  meta_wayland_pointer_repick (seat->pointer);
-}
-
 void
 meta_wayland_seat_set_input_focus (MetaWaylandSeat    *seat,
                                    MetaWaylandSurface *surface)
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index f41c442075..ae4e1076b4 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -69,8 +69,6 @@ gboolean meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
 void meta_wayland_seat_set_input_focus (MetaWaylandSeat    *seat,
                                         MetaWaylandSurface *surface);
 
-void meta_wayland_seat_repick (MetaWaylandSeat *seat);
-
 gboolean meta_wayland_seat_get_grab_info (MetaWaylandSeat    *seat,
                                           MetaWaylandSurface *surface,
                                           uint32_t            serial,
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index a868c3eaa5..7da43d911c 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -131,12 +131,6 @@ meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
   meta_wayland_seat_set_input_focus (compositor->seat, surface);
 }
 
-void
-meta_wayland_compositor_repick (MetaWaylandCompositor *compositor)
-{
-  meta_wayland_seat_repick (compositor->seat);
-}
-
 static void
 wl_compositor_create_surface (struct wl_client   *client,
                               struct wl_resource *resource,
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
index 3549fb2d5b..e59bb97bc4 100644
--- a/src/wayland/meta-wayland.h
+++ b/src/wayland/meta-wayland.h
@@ -55,8 +55,6 @@ void                    meta_wayland_compositor_update_key_state (MetaWaylandCom
                                                                   int                    key_vector_len,
                                                                   int                    offset);
 
-void                    meta_wayland_compositor_repick          (MetaWaylandCompositor *compositor);
-
 void                    meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
                                                                  MetaWindow            *window);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]