diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2016-05-12 18:02:04 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2016-07-20 19:26:31 +0200 |
commit | 3386e5dc39554b797a0ea5116fedab96dd7902f5 (patch) | |
tree | a6ccade97923a6b0b978d8fd07158b6af6063d33 | |
parent | 384400cd24970efedd71911e547fabf1cee30d7c (diff) | |
download | mutter-3386e5dc39554b797a0ea5116fedab96dd7902f5.tar.gz |
wayland: Implement wp_tablet_tool.hardware_id_wacom
We can now fetch this info from the ClutterInputDeviceTool, so
use it to implement this event.
-rw-r--r-- | src/wayland/meta-wayland-tablet-tool.c | 10 |
1 files 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); } |