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

clutter: Export clutter_input_device_update()

Browse Source 
The private function `_clutter_input_device_update()` is not currently
exported.

This function calls `_clutter_input_device_set_actor()` which updates
the `ClutterActor` under the pointer, so making that function available
outside of Clutter will allow to make sure the pointer device actor is
updated prior to do picking.

Also, now that the functions is exported to the upper layers, drop the
underscore suffix from the function name.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1026
This commit is contained in:
Olivier Fourdan 2020-01-29 14:51:37 +01:00
parent 5618e41cea
commit 8b3bc1f97d
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,8 @@ void _clutter_input_device_set_actor (ClutterInputDev
ClutterEventSequence *sequence,
ClutterActor *actor,
gboolean emit_crossing);
ClutterActor * _clutter_input_device_update (ClutterInputDevice *device,
CLUTTER_EXPORT
ClutterActor * clutter_input_device_update (ClutterInputDevice *device,
ClutterEventSequence *sequence,
gboolean emit_crossing);
CLUTTER_EXPORT

2
clutter/clutter/clutter-device-manager.c
View File

@ -539,7 +539,7 @@ _clutter_device_manager_update_devices (ClutterDeviceManager *device_manager)
if (!clutter_stage_get_motion_events_enabled (device->stage))
continue;
_clutter_input_device_update (device, NULL, TRUE);
clutter_input_device_update (device, NULL, TRUE);
}
}

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

@ -799,7 +799,7 @@ on_cursor_actor_reactive_changed (ClutterActor *actor,
*
* Sets the actor under the pointer coordinates of @device
*
* This function is called by _clutter_input_device_update()
* This function is called by clutter_input_device_update()
* and it will:
*
* - queue a %CLUTTER_LEAVE event on the previous pointer actor
@ -1017,7 +1017,7 @@ clutter_input_device_get_coords (ClutterInputDevice *device,
}
/*
* _clutter_input_device_update:
* clutter_input_device_update:
* @device: a #ClutterInputDevice
*
* Updates the input @device by determining the #ClutterActor underneath the
@ -1031,9 +1031,9 @@ clutter_input_device_get_coords (ClutterInputDevice *device,
* Since: 1.2
*/
ClutterActor *
_clutter_input_device_update (ClutterInputDevice *device,
ClutterEventSequence *sequence,
gboolean emit_crossing)
clutter_input_device_update (ClutterInputDevice *device,
ClutterEventSequence *sequence,
gboolean emit_crossing)
{
ClutterStage *stage;
ClutterActor *new_cursor_actor;

6
clutter/clutter/clutter-main.c
View File

@ -1776,7 +1776,7 @@ _clutter_process_event_details (ClutterActor *stage,
emit_crossing_event (event, device);
actor = _clutter_input_device_update (device, NULL, FALSE);
actor = clutter_input_device_update (device, NULL, FALSE);
if (actor != stage)
{
ClutterEvent *crossing;
@ -1943,7 +1943,7 @@ _clutter_process_event_details (ClutterActor *stage,
* get the actor underneath
*/
if (device != NULL)
actor = _clutter_input_device_update (device, NULL, TRUE);
actor = clutter_input_device_update (device, NULL, TRUE);
else
{
CLUTTER_NOTE (EVENT, "No device found: picking");
@ -2060,7 +2060,7 @@ _clutter_process_event_details (ClutterActor *stage,
}
if (device != NULL)
actor = _clutter_input_device_update (device, sequence, TRUE);
actor = clutter_input_device_update (device, sequence, TRUE);
else
{
CLUTTER_NOTE (EVENT, "No device found: picking");

2
clutter/clutter/clutter-stage.c
View File

@ -1496,7 +1496,7 @@ _clutter_stage_do_update (ClutterStage *stage)
while (pointers)
{
_clutter_input_device_update (pointers->data, NULL, TRUE);
clutter_input_device_update (pointers->data, NULL, TRUE);
pointers = g_slist_delete_link (pointers, pointers);
}