callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't trigger grab on missing capabilities

Browse Source 
Those might not be currently there in the first place.
This commit is contained in:
Carlos Garnacho
2015-12-21 19:13:41 +01:00
parent 3075dac106
commit fc2879108d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/wayland/gdkdevice-wayland.c
View File

@ -2438,7 +2438,8 @@ gdk_wayland_seat_grab (GdkSeat *seat,
return GDK_GRAB_NOT_VIEWABLE; return GDK_GRAB_NOT_VIEWABLE;
} }
if (capabilities & GDK_SEAT_CAPABILITY_POINTER) if (wayland_seat->master_pointer &&
capabilities & GDK_SEAT_CAPABILITY_POINTER)
{ {
GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->master_pointer); GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->master_pointer);
@ -2461,7 +2462,8 @@ gdk_wayland_seat_grab (GdkSeat *seat,
gdk_wayland_device_update_window_cursor (wayland_seat); gdk_wayland_device_update_window_cursor (wayland_seat);
} }
if (capabilities & GDK_SEAT_CAPABILITY_TOUCH) if (wayland_seat->touch_master &&
capabilities & GDK_SEAT_CAPABILITY_TOUCH)
{ {
GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->touch_master); GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->touch_master);
@ -2481,7 +2483,8 @@ gdk_wayland_seat_grab (GdkSeat *seat,
FALSE); FALSE);
} }
if (capabilities & GDK_SEAT_CAPABILITY_KEYBOARD) if (wayland_seat->master_keyboard &&
capabilities & GDK_SEAT_CAPABILITY_KEYBOARD)
{ {
GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->master_keyboard); GdkWindow *prev_focus = gdk_wayland_device_get_focus (wayland_seat->master_keyboard);