diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c index 850a042f56..7aa33a592d 100644 --- a/src/cinnamon-global.c +++ b/src/cinnamon-global.c @@ -1283,9 +1283,15 @@ cinnamon_global_get_pointer (CinnamonGlobal *global, { ClutterModifierType raw_mods; MetaCursorTracker *tracker; + graphene_point_t point; tracker = meta_cursor_tracker_get_for_display (global->meta_display); - meta_cursor_tracker_get_pointer (tracker, x, y, &raw_mods); + meta_cursor_tracker_get_pointer (tracker, &point, &raw_mods); + + if (x) + *x = point.x; + if (y) + *y = point.y; *mods = raw_mods & CLUTTER_MODIFIER_MASK; } @@ -1661,4 +1667,4 @@ cinnamon_global_alloc_leak (CinnamonGlobal *global, gint mb) "xxxxxxxxxxxxxxxxxxxxxxxx" ); } -} \ No newline at end of file +} diff --git a/src/cinnamon-screenshot.c b/src/cinnamon-screenshot.c index 3965de0b37..7593871c97 100644 --- a/src/cinnamon-screenshot.c +++ b/src/cinnamon-screenshot.c @@ -144,6 +144,7 @@ _draw_cursor_image (cairo_surface_t *surface, int x, y; int xhot, yhot; double xscale, yscale; + graphene_point_t point; display = cinnamon_global_get_display (cinnamon_global_get ()); tracker = meta_cursor_tracker_get_for_display (display); @@ -153,9 +154,11 @@ _draw_cursor_image (cairo_surface_t *surface, return; screenshot_region = cairo_region_create_rectangle (&area); - meta_cursor_tracker_get_pointer (tracker, &x, &y, NULL); + meta_cursor_tracker_get_pointer (tracker, &point, NULL); + x = point.x; + y = point.y; - if (!cairo_region_contains_point (screenshot_region, x, y)) + if (!cairo_region_contains_point (screenshot_region, point.x, point.y)) { cairo_region_destroy (screenshot_region); return;