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

clutter: Separate crossing event creation from emission

Browse Source 
We will want to be more specific about the portions of the actor
hierarchy that receive this event, separate creation and emission
so each place does what is relevant.

However, this commit brings no functional changes.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2068>
This commit is contained in:
Carlos Garnacho 2021-10-26 16:51:01 +02:00 committed by Marge Bot
parent 40793e7077
commit 4595da008c
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3460,7 +3460,7 @@ clutter_stage_set_device_coords (ClutterStage *stage,
entry->coords = coords; entry->coords = coords;
} }
static void static ClutterEvent *
create_crossing_event (ClutterStage *stage, create_crossing_event (ClutterStage *stage,
ClutterInputDevice *device, ClutterInputDevice *device,
ClutterEventSequence *sequence, ClutterEventSequence *sequence,
@ -3483,15 +3483,7 @@ create_crossing_event (ClutterStage *stage,
event->crossing.sequence = sequence; event->crossing.sequence = sequence;
clutter_event_set_device (event, device); clutter_event_set_device (event, device);
/* we need to make sure that this event is processed return event;
* before any other event we might have queued up until
* now, so we go on, and synthesize the event emission
* ourselves
*/
if (!_clutter_event_process_filters (event))
_clutter_process_event (event);
clutter_event_free (event);
} }
void void
@ -3507,6 +3499,7 @@ clutter_stage_update_device (ClutterStage *stage,
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterActor *old_actor; ClutterActor *old_actor;
gboolean device_actor_changed; gboolean device_actor_changed;
ClutterEvent *event;
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
@ -3531,22 +3524,33 @@ clutter_stage_update_device (ClutterStage *stage,
point.y, point.y,
_clutter_actor_get_debug_name (new_actor)); _clutter_actor_get_debug_name (new_actor));
/* we need to make sure that this event is processed
* before any other event we might have queued up until
* now, so we go on, and synthesize the event emission
* ourselves
*/
if (old_actor && emit_crossing) if (old_actor && emit_crossing)
{ {
create_crossing_event (stage, event = create_crossing_event (stage,
device, sequence, device, sequence,
CLUTTER_LEAVE, CLUTTER_LEAVE,
old_actor, new_actor, old_actor, new_actor,
point, time_ms); point, time_ms);
if (!_clutter_event_process_filters (event))
_clutter_process_event (event);
clutter_event_free (event);
} }
if (new_actor && emit_crossing) if (new_actor && emit_crossing)
{ {
create_crossing_event (stage, event = create_crossing_event (stage,
device, sequence, device, sequence,
CLUTTER_ENTER, CLUTTER_ENTER,
new_actor, old_actor, new_actor, old_actor,
point, time_ms); point, time_ms);
if (!_clutter_event_process_filters (event))
_clutter_process_event (event);
clutter_event_free (event);
} }
} }
} }