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: Remove the screen from set_grab_op_cursor

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-23 10:57:52 -04:00
parent 4fd017d23d
commit 1762436775
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/display-private.h
View File

@ -369,7 +369,6 @@ Cursor meta_display_create_x_cursor (MetaDisplay *display,
MetaCursor cursor); MetaCursor cursor);
void meta_display_set_grab_op_cursor (MetaDisplay *display, void meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
guint32 timestamp); guint32 timestamp);

7
src/core/display.c
View File

@ -1724,13 +1724,12 @@ meta_cursor_for_grab_op (MetaGrabOp op)
void void
meta_display_set_grab_op_cursor (MetaDisplay *display, meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
guint32 timestamp) guint32 timestamp)
{ {
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits }; XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen); MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (display->screen);
MetaCursor cursor = meta_cursor_for_grab_op (op); MetaCursor cursor = meta_cursor_for_grab_op (op);
MetaCursorReference *cursor_ref; MetaCursorReference *cursor_ref;
@ -1740,8 +1739,6 @@ 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);
g_assert (screen != NULL);
meta_error_trap_push (display); meta_error_trap_push (display);
if (XIGrabDevice (display->xdisplay, if (XIGrabDevice (display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID, META_VIRTUAL_CORE_POINTER_ID,
@ -1827,7 +1824,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (pointer_already_grabbed) if (pointer_already_grabbed)
display->grab_have_pointer = TRUE; display->grab_have_pointer = TRUE;
meta_display_set_grab_op_cursor (display, screen, op, timestamp); meta_display_set_grab_op_cursor (display, op, timestamp);
if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op)) if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
{ {

1
src/core/window.c
View File

@ -8102,7 +8102,6 @@ meta_window_update_keyboard_resize (MetaWindow *window,
if (update_cursor) if (update_cursor)
{ {
meta_display_set_grab_op_cursor (window->display, meta_display_set_grab_op_cursor (window->display,
window->screen,
window->display->grab_op, window->display->grab_op,
window->display->grab_timestamp); window->display->grab_timestamp);
} }