3 files changed, 23 insertions, 7 deletions
diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
index f3db5794..4243563f 100644
--- a/mate-screenshot/mate-screenshot.c
+++ b/mate-screenshot/mate-screenshot.c
@@ -809,13 +809,14 @@ static void
 finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle)
 { 
 ScreenshotDialog *dialog;
+ gboolean include_mask = (!take_window_shot && !take_area_shot);
 
 /* always disable window border for full-desktop or selected-area screenshots */
 if (!take_window_shot)
- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE);
+ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask);
 else
 {
- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border);
+ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask);
 
 switch (border_effect[0])
 {
@@ -1368,8 +1369,17 @@ main (int argc, char *argv[])
 }
 else
 {
- /* start this in an idle anyway and fire up the mainloop */
- g_idle_add (prepare_screenshot_timeout, NULL);
+ if (interactive_arg)
+ {
+ /* HACK: give time to the dialog to actually disappear.
+ * We don't have any way to tell when the compositor has finished 
+ * re-drawing.
+ */
+ g_timeout_add (200,
+ prepare_screenshot_timeout, NULL);
+ }
+ else
+ g_idle_add (prepare_screenshot_timeout, NULL);
 }
 
 gtk_main ();
diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c
index b41ae4b8..faed6762 100644
--- a/mate-screenshot/screenshot-utils.c
+++ b/mate-screenshot/screenshot-utils.c
@@ -670,7 +670,8 @@ GdkPixbuf *
 screenshot_get_pixbuf (GdkWindow *window,
 GdkRectangle *rectangle,
 gboolean include_pointer,
- gboolean include_border)
+ gboolean include_border,
+ gboolean include_mask)
 {
 GdkWindow *root;
 GdkPixbuf *screenshot;
@@ -738,7 +739,11 @@ screenshot_get_pixbuf (GdkWindow *window,
 x_orig, y_orig, 0, 0,
 width, height);
 
- mask_monitors (screenshot, root);
+ /*
+ * Masking currently only works properly with full-screen shots
+ */
+ if (include_mask)
+ mask_monitors (screenshot, root);
 
 #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
 if (include_border)
diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h
index 0af2ba39..5404bde4 100644
--- a/mate-screenshot/screenshot-utils.h
+++ b/mate-screenshot/screenshot-utils.h
@@ -36,7 +36,8 @@ gboolean screenshot_select_area (int *px,
 GdkPixbuf *screenshot_get_pixbuf (GdkWindow *win,
 GdkRectangle *rectangle,
 gboolean include_pointer,
- gboolean include_border);
+ gboolean include_border,
+ gboolean include_mask);
 
 void screenshot_show_error_dialog (GtkWindow *parent,
 const gchar *message,