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

wayland: Update grab serial when ungrabbing keyboards

Browse Source 
This was being done so only on pointers. Internally, a GdkDeviceGrabInfo
is kept for each of the master pointer/keyboard, failing to do this for
keyboards results in a stuck keyboard grab.

https://bugzilla.gnome.org/show_bug.cgi?id=748892
This commit is contained in:
Carlos Garnacho
2015-06-24 15:41:23 +02:00
parent 25885ca600
commit de260ae2ea
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,6 +415,11 @@ gdk_wayland_device_ungrab (GdkDevice *device,
display = gdk_device_get_display (device); display = gdk_device_get_display (device);
grab = _gdk_display_get_last_device_grab (display, device);
if (grab)
grab->serial_end = grab->serial_start;
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
{ {
/* Device is a keyboard */ /* Device is a keyboard */
@ -422,11 +427,6 @@ gdk_wayland_device_ungrab (GdkDevice *device,
else else
{ {
/* Device is a pointer */ /* Device is a pointer */
grab = _gdk_display_get_last_device_grab (display, device);
if (grab)
grab->serial_end = grab->serial_start;
g_clear_object (&wayland_device->grab_cursor); g_clear_object (&wayland_device->grab_cursor);
gdk_wayland_device_update_window_cursor (wayland_device); gdk_wayland_device_update_window_cursor (wayland_device);