AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

x11: Rely on passive keyboard grabs with XI2 for DnD

Browse Source 
The active keyboard grab can be spared then. This way the passive
key grabs allow other key combinations (eg. alt-tab) that are not
mandatory to grab here.
This commit is contained in:
Carlos Garnacho 2016-05-05 19:00:28 +02:00
parent 870a674283
commit c14572fdae
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/x11/gdkdnd-x11.c
View File

@ -2656,6 +2656,7 @@ drag_context_grab (GdkDragContext *context)
{ {
GdkX11DragContext *x11_context = GDK_X11_DRAG_CONTEXT (context); GdkX11DragContext *x11_context = GDK_X11_DRAG_CONTEXT (context);
GdkDevice *device = gdk_drag_context_get_device (context); GdkDevice *device = gdk_drag_context_get_device (context);
GdkSeatCapabilities capabilities;
GdkWindow *root; GdkWindow *root;
GdkSeat *seat; GdkSeat *seat;
gint keycode, i; gint keycode, i;
@ -2666,8 +2667,15 @@ drag_context_grab (GdkDragContext *context)
root = gdk_screen_get_root_window (gdk_window_get_screen (x11_context->ipc_window)); root = gdk_screen_get_root_window (gdk_window_get_screen (x11_context->ipc_window));
seat = gdk_device_get_seat (gdk_drag_context_get_device (context)); seat = gdk_device_get_seat (gdk_drag_context_get_device (context));
#ifdef XINPUT_2
if (GDK_IS_X11_DEVICE_XI2 (device))
capabilities = GDK_SEAT_CAPABILITY_ALL_POINTING;
else
#endif
capabilities = GDK_SEAT_CAPABILITY_ALL;
if (gdk_seat_grab (seat, x11_context->ipc_window, if (gdk_seat_grab (seat, x11_context->ipc_window,
GDK_SEAT_CAPABILITY_ALL, FALSE, capabilities, FALSE,
x11_context->cursor, NULL, NULL, NULL) != GDK_GRAB_SUCCESS) x11_context->cursor, NULL, NULL, NULL) != GDK_GRAB_SUCCESS)
return FALSE; return FALSE;