brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshot: Grab screenshot during paint on X11

Browse Source 
We might not be able to directly paint the stage to an offscreen, if
there currently is a fullscreen unredirected window. To make it possible
to take a screenshot in this situation, disable unredirecting, queue a
frame, and take a screenshot after having painted that frame, before we
go back being unredirected.

Don't do this on Wayland because it's a waste.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1453
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1534>
This commit is contained in:
Jonas Ådahl 2020-12-14 15:11:37 +01:00
parent f7019bdd0d
commit c09be8b0a9
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/shell-screenshot.c
View File

@ -32,6 +32,7 @@ struct _ShellScreenshotPrivate
ShellGlobal *global; ShellGlobal *global;
GOutputStream *stream; GOutputStream *stream;
ShellScreenshotFlag flags;
GDateTime *datetime; GDateTime *datetime;
@ -341,6 +342,22 @@ finish_screenshot (ShellScreenshot *screenshot,
return TRUE; return TRUE;
} }
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *view,
GTask *result)
{
ShellScreenshot *screenshot = g_task_get_task_data (result);
ShellScreenshotPrivate *priv = screenshot->priv;
MetaDisplay *display = shell_global_get_display (priv->global);
g_signal_handlers_disconnect_by_func (stage, on_after_paint, result);
grab_screenshot (screenshot, priv->flags, result);
meta_enable_unredirect_for_display (display);
}
/** /**
* shell_screenshot_screenshot: * shell_screenshot_screenshot:
* @screenshot: the #ShellScreenshot * @screenshot: the #ShellScreenshot
@ -385,6 +402,7 @@ shell_screenshot_screenshot (ShellScreenshot *screenshot,
result = g_task_new (screenshot, NULL, callback, user_data); result = g_task_new (screenshot, NULL, callback, user_data);
g_task_set_source_tag (result, shell_screenshot_screenshot); g_task_set_source_tag (result, shell_screenshot_screenshot);
g_task_set_task_data (result, screenshot, NULL);
priv->stream = g_object_ref (stream); priv->stream = g_object_ref (stream);
@ -392,8 +410,22 @@ shell_screenshot_screenshot (ShellScreenshot *screenshot,
if (include_cursor) if (include_cursor)
flags |= SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR; flags |= SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR;
if (meta_is_wayland_compositor ())
{
grab_screenshot (screenshot, flags, result); grab_screenshot (screenshot, flags, result);
} }
else
{
MetaDisplay *display = shell_global_get_display (priv->global);
ClutterStage *stage = shell_global_get_stage (priv->global);
meta_disable_unredirect_for_display (display);
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
priv->flags = flags;
g_signal_connect (stage, "after-paint",
G_CALLBACK (on_after_paint), result);
}
}
/** /**
* shell_screenshot_screenshot_finish: * shell_screenshot_screenshot_finish: