From 8b769a3412e193e8013ec1b65a1378cec7a40642 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 12 May 2016 15:58:19 +0200 Subject: [PATCH] wayland: Set an specific role on surfaces passed in wp_tablet_tool.set_cursor This is now separated from the generic cursor one. This means that wl_surfaces can't be shared across wl_pointer and wp_tablet_tool. This is a change in tablet protocol v2. --- src/wayland/meta-wayland-tablet-tool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c index 244064884..0e8af8c36 100644 --- a/src/wayland/meta-wayland-tablet-tool.c +++ b/src/wayland/meta-wayland-tablet-tool.c @@ -31,7 +31,7 @@ #include #include "tablet-unstable-v2-server-protocol.h" #include "meta-wayland-private.h" -#include "meta-wayland-surface-role-cursor.h" +#include "meta-wayland-surface-role-tablet-cursor.h" #include "meta-surface-actor-wayland.h" #include "meta-wayland-tablet.h" #include "meta-wayland-tablet-seat.h" @@ -439,7 +439,7 @@ tool_set_cursor (struct wl_client *client, if (surface && !meta_wayland_surface_assign_role (surface, - META_TYPE_WAYLAND_SURFACE_ROLE_CURSOR)) + META_TYPE_WAYLAND_SURFACE_ROLE_TABLET_CURSOR)) { wl_resource_post_error (resource, WL_POINTER_ERROR_ROLE, "wl_surface@%d already has a different role",