1
0
Fork 0

virtual-stream: Fix always embedded cursor

This change fixes the issue where the cursor is always
embedded in the frames even when the client has requested
the cursor information be sent as metadata in the stream.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2629>
This commit is contained in:
Salman Malik 2022-09-16 15:44:35 +00:00 committed by Marge Bot
parent 79e474c1da
commit abc8555463

View file

@ -198,15 +198,29 @@ static void
add_watch (MetaScreenCastVirtualStreamSrc *virtual_src) add_watch (MetaScreenCastVirtualStreamSrc *virtual_src)
{ {
MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (virtual_src); MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (virtual_src);
MetaScreenCastStream *stream = meta_screen_cast_stream_src_get_stream (src);
MetaStage *meta_stage = META_STAGE (stage_from_src (src)); MetaStage *meta_stage = META_STAGE (stage_from_src (src));
g_return_if_fail (!virtual_src->watch); g_return_if_fail (!virtual_src->watch);
switch (meta_screen_cast_stream_get_cursor_mode (stream))
{
case META_SCREEN_CAST_CURSOR_MODE_METADATA:
case META_SCREEN_CAST_CURSOR_MODE_HIDDEN:
virtual_src->watch = meta_stage_watch_view (meta_stage,
view_from_src (src),
META_STAGE_WATCH_AFTER_ACTOR_PAINT,
actors_painted,
virtual_src);
break;
case META_SCREEN_CAST_CURSOR_MODE_EMBEDDED:
virtual_src->watch = meta_stage_watch_view (meta_stage, virtual_src->watch = meta_stage_watch_view (meta_stage,
view_from_src (src), view_from_src (src),
META_STAGE_WATCH_AFTER_PAINT, META_STAGE_WATCH_AFTER_PAINT,
actors_painted, actors_painted,
virtual_src); virtual_src);
break;
}
} }
static void static void