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

clutter: Drop clutter_input_device_get_modifier_state() API

Browse Source 
This is using ClutterSeat state queries underneath, let the only
caller do that, and drop this call.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho 2020-11-18 15:58:10 +01:00 committed by Marge Bot
parent c6849a66e8
commit d58e082500
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clutter/clutter/clutter-input-device.c
View File

@ -465,33 +465,6 @@ clutter_input_device_init (ClutterInputDevice *self)
self->inv_touch_sequence_actors = g_hash_table_new (NULL, NULL); self->inv_touch_sequence_actors = g_hash_table_new (NULL, NULL);
} }
/**
* clutter_input_device_get_modifier_state:
* @device: a #ClutterInputDevice
*
* Retrieves the current modifiers state of the device, as seen
* by the last event Clutter processed.
*
* Return value: the last known modifier state
*
* Since: 1.16
*/
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);
seat = clutter_input_device_get_seat (device);
if (!clutter_seat_query_state (seat, device, NULL, NULL, &modifiers))
return 0;
return modifiers;
}
static void static void
_clutter_input_device_associate_actor (ClutterInputDevice *device, _clutter_input_device_associate_actor (ClutterInputDevice *device,
ClutterEventSequence *sequence, ClutterEventSequence *sequence,

2
clutter/clutter/clutter-input-device.h
View File

@ -83,8 +83,6 @@ GType clutter_input_device_get_type (void) G_GNUC_CONST;
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterInputDeviceType clutter_input_device_get_device_type (ClutterInputDevice *device); ClutterInputDeviceType clutter_input_device_get_device_type (ClutterInputDevice *device);
CLUTTER_EXPORT
ClutterModifierType clutter_input_device_get_modifier_state (ClutterInputDevice *device);
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterActor * clutter_input_device_get_actor (ClutterInputDevice *device, ClutterActor * clutter_input_device_get_actor (ClutterInputDevice *device,
ClutterEventSequence *sequence); ClutterEventSequence *sequence);

3
src/wayland/meta-wayland-data-device.c
View File

@ -612,7 +612,8 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice *data
drag_grab->need_initial_focus = TRUE; drag_grab->need_initial_focus = TRUE;
modifiers = clutter_input_device_get_modifier_state (seat->pointer->device); clutter_seat_query_state (clutter_input_device_get_seat (seat->pointer->device),
seat->pointer->device, NULL, NULL, &modifiers);
drag_grab->buttons = modifiers & drag_grab->buttons = modifiers &
(CLUTTER_BUTTON1_MASK | CLUTTER_BUTTON2_MASK | CLUTTER_BUTTON3_MASK | (CLUTTER_BUTTON1_MASK | CLUTTER_BUTTON2_MASK | CLUTTER_BUTTON3_MASK |
CLUTTER_BUTTON4_MASK | CLUTTER_BUTTON5_MASK); CLUTTER_BUTTON4_MASK | CLUTTER_BUTTON5_MASK);