[mutter/wip/carlosg/no-device-id: 4/10] core: Move away from clutter_event_get_device_id()




commit 7cc6457b9f099054e9280139c6752b7373b4b52e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Nov 17 14:49:31 2020 +0100

    core: Move away from clutter_event_get_device_id()
    
    Fetch the device, and the ID from there.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1569>

 src/core/events.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/core/events.c b/src/core/events.c
index 68c72da111..b2b545b29b 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -163,6 +163,7 @@ maybe_unfreeze_pointer_events (MetaBackend          *backend,
                                const ClutterEvent   *event,
                                EventsUnfreezeMethod  unfreeze_method)
 {
+  ClutterInputDevice *device;
   Display *xdisplay;
   int event_mode;
   int device_id;
@@ -173,7 +174,8 @@ maybe_unfreeze_pointer_events (MetaBackend          *backend,
   if (!META_IS_BACKEND_X11 (backend))
     return;
 
-  device_id = clutter_event_get_device_id (event);
+  device = clutter_event_get_device (event);
+  device_id = clutter_input_device_get_device_id (device);
   switch (unfreeze_method)
     {
     case EVENTS_UNFREEZE_SYNC:


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