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: Pass 'ClutterFrame' in all stage update signals

Browse Source 
That means before-update, prepare-paint, before-paint, paint-view, after-paint,
after-update. While yet to be used, it will be used as a transient frame
book keeping object, to maintain object and state that is only valid
during a frame dispatch.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2795>
This commit is contained in:
Jonas Ådahl
2022-10-13 17:50:34 +02:00
parent 24f44aa33e
commit 08b0e563d4
30 changed files with 126 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter/clutter-stage-private.h
View File

@ -45,18 +45,24 @@ ClutterStageWindow *_clutter_stage_get_default_window (void);
CLUTTER_EXPORT
void clutter_stage_paint_view (ClutterStage *stage,
ClutterStageView *view,
const cairo_region_t *redraw_clip);
const cairo_region_t *redraw_clip,
ClutterFrame *frame);
void clutter_stage_emit_before_update (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
void clutter_stage_emit_prepare_frame (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
void clutter_stage_emit_before_paint (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
void clutter_stage_emit_after_paint (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
void clutter_stage_emit_after_update (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
CLUTTER_EXPORT
void _clutter_stage_set_window (ClutterStage *stage,

10
clutter/clutter/clutter-stage-view.c
View File

@ -1230,7 +1230,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
begin_frame_timing_measurement (view);
_clutter_run_repaint_functions (CLUTTER_REPAINT_FLAGS_PRE_PAINT);
clutter_stage_emit_before_update (stage, view);
clutter_stage_emit_before_update (stage, view, frame);
clutter_stage_maybe_relayout (CLUTTER_ACTOR (stage));
clutter_stage_maybe_finish_queue_redraws (stage);
@ -1241,18 +1241,18 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
devices = clutter_stage_find_updated_devices (stage, view);
_clutter_stage_window_prepare_frame (stage_window, view, frame);
clutter_stage_emit_prepare_frame (stage, view);
clutter_stage_emit_prepare_frame (stage, view, frame);
if (clutter_stage_view_has_redraw_clip (view))
{
clutter_stage_emit_before_paint (stage, view);
clutter_stage_emit_before_paint (stage, view, frame);
_clutter_stage_window_redraw_view (stage_window, view, frame);
clutter_frame_clock_record_flip_time (frame_clock,
g_get_monotonic_time ());
clutter_stage_emit_after_paint (stage, view);
clutter_stage_emit_after_paint (stage, view, frame);
if (_clutter_context_get_show_fps ())
end_frame_timing_measurement (view);
@ -1264,7 +1264,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
priv->needs_update_devices = FALSE;
_clutter_run_repaint_functions (CLUTTER_REPAINT_FLAGS_POST_PAINT);
clutter_stage_emit_after_update (stage, view);
clutter_stage_emit_after_update (stage, view, frame);
return clutter_frame_get_result (frame);
}

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

@ -53,6 +53,7 @@
#include "clutter-enum-types.h"
#include "clutter-event-private.h"
#include "clutter-frame-clock.h"
#include "clutter-frame.h"
#include "clutter-grab.h"
#include "clutter-id-pool.h"
#include "clutter-input-device-private.h"
@ -444,7 +445,8 @@ clutter_stage_do_paint_view (ClutterStage *stage,
void
clutter_stage_paint_view (ClutterStage *stage,
ClutterStageView *view,
const cairo_region_t *redraw_clip)
const cairo_region_t *redraw_clip,
ClutterFrame *frame)
{
ClutterStagePrivate *priv = stage->priv;
@ -455,44 +457,49 @@ clutter_stage_paint_view (ClutterStage *stage,
if (g_signal_has_handler_pending (stage, stage_signals[PAINT_VIEW],
0, TRUE))
g_signal_emit (stage, stage_signals[PAINT_VIEW], 0, view, redraw_clip);
g_signal_emit (stage, stage_signals[PAINT_VIEW], 0, view, redraw_clip, frame);
else
CLUTTER_STAGE_GET_CLASS (stage)->paint_view (stage, view, redraw_clip);
CLUTTER_STAGE_GET_CLASS (stage)->paint_view (stage, view, redraw_clip, frame);
}
void
clutter_stage_emit_before_update (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
g_signal_emit (stage, stage_signals[BEFORE_UPDATE], 0, view);
g_signal_emit (stage, stage_signals[BEFORE_UPDATE], 0, view, frame);
}
void
clutter_stage_emit_prepare_frame (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
g_signal_emit (stage, stage_signals[PREPARE_FRAME], 0, view);
g_signal_emit (stage, stage_signals[PREPARE_FRAME], 0, view, frame);
}
void
clutter_stage_emit_before_paint (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
g_signal_emit (stage, stage_signals[BEFORE_PAINT], 0, view);
g_signal_emit (stage, stage_signals[BEFORE_PAINT], 0, view, frame);
}
void
clutter_stage_emit_after_paint (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
g_signal_emit (stage, stage_signals[AFTER_PAINT], 0, view);
g_signal_emit (stage, stage_signals[AFTER_PAINT], 0, view, frame);
}
void
clutter_stage_emit_after_update (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
g_signal_emit (stage, stage_signals[AFTER_UPDATE], 0, view);
g_signal_emit (stage, stage_signals[AFTER_UPDATE], 0, view, frame);
}
static gboolean
@ -1228,7 +1235,8 @@ clutter_stage_finalize (GObject *object)
static void
clutter_stage_real_paint_view (ClutterStage *stage,
ClutterStageView *view,
const cairo_region_t *redraw_clip)
const cairo_region_t *redraw_clip,
ClutterFrame *frame)
{
clutter_stage_do_paint_view (stage, view, redraw_clip);
}
@ -1383,6 +1391,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
* ClutterStage::before-update:
* @stage: the #ClutterStage
* @view: a #ClutterStageView
* @frame: a #ClutterFrame
*/
stage_signals[BEFORE_UPDATE] =
g_signal_new (I_("before-update"),
@ -1390,12 +1399,14 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE_VIEW);
G_TYPE_NONE, 2,
CLUTTER_TYPE_STAGE_VIEW,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::prepare-frame:
* @stage: the stage that received the event
* @view: a #ClutterStageView
* @frame: a #ClutterFrame
*
* The signal is emitted after the stage is updated,
* before the stage is painted, even if it will not be painted.
@ -1406,13 +1417,15 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE_VIEW);
G_TYPE_NONE, 2,
CLUTTER_TYPE_STAGE_VIEW,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::before-paint:
* @stage: the stage that received the event
* @view: a #ClutterStageView
* @frame: a #ClutterFrame
*
* The signal is emitted before the stage is painted.
*/
@ -1422,12 +1435,14 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, before_paint),
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE_VIEW);
G_TYPE_NONE, 2,
CLUTTER_TYPE_STAGE_VIEW,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::after-paint:
* @stage: the stage that received the event
* @view: a #ClutterStageView
* @frame: a #ClutterFrame
*
* The signal is emitted after the stage is painted,
* but before the results are displayed on the screen.0
@ -1438,13 +1453,15 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
0, /* no corresponding vfunc */
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE_VIEW);
G_TYPE_NONE, 2,
CLUTTER_TYPE_STAGE_VIEW,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::after-update:
* @stage: the #ClutterStage
* @view: a #ClutterStageView
* @frame: a #ClutterFrame
*/
stage_signals[AFTER_UPDATE] =
g_signal_new (I_("after-update"),
@ -1452,14 +1469,16 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE_VIEW);
G_TYPE_NONE, 2,
CLUTTER_TYPE_STAGE_VIEW,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::paint-view:
* @stage: the stage that received the event
* @view: a #ClutterStageView
* @redraw_clip: a #cairo_region_t with the redraw clip
* @frame: a #ClutterFrame
*
* The signal is emitted before a [class@Clutter.StageView] is being
* painted.
@ -1474,9 +1493,10 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, paint_view),
NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_NONE, 3,
CLUTTER_TYPE_STAGE_VIEW,
CAIRO_GOBJECT_TYPE_REGION);
CAIRO_GOBJECT_TYPE_REGION,
CLUTTER_TYPE_FRAME);
/**
* ClutterStage::presented: (skip)

6
clutter/clutter/clutter-stage.h
View File

@ -72,11 +72,13 @@ struct _ClutterStageClass
void (* deactivate) (ClutterStage *stage);
void (* before_paint) (ClutterStage *stage,
ClutterStageView *view);
ClutterStageView *view,
ClutterFrame *frame);
void (* paint_view) (ClutterStage *stage,
ClutterStageView *view,
const cairo_region_t *redraw_clip);
const cairo_region_t *redraw_clip,
ClutterFrame *frame);
/*< private >*/
/* padding for future expansion */