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

shell: Update to MetaCursorTracker API change

Browse Source 
The pointer coordinates in meta_cursor_tracker_get_pointer() are now
returned as a graphene_point_t.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1405
This commit is contained in:
Carlos Garnacho 2020-07-20 12:08:43 +02:00
parent 2321ce2864
commit ff6c0ca68c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shell-global.c
View File

@ -1361,9 +1361,15 @@ shell_global_get_pointer (ShellGlobal *global,
{ {
ClutterModifierType raw_mods; ClutterModifierType raw_mods;
MetaCursorTracker *tracker; MetaCursorTracker *tracker;
graphene_point_t point;
tracker = meta_cursor_tracker_get_for_display (global->meta_display); 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; *mods = raw_mods & CLUTTER_MODIFIER_MASK;
} }

7
src/shell-screenshot.c
View File

@ -181,6 +181,7 @@ draw_cursor_image (cairo_surface_t *surface,
int x, y; int x, y;
int xhot, yhot; int xhot, yhot;
double xscale, yscale; double xscale, yscale;
graphene_point_t point;
display = shell_global_get_display (shell_global_get ()); display = shell_global_get_display (shell_global_get ());
tracker = meta_cursor_tracker_get_for_display (display); tracker = meta_cursor_tracker_get_for_display (display);
@ -190,9 +191,11 @@ draw_cursor_image (cairo_surface_t *surface,
return; return;
screenshot_region = cairo_region_create_rectangle (&area); 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); cairo_region_destroy (screenshot_region);
return; return;