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

clutter: Shuffle some clutter-main code

Browse Source 
Move update_device_for_event() definition above the only point
it's now called.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1915>
This commit is contained in:
Carlos Garnacho 2021-06-04 12:06:43 +02:00 committed by Marge Bot
parent b8f92a6ce4
commit a34be31d63
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,10 +136,6 @@ static const GDebugKey clutter_paint_debug_keys[] = {
{ "max-render-time", CLUTTER_DEBUG_PAINT_MAX_RENDER_TIME }, { "max-render-time", CLUTTER_DEBUG_PAINT_MAX_RENDER_TIME },
}; };
static ClutterActor * update_device_for_event (ClutterStage *stage,
ClutterEvent *event,
gboolean emit_crossing);
gboolean gboolean
_clutter_context_get_show_fps (void) _clutter_context_get_show_fps (void)
{ {
@ -765,6 +761,36 @@ process_key_event (ClutterEvent *event,
emit_event_chain (event); emit_event_chain (event);
} }
static ClutterActor *
update_device_for_event (ClutterStage *stage,
ClutterEvent *event,
gboolean emit_crossing)
{
ClutterInputDevice *device = clutter_event_get_device (event);
ClutterEventSequence *sequence = clutter_event_get_event_sequence (event);
ClutterActor *new_actor;
graphene_point_t point;
uint32_t time_ms;
clutter_event_get_coords (event, &point.x, &point.y);
time_ms = clutter_event_get_time (event);
new_actor =
_clutter_stage_do_pick (stage, point.x, point.y, CLUTTER_PICK_REACTIVE);
/* Picking should never fail, but if it does, we bail out here */
g_return_val_if_fail (new_actor != NULL, NULL);
clutter_stage_update_device (stage,
device, sequence,
point,
time_ms,
new_actor,
emit_crossing);
return new_actor;
}
/** /**
* clutter_do_event: * clutter_do_event:
* @event: a #ClutterEvent. * @event: a #ClutterEvent.
@ -970,36 +996,6 @@ clutter_stage_repick_device (ClutterStage *stage,
TRUE); TRUE);
} }
static ClutterActor *
update_device_for_event (ClutterStage *stage,
ClutterEvent *event,
gboolean emit_crossing)
{
ClutterInputDevice *device = clutter_event_get_device (event);
ClutterEventSequence *sequence = clutter_event_get_event_sequence (event);
ClutterActor *new_actor;
graphene_point_t point;
uint32_t time;
clutter_event_get_coords (event, &point.x, &point.y);
time = clutter_event_get_time (event);
new_actor =
_clutter_stage_do_pick (stage, point.x, point.y, CLUTTER_PICK_REACTIVE);
/* Picking should never fail, but if it does, we bail out here */
g_return_val_if_fail (new_actor != NULL, NULL);
clutter_stage_update_device (stage,
device, sequence,
point,
time,
new_actor,
emit_crossing);
return new_actor;
}
static void static void
remove_device_for_event (ClutterStage *stage, remove_device_for_event (ClutterStage *stage,
ClutterEvent *event, ClutterEvent *event,