brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Always grab the root window

Browse Source 
This grab needs to move to the backend, where we won't be able to
discriminate between different windows
This commit is contained in:
Jasper St. Pierre 2014-04-23 10:54:12 -04:00
parent 2f6ce4783b
commit 4fd017d23d
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/display.c
View File

@ -1745,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,
display->grab_xwindow, display->screen->xroot,
timestamp, timestamp,
meta_display_create_x_cursor (display, cursor), meta_display_create_x_cursor (display, cursor),
XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync,
@ -1784,7 +1784,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
int root_y) int root_y)
{ {
MetaWindow *grab_window = NULL; MetaWindow *grab_window = NULL;
Window grab_xwindow;
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Doing grab op %u on window %s button %d pointer already grabbed: %d pointer pos %d,%d\n", "Doing grab op %u on window %s button %d pointer already grabbed: %d pointer pos %d,%d\n",
@ -1823,23 +1822,11 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (grab_window == NULL) if (grab_window == NULL)
grab_window = window; grab_window = window;
/* FIXME:
* If we have no MetaWindow we do our best
* and try to do the grab on the RootWindow.
* This will fail if anyone else has any
* key grab on the RootWindow.
*/
if (grab_window)
grab_xwindow = meta_window_get_toplevel_xwindow (grab_window);
else
grab_xwindow = screen->xroot;
display->grab_have_pointer = FALSE; display->grab_have_pointer = FALSE;
if (pointer_already_grabbed) if (pointer_already_grabbed)
display->grab_have_pointer = TRUE; display->grab_have_pointer = TRUE;
display->grab_xwindow = grab_xwindow;
meta_display_set_grab_op_cursor (display, screen, op, timestamp); 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))
@ -1990,7 +1977,6 @@ meta_display_end_grab_op (MetaDisplay *display,
display->grab_timestamp = 0; display->grab_timestamp = 0;
display->grab_window = NULL; display->grab_window = NULL;
display->grab_xwindow = None;
display->grab_tile_mode = META_TILE_NONE; display->grab_tile_mode = META_TILE_NONE;
display->grab_tile_monitor_number = -1; display->grab_tile_monitor_number = -1;
display->grab_op = META_GRAB_OP_NONE; display->grab_op = META_GRAB_OP_NONE;