[gtk+/wip/wayland-tablet-v2: 35/41] wayland: Support pad devices in gdk_wayland_device_get_node_path()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/wayland-tablet-v2: 35/41] wayland: Support pad devices in gdk_wayland_device_get_node_path()
- Date: Tue, 23 Aug 2016 18:34:14 +0000 (UTC)
commit 8e173a09f9f93706d737a05050ee10b9ca351c5e
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Aug 4 19:46:04 2016 +0200
wayland: Support pad devices in gdk_wayland_device_get_node_path()
We can return the node path on those too, so do that.
gdk/wayland/gdkdevice-wayland.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 76ede9e..70b95d4 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -5176,7 +5176,7 @@ gdk_wayland_device_get_drop_context (GdkDevice *device)
* will return %NULL.
*
* This is most notably implemented for devices of type
- * %GDK_SOURCE_PEN and %GDK_SOURCE_ERASER.
+ * %GDK_SOURCE_PEN, %GDK_SOURCE_ERASER and %GDK_SOURCE_TABLET_PAD.
*
* Returns: the /dev/input/event* path of this device
**/
@@ -5184,6 +5184,7 @@ const gchar *
gdk_wayland_device_get_node_path (GdkDevice *device)
{
GdkWaylandTabletData *tablet;
+ GdkWaylandTabletPadData *pad;
GdkSeat *seat;
@@ -5195,5 +5196,9 @@ gdk_wayland_device_get_node_path (GdkDevice *device)
if (tablet)
return tablet->path;
+ pad = gdk_wayland_device_manager_find_pad (GDK_WAYLAND_SEAT (seat), device);
+ if (pad)
+ return pad->path;
+
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]