brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Drop clutter_input_device_get_coords() method

Browse Source 
This is not device state anymore. It uses ClutterSeat API underneath,
so let callers do that instead.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho
2020-11-18 15:49:02 +01:00
committed by Marge Bot
parent efc1592d4d
commit c6849a66e8
12 changed files with 24 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-backend.c
View File

@ -324,7 +324,7 @@ meta_backend_monitors_changed (MetaBackend *backend)
meta_backend_sync_screen_size (backend);
if (clutter_input_device_get_coords (device, NULL, &point))
if (clutter_seat_query_state (seat, device, NULL, &point, NULL))
{
/* If we're outside all monitors, warp the pointer back inside */
if ((!meta_monitor_manager_get_logical_monitor_at (monitor_manager,

3
src/backends/meta-cursor-renderer.c
View File

@ -448,7 +448,8 @@ meta_cursor_renderer_update_position (MetaCursorRenderer *renderer)
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
graphene_point_t pos;
clutter_input_device_get_coords (priv->device, NULL, &pos);
clutter_seat_query_state (clutter_input_device_get_seat (priv->device),
priv->device, NULL, &pos, NULL);
priv->current_x = pos.x;
priv->current_y = pos.y;

3
src/backends/native/meta-barrier-native.c
View File

@ -515,7 +515,8 @@ meta_barrier_manager_native_process (MetaBarrierManagerNative *manager,
MetaBarrierEventData barrier_event_data;
MetaBarrierImplNative *barrier_impl;
if (!clutter_input_device_get_coords (device, NULL, &prev_pos))
if (!clutter_seat_query_state (clutter_input_device_get_seat (device),
device, NULL, &prev_pos, NULL))
return;
g_mutex_lock (&manager->mutex);

3
src/backends/native/meta-pointer-constraint-native.c
View File

@ -609,7 +609,8 @@ meta_pointer_constraint_impl_native_ensure_constrained (MetaPointerConstraintImp
constraint_impl_native = META_POINTER_CONSTRAINT_IMPL_NATIVE (constraint_impl);
region = cairo_region_reference (constraint_impl_native->region);
clutter_input_device_get_coords (device, NULL, &point);
clutter_seat_query_state (clutter_input_device_get_seat (device),
device, NULL, &point, NULL);
x = point.x;
y = point.y;