isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Pull the grab cursor from the cursor tracker

Browse Source 
This might look silly, but just wait...
This commit is contained in:
Jasper St. Pierre 2014-04-23 11:12:04 -04:00
parent af515732b0
commit f42184ded8
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-cursor-tracker-private.h
View File

@ -83,4 +83,6 @@ void meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
int new_x, int new_x,
int new_y); int new_y);
MetaCursorReference * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
#endif #endif

6
src/backends/meta-cursor-tracker.c
View File

@ -480,3 +480,9 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
tracker->screen->xroot); tracker->screen->xroot);
} }
} }
MetaCursorReference *
meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
{
return tracker->displayed_cursor;
}

4
src/core/display.c
View File

@ -1749,7 +1749,9 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
XISetMask (mask.mask, XI_Leave); XISetMask (mask.mask, XI_Leave);
XISetMask (mask.mask, XI_Motion); XISetMask (mask.mask, XI_Motion);
MetaCursor cursor = meta_cursor_for_grab_op (op); MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (display->screen);
MetaCursorReference *cursor_ref = meta_cursor_tracker_get_displayed_cursor (tracker);
MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref);
meta_error_trap_push (display); meta_error_trap_push (display);
if (XIGrabDevice (display->xdisplay, if (XIGrabDevice (display->xdisplay,