isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Switch to storing device->actor associations in ClutterStage

Browse Source 
As planned and prepared with the last commits, let ClutterStage take
care of tracking input devices and their respective actors. This means
we now can remove the old infrastructure for this from
ClutterInputDevice.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1633>
This commit is contained in:
Jonas Dreßler
2020-12-14 17:14:59 +01:00
parent a9a9d27ead
commit ae6d83fb47
7 changed files with 81 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/wayland/meta-wayland-pointer.c
View File

@ -581,13 +581,15 @@ static void
repick_for_event (MetaWaylandPointer *pointer,
const ClutterEvent *for_event)
{
MetaBackend *backend = meta_get_backend ();
ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
ClutterActor *actor;
MetaWaylandSurface *surface;
if (for_event)
actor = clutter_event_get_source (for_event);
else
actor = clutter_input_device_get_actor (pointer->device, NULL);
actor = clutter_stage_get_device_actor (stage, pointer->device, NULL);
if (META_IS_SURFACE_ACTOR_WAYLAND (actor))
{
@ -1014,8 +1016,21 @@ meta_wayland_pointer_repick (MetaWaylandPointer *pointer)
MetaBackend *backend = meta_get_backend ();
ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
clutter_input_device_update (pointer->device, NULL, stage, FALSE,
CLUTTER_CURRENT_TIME);
graphene_point_t point;
ClutterActor *new_actor;
clutter_stage_get_device_coords (stage, pointer->device, NULL, &point);
new_actor =
clutter_stage_get_actor_at_pos (stage, CLUTTER_PICK_REACTIVE,
point.x, point.y);
clutter_stage_update_device (stage,
pointer->device, NULL,
point,
CLUTTER_CURRENT_TIME,
new_actor,
FALSE);
repick_for_event (pointer, NULL);
}