From 5ea39e0e77b98d4a0b82f086ae37a396bb4f70d8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 12 May 2016 18:02:04 +0200 Subject: [PATCH] wayland: Implement wp_tablet_tool.hardware_id_wacom We can now fetch this info from the ClutterInputDeviceTool, so use it to implement this event. --- src/wayland/meta-wayland-tablet-tool.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c index 0e8af8c36..8e69f7974 100644 --- a/src/wayland/meta-wayland-tablet-tool.c +++ b/src/wayland/meta-wayland-tablet-tool.c @@ -223,18 +223,20 @@ static void meta_wayland_tablet_tool_notify_details (MetaWaylandTabletTool *tool, struct wl_resource *resource) { - guint64 serial; + guint64 serial, id; zwp_tablet_tool_v2_send_type (resource, input_device_tool_get_type (tool->device_tool)); - serial = (guint64) clutter_input_device_tool_get_serial (tool->device_tool); + serial = clutter_input_device_tool_get_serial (tool->device_tool); zwp_tablet_tool_v2_send_hardware_serial (resource, (uint32_t) (serial >> 32), (uint32_t) (serial & G_MAXUINT32)); - meta_wayland_tablet_tool_notify_capabilities (tool, resource); + id = clutter_input_device_tool_get_id (tool->device_tool); + zwp_tablet_tool_v2_send_hardware_id_wacom (resource, (uint32_t) (id >> 32), + (uint32_t) (id & G_MAXUINT32)); - /* FIXME: zwp_tablet_tool_v2.hardware_id_wacom missing */ + meta_wayland_tablet_tool_notify_capabilities (tool, resource); zwp_tablet_tool_v2_send_done (resource); }