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

shell-global: Correct screenshot_window() after mutter changes

Browse Source 
Recent mutter changes made MetaShapedTexture not a ClutterTexture,
but instead a special ClutterActor subclass that implemented the texture-y
bits itself. Use recently introduced API in MetaShapedTexture so that we can
get the raw texture data and spit it out as a PNG.

Use the new meta_shaped_texture_get_image() to get a window's texture data.
meta_shaped_texture_get_image() flattens the image against any mask it may
have, so a screenshot of it should look exactly as it does on the display.

https://bugzilla.gnome.org/show_bug.cgi?id=662486
This commit is contained in:
Jasper St. Pierre 2011-12-19 11:37:24 -05:00
parent 458b0b22fc
commit d254e2e1f2
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/shell-global.c
View File

@ -25,6 +25,7 @@
#include <girepository.h> #include <girepository.h>
#include <meta/display.h> #include <meta/display.h>
#include <meta/util.h> #include <meta/util.h>
#include <meta/meta-shaped-texture.h>
/* Memory report bits */ /* Memory report bits */
#ifdef HAVE_MALLINFO #ifdef HAVE_MALLINFO
@ -2163,30 +2164,6 @@ shell_global_screenshot_area (ShellGlobal *global,
clutter_actor_queue_redraw (stage); clutter_actor_queue_redraw (stage);
} }
static void
screenshot_get_texture_data (ClutterActor *window_actor,
cairo_rectangle_int_t *clip,
guint8 *data)
{
ClutterTexture *window_tex;
CoglHandle texture;
window_tex = CLUTTER_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
texture = clutter_texture_get_cogl_texture (window_tex);
g_return_if_fail (texture != COGL_INVALID_HANDLE);
if (clip != NULL)
texture = cogl_texture_new_from_sub_texture (texture,
clip->x,
clip->y,
clip->width,
clip->height);
cogl_flush();
cogl_texture_get_data (texture, CLUTTER_CAIRO_FORMAT_ARGB32, 0, data);
}
/** /**
* shell_global_screenshot_window: * shell_global_screenshot_window:
* @global: the #ShellGlobal * @global: the #ShellGlobal
@ -2206,7 +2183,6 @@ shell_global_screenshot_window (ShellGlobal *global,
const char *filename, const char *filename,
ShellGlobalScreenshotCallback callback) ShellGlobalScreenshotCallback callback)
{ {
guchar *data;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
_screenshot_data *screenshot_data = g_new0 (_screenshot_data, 1); _screenshot_data *screenshot_data = g_new0 (_screenshot_data, 1);
@ -2216,6 +2192,7 @@ shell_global_screenshot_window (ShellGlobal *global,
MetaWindow *window = meta_display_get_focus_window (display); MetaWindow *window = meta_display_get_focus_window (display);
ClutterActor *window_actor; ClutterActor *window_actor;
gfloat actor_x, actor_y; gfloat actor_x, actor_y;
MetaShapedTexture *stex;
MetaRectangle rect; MetaRectangle rect;
cairo_rectangle_int_t clip; cairo_rectangle_int_t clip;
@ -2250,12 +2227,8 @@ shell_global_screenshot_window (ShellGlobal *global,
clip.width = screenshot_data->screenshot_area.width = rect.width; clip.width = screenshot_data->screenshot_area.width = rect.width;
clip.height = screenshot_data->screenshot_area.height = rect.height; clip.height = screenshot_data->screenshot_area.height = rect.height;
screenshot_data->image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
clip.width, clip.height); screenshot_data->image = meta_shaped_texture_get_image (stex, &clip);
data = cairo_image_surface_get_data (screenshot_data->image);
screenshot_get_texture_data (window_actor, &clip, data);
cairo_surface_mark_dirty (screenshot_data->image);
result = g_simple_async_result_new (NULL, on_screenshot_written, (gpointer)screenshot_data, shell_global_screenshot_window); result = g_simple_async_result_new (NULL, on_screenshot_written, (gpointer)screenshot_data, shell_global_screenshot_window);
g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL); g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL);