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

screen-cast/window: Use window actor damaged signal instead of paint

Browse Source 
We are really more interested in when a window is damaged, rather than
when it's painted, for screen casting windows. This also has the benefit
of not listening on the "paint" signal of the actor, meaning it'll open
doors for hacks currently necessary for taking a screenshot of a window
consisting of multiple surfaces.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/752
This commit is contained in:
Jonas Ådahl 2019-08-26 16:12:30 +03:00
parent ad138210b3
commit 65fde269c6
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/backends/meta-screen-cast-window-stream-src.c
View File

@ -34,13 +34,11 @@ struct _MetaScreenCastWindowStreamSrc
MetaScreenCastWindow *screen_cast_window; MetaScreenCastWindow *screen_cast_window;
unsigned long screen_cast_window_before_paint_handler_id; unsigned long screen_cast_window_damaged_handler_id;
unsigned long screen_cast_window_after_paint_handler_id;
unsigned long screen_cast_window_destroyed_handler_id; unsigned long screen_cast_window_destroyed_handler_id;
unsigned long cursor_moved_handler_id; unsigned long cursor_moved_handler_id;
unsigned long cursor_changed_handler_id; unsigned long cursor_changed_handler_id;
gboolean actor_was_dirty;
gboolean cursor_bitmap_invalid; gboolean cursor_bitmap_invalid;
}; };
@ -255,15 +253,10 @@ meta_screen_cast_window_stream_src_stop (MetaScreenCastWindowStreamSrc *window_s
if (!window_src->screen_cast_window) if (!window_src->screen_cast_window)
return; return;
if (window_src->screen_cast_window_before_paint_handler_id) if (window_src->screen_cast_window_damaged_handler_id)
g_signal_handler_disconnect (window_src->screen_cast_window, g_signal_handler_disconnect (window_src->screen_cast_window,
window_src->screen_cast_window_before_paint_handler_id); window_src->screen_cast_window_damaged_handler_id);
window_src->screen_cast_window_before_paint_handler_id = 0; window_src->screen_cast_window_damaged_handler_id = 0;
if (window_src->screen_cast_window_after_paint_handler_id)
g_signal_handler_disconnect (window_src->screen_cast_window,
window_src->screen_cast_window_after_paint_handler_id);
window_src->screen_cast_window_after_paint_handler_id = 0;
if (window_src->screen_cast_window_destroyed_handler_id) if (window_src->screen_cast_window_destroyed_handler_id)
g_signal_handler_disconnect (window_src->screen_cast_window, g_signal_handler_disconnect (window_src->screen_cast_window,
@ -282,23 +275,12 @@ meta_screen_cast_window_stream_src_stop (MetaScreenCastWindowStreamSrc *window_s
} }
static void static void
screen_cast_window_before_paint (MetaScreenCastWindow *screen_cast_window, screen_cast_window_damaged (MetaWindowActor *actor,
MetaScreenCastWindowStreamSrc *window_src) MetaScreenCastWindowStreamSrc *window_src)
{ {
window_src->actor_was_dirty = MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (window_src);
meta_screen_cast_window_has_damage (screen_cast_window);
}
static void meta_screen_cast_stream_src_maybe_record_frame (src);
screen_cast_window_after_paint (MetaWindowActor *actor,
MetaScreenCastWindowStreamSrc *window_src)
{
if (window_src->actor_was_dirty)
{
MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (window_src);
meta_screen_cast_stream_src_maybe_record_frame (src);
}
} }
static void static void
@ -378,16 +360,11 @@ meta_screen_cast_window_stream_src_enable (MetaScreenCastStreamSrc *src)
window_src->screen_cast_window = META_SCREEN_CAST_WINDOW (window_actor); window_src->screen_cast_window = META_SCREEN_CAST_WINDOW (window_actor);
window_src->screen_cast_window_before_paint_handler_id = window_src->screen_cast_window_damaged_handler_id =
g_signal_connect (window_src->screen_cast_window, g_signal_connect (window_src->screen_cast_window,
"paint", "damaged",
G_CALLBACK (screen_cast_window_before_paint), G_CALLBACK (screen_cast_window_damaged),
window_src); window_src);
window_src->screen_cast_window_after_paint_handler_id =
g_signal_connect_after (window_src->screen_cast_window,
"paint",
G_CALLBACK (screen_cast_window_after_paint),
window_src);
window_src->screen_cast_window_destroyed_handler_id = window_src->screen_cast_window_destroyed_handler_id =
g_signal_connect (window_src->screen_cast_window, g_signal_connect (window_src->screen_cast_window,