isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Add parameter to control the event emission root

Browse Source 
Grabs will alter the topmost actor from where it makes sense to emit
events, add infrastructure so we can tell which actor is that when
emitting a ClutterEvent.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2068>
This commit is contained in:
Carlos Garnacho 2021-10-26 16:21:41 +02:00 committed by Marge Bot
parent bbc95c1688
commit a60658f15e
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-actor-private.h
View File

@ -246,6 +246,7 @@ void _clutter_actor_pop_clone_paint
ClutterActorAlign _clutter_actor_get_effective_x_align (ClutterActor *self); ClutterActorAlign _clutter_actor_get_effective_x_align (ClutterActor *self);
void _clutter_actor_handle_event (ClutterActor *actor, void _clutter_actor_handle_event (ClutterActor *actor,
ClutterActor *root,
const ClutterEvent *event); const ClutterEvent *event);
void _clutter_actor_attach_clone (ClutterActor *actor, void _clutter_actor_attach_clone (ClutterActor *actor,

20
clutter/clutter/clutter-actor.c
View File

@ -18992,11 +18992,12 @@ clutter_actor_get_content_repeat (ClutterActor *self)
void void
_clutter_actor_handle_event (ClutterActor *self, _clutter_actor_handle_event (ClutterActor *self,
ClutterActor *root,
const ClutterEvent *event) const ClutterEvent *event)
{ {
GPtrArray *event_tree; GPtrArray *event_tree;
ClutterActor *iter; ClutterActor *iter;
gboolean is_key_event; gboolean is_key_event, in_root = FALSE;
gint i = 0; gint i = 0;
/* XXX - for historical reasons that are now lost in the mists of time, /* XXX - for historical reasons that are now lost in the mists of time,
@ -19025,9 +19026,26 @@ _clutter_actor_handle_event (ClutterActor *self,
g_ptr_array_add (event_tree, g_object_ref (iter)); g_ptr_array_add (event_tree, g_object_ref (iter));
} }
if (iter == root)
{
in_root = TRUE;
break;
}
iter = parent; iter = parent;
} }
/* The grab root conceptually extends infinitely in all
* directions, so it handles the events that fall outside of
* the actor.
*/
if (root && !in_root)
{
if (!clutter_actor_event (root, event, TRUE))
clutter_actor_event (root, event, FALSE);
goto done;
}
/* Capture: from top-level downwards */ /* Capture: from top-level downwards */
for (i = event_tree->len - 1; i >= 0; i--) for (i = event_tree->len - 1; i >= 0; i--)
if (clutter_actor_event (g_ptr_array_index (event_tree, i), event, TRUE)) if (clutter_actor_event (g_ptr_array_index (event_tree, i), event, TRUE))

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

@ -683,7 +683,7 @@ emit_event_chain (ClutterEvent *event)
return; return;
} }
_clutter_actor_handle_event (event->any.source, event); _clutter_actor_handle_event (event->any.source, NULL, event);
} }
/* /*