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

stage: Pass paint context in phase callbacks

Browse Source 
If there is a paint context available (i.e. for the phases that are
during the actual stage paint), pass it along the callbacks, so that
the callback implementations can change their operation depending on the
paint context state.

This also means we can get the current view from the paint context,
instead of the temporarily used field in the instance struct.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1222
This commit is contained in:
Jonas Ådahl 2020-04-20 22:24:55 +02:00
parent 858c12e73f
commit e49297975a
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/meta-screen-cast-monitor-stream-src.c
View File

@ -115,9 +115,10 @@ meta_screen_cast_monitor_stream_src_get_specs (MetaScreenCastStreamSrc *src,
} }
static void static void
stage_painted (MetaStage *stage, stage_painted (MetaStage *stage,
ClutterStageView *view, ClutterStageView *view,
gpointer user_data) ClutterPaintContext *paint_context,
gpointer user_data)
{ {
MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (user_data); MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (user_data);

7
src/backends/meta-stage-private.h
View File

@ -38,9 +38,10 @@ typedef enum
META_STAGE_WATCH_AFTER_PAINT, META_STAGE_WATCH_AFTER_PAINT,
} MetaStageWatchPhase; } MetaStageWatchPhase;
typedef void (* MetaStageWatchFunc) (MetaStage *stage, typedef void (* MetaStageWatchFunc) (MetaStage *stage,
ClutterStageView *view, ClutterStageView *view,
gpointer user_data); ClutterPaintContext *paint_context,
gpointer user_data);
ClutterActor *meta_stage_new (MetaBackend *backend); ClutterActor *meta_stage_new (MetaBackend *backend);

18
src/backends/meta-stage.c
View File

@ -65,7 +65,6 @@ struct _MetaStage
ClutterStage parent; ClutterStage parent;
GPtrArray *watchers[N_WATCH_MODES]; GPtrArray *watchers[N_WATCH_MODES];
ClutterStageView *current_view;
GList *overlays; GList *overlays;
gboolean is_active; gboolean is_active;
@ -169,6 +168,7 @@ meta_stage_finalize (GObject *object)
static void static void
notify_watchers_for_mode (MetaStage *stage, notify_watchers_for_mode (MetaStage *stage,
ClutterStageView *view, ClutterStageView *view,
ClutterPaintContext *paint_context,
MetaStageWatchPhase watch_phase) MetaStageWatchPhase watch_phase)
{ {
GPtrArray *watchers; GPtrArray *watchers;
@ -183,7 +183,7 @@ notify_watchers_for_mode (MetaStage *stage,
if (watch->view && view != watch->view) if (watch->view && view != watch->view)
continue; continue;
watch->callback (stage, view, watch->user_data); watch->callback (stage, view, paint_context, watch->user_data);
} }
} }
@ -192,11 +192,14 @@ meta_stage_paint (ClutterActor *actor,
ClutterPaintContext *paint_context) ClutterPaintContext *paint_context)
{ {
MetaStage *stage = META_STAGE (actor); MetaStage *stage = META_STAGE (actor);
ClutterStageView *view;
GList *l; GList *l;
CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor, paint_context); CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor, paint_context);
notify_watchers_for_mode (stage, stage->current_view, view = clutter_paint_context_get_stage_view (paint_context);
notify_watchers_for_mode (stage, view, paint_context,
META_STAGE_WATCH_AFTER_ACTOR_PAINT); META_STAGE_WATCH_AFTER_ACTOR_PAINT);
g_signal_emit (stage, signals[ACTORS_PAINTED], 0); g_signal_emit (stage, signals[ACTORS_PAINTED], 0);
@ -204,7 +207,7 @@ meta_stage_paint (ClutterActor *actor,
for (l = stage->overlays; l; l = l->next) for (l = stage->overlays; l; l = l->next)
meta_overlay_paint (l->data, paint_context); meta_overlay_paint (l->data, paint_context);
notify_watchers_for_mode (stage, stage->current_view, notify_watchers_for_mode (stage, view, paint_context,
META_STAGE_WATCH_AFTER_OVERLAY_PAINT); META_STAGE_WATCH_AFTER_OVERLAY_PAINT);
} }
@ -215,13 +218,14 @@ meta_stage_paint_view (ClutterStage *stage,
{ {
MetaStage *meta_stage = META_STAGE (stage); MetaStage *meta_stage = META_STAGE (stage);
notify_watchers_for_mode (meta_stage, view, META_STAGE_WATCH_BEFORE_PAINT); notify_watchers_for_mode (meta_stage, view, NULL,
META_STAGE_WATCH_BEFORE_PAINT);
meta_stage->current_view = view;
CLUTTER_STAGE_CLASS (meta_stage_parent_class)->paint_view (stage, view, CLUTTER_STAGE_CLASS (meta_stage_parent_class)->paint_view (stage, view,
redraw_clip); redraw_clip);
notify_watchers_for_mode (meta_stage, view, META_STAGE_WATCH_AFTER_PAINT); notify_watchers_for_mode (meta_stage, view, NULL,
META_STAGE_WATCH_AFTER_PAINT);
} }
static void static void