[mutter/wip/carlosg/input-thread: 44/104] clutter: Use ClutterSeat underneath coords/modifiers input device getters

[Carlos Garnacho <carlosg src gnome org>]

commit bd80aa43f6c8f0d5d6eb193053e35202fc3d4f70
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jun 5 23:11:56 2020 +0200

    clutter: Use ClutterSeat underneath coords/modifiers input device getters
    
    This is not device state, but belonging to seat guts.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403

 clutter/clutter/clutter-input-device.c | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index 3227ce050d..045b656640 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -605,9 +605,17 @@ _clutter_input_device_set_state (ClutterInputDevice  *device,
 ClutterModifierType
 clutter_input_device_get_modifier_state (ClutterInputDevice *device)
 {
+  uint32_t modifiers;
+  ClutterSeat *seat;
+
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), 0);
 
-  return device->current_state;
+  seat = clutter_input_device_get_seat (device);
+
+  if (!clutter_seat_query_state (seat, device, NULL, NULL, &modifiers))
+    return 0;
+
+  return modifiers;
 }
 
 static void
@@ -914,27 +922,14 @@ clutter_input_device_get_coords (ClutterInputDevice   *device,
                                  ClutterEventSequence *sequence,
                                  graphene_point_t     *point)
 {
+  ClutterSeat *seat;
+
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
   g_return_val_if_fail (point != NULL, FALSE);
 
-  if (sequence == NULL)
-    {
-      point->x = device->current_x;
-      point->y = device->current_y;
-    }
-  else
-    {
-      ClutterTouchInfo *info =
-        g_hash_table_lookup (device->touch_sequences_info, sequence);
-
-      if (info == NULL)
-        return FALSE;
+  seat = clutter_input_device_get_seat (device);
 
-      point->x = info->current_x;
-      point->y = info->current_y;
-    }
-
-  return TRUE;
+  return clutter_seat_query_state (seat, device, sequence, point, NULL);
 }
 
 /*