isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Drop clutter_input_device_set_state()

Browse Source 
Nothing uses it anymore.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-06-06 00:20:46 +02:00
parent aae4a6065c
commit b13fe4895f
3 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter/clutter-input-device-private.h
View File

@ -178,9 +178,6 @@ void _clutter_input_device_set_coords (ClutterInputDevice *device,
gfloat x, gfloat x,
gfloat y); gfloat y);
CLUTTER_EXPORT CLUTTER_EXPORT
void _clutter_input_device_set_state (ClutterInputDevice *device,
ClutterModifierType state);
CLUTTER_EXPORT
ClutterActor * clutter_input_device_update (ClutterInputDevice *device, ClutterActor * clutter_input_device_update (ClutterInputDevice *device,
ClutterEventSequence *sequence, ClutterEventSequence *sequence,
ClutterStage *stage, ClutterStage *stage,

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

@ -515,7 +515,6 @@ clutter_input_device_init (ClutterInputDevice *self)
self->current_x = self->previous_x = -1; self->current_x = self->previous_x = -1;
self->current_y = self->previous_y = -1; self->current_y = self->previous_y = -1;
self->current_button_number = self->previous_button_number = -1; self->current_button_number = self->previous_button_number = -1;
self->current_state = 0;
self->touch_sequences_info = self->touch_sequences_info =
g_hash_table_new_full (NULL, NULL, g_hash_table_new_full (NULL, NULL,
@ -575,22 +574,6 @@ _clutter_input_device_set_coords (ClutterInputDevice *device,
} }
} }
/*< private >
* clutter_input_device_set_state:
* @device: a #ClutterInputDevice
* @state: a bitmask of modifiers
*
* Stores the last known modifiers state of the device
*/
void
_clutter_input_device_set_state (ClutterInputDevice *device,
ClutterModifierType state)
{
g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
device->current_state = state;
}
/** /**
* clutter_input_device_get_modifier_state: * clutter_input_device_get_modifier_state:
* @device: a #ClutterInputDevice * @device: a #ClutterInputDevice
@ -1147,19 +1130,16 @@ void
clutter_input_device_update_from_event (ClutterInputDevice *device, clutter_input_device_update_from_event (ClutterInputDevice *device,
ClutterEvent *event) ClutterEvent *event)
{ {
ClutterModifierType event_state;
ClutterEventSequence *sequence; ClutterEventSequence *sequence;
gfloat event_x, event_y; gfloat event_x, event_y;
g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device)); g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
g_return_if_fail (event != NULL); g_return_if_fail (event != NULL);
event_state = clutter_event_get_state (event);
sequence = clutter_event_get_event_sequence (event); sequence = clutter_event_get_event_sequence (event);
clutter_event_get_coords (event, &event_x, &event_y); clutter_event_get_coords (event, &event_x, &event_y);
_clutter_input_device_set_coords (device, sequence, event_x, event_y); _clutter_input_device_set_coords (device, sequence, event_x, event_y);
_clutter_input_device_set_state (device, event_state);
} }
/*< private > /*< private >

14
src/backends/native/meta-seat-native.c
View File

@ -1347,20 +1347,6 @@ meta_event_dispatch (GSource *g_source,
if (event) if (event)
{ {
ClutterModifierType event_state;
ClutterInputDevice *input_device =
clutter_event_get_source_device (event);
MetaInputDeviceNative *device_evdev =
META_INPUT_DEVICE_NATIVE (input_device);
MetaSeatNative *seat =
meta_input_device_native_get_seat (device_evdev);
/* update the device states *before* the event */
event_state = seat->button_state |
xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_EFFECTIVE);
_clutter_input_device_set_state (seat->core_pointer, event_state);
_clutter_input_device_set_state (seat->core_keyboard, event_state);
/* forward the event into clutter for emission etc. */ /* forward the event into clutter for emission etc. */
_clutter_stage_queue_event (event->any.stage, event, FALSE); _clutter_stage_queue_event (event->any.stage, event, FALSE);
} }