summaryrefslogtreecommitdiff
path: root/mate-screenshot
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2017-12-21 00:27:39 +0100
committerPablo Barciela <[email protected]>2017-12-21 00:38:02 +0100
commitb1ed030f7d7271147fec4c4ab6429d7fd16e0711 (patch)
tree7260a2456e335196b3748a5ed6159e157e4b7761 /mate-screenshot
parent051e11ab91a662db3981edf59f098b935e6877da (diff)
downloadmate-utils-b1ed030f7d7271147fec4c4ab6429d7fd16e0711.tar.bz2
mate-utils-b1ed030f7d7271147fec4c4ab6429d7fd16e0711.tar.xz
WidthOfScreen and HeightOfScreen implementation
This commit reverts: https://github.com/mate-desktop/mate-utils/commit/b210e404823cb5b1fa5b74d700fa3f89c2ea71a2 https://github.com/mate-desktop/mate-utils/commit/c0b5081bf32ee22094e15c5d76a8ac8e5806e4a5 And it applies an alternative to fix the deprecated functions: gkd_screen_width gdk_screen_height gdk_screen_get_width gdk_screen_get_height
Diffstat (limited to 'mate-screenshot')
-rw-r--r--mate-screenshot/src/screenshot-utils.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c
index 28beb78f..5bc75571 100644
--- a/mate-screenshot/src/screenshot-utils.c
+++ b/mate-screenshot/src/screenshot-utils.c
@@ -22,6 +22,7 @@
#include "screenshot-utils.h"
#include <X11/Xatom.h>
+#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glib.h>
@@ -634,9 +635,8 @@ mask_monitors (GdkPixbuf *pixbuf, GdkWindow *root_window)
rect.x = 0;
rect.y = 0;
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &rect.width, &rect.height);
+ rect.width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
+ rect.height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
invisible_region = cairo_region_create_rectangle (&rect);
cairo_region_subtract (invisible_region, region_with_monitors);
@@ -658,10 +658,6 @@ screenshot_get_pixbuf (GdkWindow *window,
GdkPixbuf *screenshot;
gint x_real_orig, y_real_orig, x_orig, y_orig;
gint width, real_width, height, real_height;
- gint sc_width, sc_height;
-
- gdk_window_get_geometry (gdk_screen_get_root_window (gdk_screen_get_default()),
- NULL, NULL, &sc_width, &sc_height);
/* If the screenshot should include the border, we look for the WM window. */
@@ -702,11 +698,11 @@ screenshot_get_pixbuf (GdkWindow *window,
y_orig = 0;
}
- if (x_orig + width > sc_width)
- width = sc_width - x_orig;
+ if (x_orig + width > WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())))
+ width = WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - x_orig;
- if (y_orig + height > sc_height)
- height = sc_height - y_orig;
+ if (y_orig + height > HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())))
+ height = HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - y_orig;
if (rectangle)
{
@@ -774,11 +770,11 @@ screenshot_get_pixbuf (GdkWindow *window,
rec_height += y_real_orig;
}
- if (x_orig + rec_x + rec_width > sc_width)
- rec_width = sc_width - x_orig - rec_x;
+ if (x_orig + rec_x + rec_width > WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())))
+ rec_width = WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - x_orig - rec_x;
- if (y_orig + rec_y + rec_height > sc_height)
- rec_height = sc_height - y_orig - rec_y;
+ if (y_orig + rec_y + rec_height > HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())))
+ rec_height = HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - y_orig - rec_y;
for (y = rec_y; y < rec_y + rec_height; y++)
{