[mutter] clutter/stage: Use own list of pointer devices to find updated devices

[Marge Bot <marge-bot src gnome org>]

commit ad65c89d3c939e5cd73b70c37373724364b635b3
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Mon Dec 14 21:36:53 2020 +0100

    clutter/stage: Use own list of pointer devices to find updated devices
    
    Due to a few reasons currently the updating of input devices after stage
    relayouts isn't working right now. Since we now have a list of pointer
    devices in ClutterStage, we can simply use that list and can avoid
    asking the input thread. Also we no longer need to check whether the
    devices are pointer devices, since our list only consists of pointer
    devices.
    
    So switch to ClutterStages private list of pointer devices, which also
    includes the core pointer (as opposed to the list returned by
    clutter_seat_peek_devices()). This fixes picking after relayouts.
    
    Note that this doesn't catch every possible change that might need a
    repick, actors might also need a repick after transformation changes or
    in case their custom clip has been changed.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1634>

 clutter/clutter/clutter-stage.c | 49 +++++++++--------------------------------
 1 file changed, 10 insertions(+), 39 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 748d217904..3c1980b5a0 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -910,58 +910,29 @@ GSList *
 clutter_stage_find_updated_devices (ClutterStage *stage)
 {
   ClutterStagePrivate *priv = stage->priv;
-  ClutterBackend *backend;
-  ClutterSeat *seat;
   GSList *updating = NULL;
-  const GList *l, *devices;
-  graphene_point_t point;
+  GHashTableIter iter;
+  gpointer value;
 
   if (!priv->needs_update_devices)
     return NULL;
 
   priv->needs_update_devices = FALSE;
 
-  backend = clutter_get_default_backend ();
-  seat = clutter_backend_get_default_seat (backend);
-  devices = clutter_seat_peek_devices (seat);
-
-  for (l = devices; l; l = l->next)
+  g_hash_table_iter_init (&iter, priv->pointer_devices);
+  while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      ClutterInputDevice *dev = l->data;
+      PointerDeviceEntry *entry = value;
       ClutterStageView *view;
       const cairo_region_t *clip;
 
-      if (clutter_input_device_get_device_mode (dev) !=
-          CLUTTER_INPUT_MODE_LOGICAL)
+      view = clutter_stage_get_view_at (stage, entry->coords.x, entry->coords.y);
+      if (!view)
         continue;
 
-      switch (clutter_input_device_get_device_type (dev))
-        {
-        case CLUTTER_POINTER_DEVICE:
-        case CLUTTER_TABLET_DEVICE:
-        case CLUTTER_PEN_DEVICE:
-        case CLUTTER_ERASER_DEVICE:
-        case CLUTTER_CURSOR_DEVICE:
-          if (!clutter_seat_query_state (seat, dev, NULL,
-                                         &point, NULL))
-            continue;
-
-          view = clutter_stage_get_view_at (stage, point.x, point.y);
-          if (!view)
-            continue;
-
-          clip = clutter_stage_view_peek_redraw_clip (view);
-          if (!clip || cairo_region_contains_point (clip, point.x, point.y))
-            updating = g_slist_prepend (updating, dev);
-          break;
-        default:
-          /* Any other devices don't need checking, either because they
-           * don't have x/y coordinates, or because they're implicitly
-           * grabbed on an actor by default as it's the case of
-           * touch(screens).
-           */
-          break;
-        }
+      clip = clutter_stage_view_peek_redraw_clip (view);
+      if (!clip || cairo_region_contains_point (clip, entry->coords.x, entry->coords.y))
+        updating = g_slist_prepend (updating, entry->device);
     }
 
   return updating;