src: Adapt to MetaPointerTracker changes in linuxmint/muffin#765.

meta_cursor_tracker_get_pointer() now expects a single
graphene_point_t out-argument instead of x, y.

Author: mtwebster

src/cinnamon-global.c

@@ -1283,10 +1283,13 @@ cinnamon_global_get_pointer (CinnamonGlobal         *global,
 {
   ClutterModifierType raw_mods;
   MetaCursorTracker *tracker;
+  graphene_point_t coords;
 
   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, &coords, &raw_mods);
 
+  *x = (int) coords.x;
+  *y = (int) coords.y;
   *mods = raw_mods & CLUTTER_MODIFIER_MASK;
 }
 

src/cinnamon-recorder.c

@@ -578,14 +578,14 @@ on_cursor_changed (MetaCursorTracker *tracker,
 static void
 recorder_update_pointer (CinnamonRecorder *recorder)
 {
-  int pointer_x, pointer_y;
+  graphene_point_t coords;
 
-  meta_cursor_tracker_get_pointer (recorder->cursor_tracker, &pointer_x, &pointer_y, NULL);
+  meta_cursor_tracker_get_pointer (recorder->cursor_tracker, &coords, NULL);
 
-  if (pointer_x != recorder->pointer_x || pointer_y != recorder->pointer_y)
+  if ((int) coords.x != recorder->pointer_x || (int) coords.y != recorder->pointer_y)
     {
-      recorder->pointer_x = pointer_x;
-      recorder->pointer_y = pointer_y;
+      recorder->pointer_x = (int) coords.x;
+      recorder->pointer_y = (int) coords.y;
       recorder_queue_redraw (recorder);
     }
 }

src/cinnamon-screen.c

@@ -519,12 +519,15 @@ cinnamon_screen_get_mouse_window (CinnamonScreen  *screen,
 
   MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_display (screen->display);
   GList *actors, *l;
+  graphene_point_t coords;
   int mx, my;
 
   if (not_this_one)
     g_debug ("Focusing mouse window excluding %s", meta_window_get_description (not_this_one));
 
-  meta_cursor_tracker_get_pointer (cursor_tracker, &mx, &my, NULL);
+  meta_cursor_tracker_get_pointer (cursor_tracker, &coords, NULL);
+  mx = (int) coords.x;
+  my = (int) coords.y;
 
   /* Bottom to top */
   actors = meta_get_window_actors (screen->display);

src/cinnamon-screenshot.c

@@ -141,7 +141,7 @@ _draw_cursor_image (cairo_surface_t       *surface,
   cairo_surface_t *cursor_surface;
   cairo_region_t *screenshot_region;
   cairo_t *cr;
-  int x, y;
+  graphene_point_t coords;
   int xhot, yhot;
   double xscale, yscale;
 
@@ -153,9 +153,9 @@ _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, &coords, NULL);
 
-  if (!cairo_region_contains_point (screenshot_region, x, y))
+  if (!cairo_region_contains_point (screenshot_region, (int) coords.x, (int) coords.y))
     {
       cairo_region_destroy (screenshot_region);
       return;
@@ -181,7 +181,7 @@ _draw_cursor_image (cairo_surface_t       *surface,
       int monitor;
       float monitor_scale;
       MetaRectangle cursor_rect = {
-        .x = x, .y = y, .width = width, .height = height
+        .x = (int) coords.x, .y = (int) coords.y, .width = width, .height = height
       };
 
       monitor = meta_display_get_monitor_index_for_rect (display, &cursor_rect);
@@ -193,8 +193,8 @@ _draw_cursor_image (cairo_surface_t       *surface,
   cr = cairo_create (surface);
   cairo_set_source_surface (cr,
                             cursor_surface,
-                            x - xhot - area.x,
-                            y - yhot - area.y);
+                            (int) coords.x - xhot - area.x,
+                            (int) coords.y - yhot - area.y);
   cairo_paint (cr);
 
   cairo_destroy (cr);