Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Make gdk_wayland_device_get_focus() work on touch

Browse Source 
So we can figure out the focus for the master device.

https://bugzilla.gnome.org/show_bug.cgi?id=759309
This commit is contained in:
Carlos Garnacho
2015-12-09 12:42:33 +01:00
parent 8ec3fb39a2
commit 09947a63ed
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,12 +488,17 @@ device_emit_grab_crossing (GdkDevice *device,
static GdkWindow * static GdkWindow *
gdk_wayland_device_get_focus (GdkDevice *device) gdk_wayland_device_get_focus (GdkDevice *device)
{ {
GdkWaylandDeviceData *wayland_device = GDK_WAYLAND_DEVICE (device)->device; GdkWaylandSeat *wayland_seat = GDK_WAYLAND_DEVICE (device)->device;
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) if (device == wayland_seat->master_keyboard)
return wayland_device->keyboard_focus; return wayland_seat->keyboard_focus;
else if (device == wayland_seat->master_pointer)
return wayland_seat->pointer_focus;
else if (device == wayland_seat->touch_master &&
GDK_WAYLAND_DEVICE(device)->emulating_touch)
return GDK_WAYLAND_DEVICE(device)->emulating_touch->window;
else else
return wayland_device->pointer_focus; return NULL;
} }
static GdkGrabStatus static GdkGrabStatus