isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Remove grab_xwindow from the public API

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-23 10:53:06 -04:00
parent c6296aa17f
commit 2f6ce4783b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,6 @@ Cursor meta_display_create_x_cursor (MetaDisplay *display,
void meta_display_set_grab_op_cursor (MetaDisplay *display, void meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
Window grab_xwindow,
guint32 timestamp); guint32 timestamp);
void meta_display_check_threshold_reached (MetaDisplay *display, void meta_display_check_threshold_reached (MetaDisplay *display,

10
src/core/display.c
View File

@ -1726,7 +1726,6 @@ void
meta_display_set_grab_op_cursor (MetaDisplay *display, meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
Window grab_xwindow,
guint32 timestamp) guint32 timestamp)
{ {
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
@ -1746,7 +1745,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
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,
grab_xwindow, display->grab_xwindow,
timestamp, timestamp,
meta_display_create_x_cursor (display, cursor), meta_display_create_x_cursor (display, cursor),
XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync,
@ -1764,7 +1763,6 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
"XIGrabDevice() failed time %u\n", "XIGrabDevice() failed time %u\n",
timestamp); timestamp);
} }
meta_error_trap_pop (display); meta_error_trap_pop (display);
cursor_ref = meta_cursor_reference_from_theme (cursor); cursor_ref = meta_cursor_reference_from_theme (cursor);
@ -1840,8 +1838,9 @@ 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, grab_xwindow, timestamp); display->grab_xwindow = grab_xwindow;
meta_display_set_grab_op_cursor (display, screen, op, timestamp);
if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op)) if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
{ {
@ -1873,7 +1872,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
display->grab_op = op; display->grab_op = op;
display->grab_window = grab_window; display->grab_window = grab_window;
display->grab_xwindow = grab_xwindow;
display->grab_button = button; display->grab_button = button;
if (window) if (window)
{ {

1
src/core/window.c
View File

@ -8104,7 +8104,6 @@ meta_window_update_keyboard_resize (MetaWindow *window,
meta_display_set_grab_op_cursor (window->display, meta_display_set_grab_op_cursor (window->display,
window->screen, window->screen,
window->display->grab_op, window->display->grab_op,
window->display->grab_xwindow,
window->display->grab_timestamp); window->display->grab_timestamp);
} }
} }