From 22178451f7f5f0ad152e1dedf39b244500f24afb Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 2 Mar 2024 14:42:24 +0100 Subject: [PATCH] cursor-shape-v1: expose tablet tool in event This allows compositors which use a separate cursor per tablet tool to support setting tablet tool cursors individually using this protocol. --- include/wlr/types/wlr_cursor_shape_v1.h | 2 ++ types/wlr_cursor_shape_v1.c | 37 ++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/include/wlr/types/wlr_cursor_shape_v1.h b/include/wlr/types/wlr_cursor_shape_v1.h index 2fef1e04..55818c86 100644 --- a/include/wlr/types/wlr_cursor_shape_v1.h +++ b/include/wlr/types/wlr_cursor_shape_v1.h @@ -41,6 +41,8 @@ enum wlr_cursor_shape_manager_v1_device_type { struct wlr_cursor_shape_manager_v1_request_set_shape_event { struct wlr_seat_client *seat_client; enum wlr_cursor_shape_manager_v1_device_type device_type; + // NULL if device_type is not TABLET_TOOL + struct wlr_tablet_v2_tablet_tool *tablet_tool; uint32_t serial; enum wp_cursor_shape_device_v1_shape shape; }; diff --git a/types/wlr_cursor_shape_v1.c b/types/wlr_cursor_shape_v1.c index ca33cf17..1bd1126b 100644 --- a/types/wlr_cursor_shape_v1.c +++ b/types/wlr_cursor_shape_v1.c @@ -1,7 +1,10 @@ #include #include +#include +#include #include #include +#include #include "types/wlr_tablet_v2.h" #define CURSOR_SHAPE_MANAGER_V1_VERSION 1 @@ -11,8 +14,11 @@ struct wlr_cursor_shape_device_v1 { struct wlr_cursor_shape_manager_v1 *manager; enum wlr_cursor_shape_manager_v1_device_type type; struct wlr_seat_client *seat_client; + // NULL if device_type is not TABLET_TOOL + struct wlr_tablet_v2_tablet_tool *tablet_tool; struct wl_listener seat_client_destroy; + struct wl_listener tablet_tool_destroy; }; static const struct wp_cursor_shape_device_v1_interface device_impl; @@ -49,6 +55,7 @@ static void device_handle_set_shape(struct wl_client *client, struct wl_resource struct wlr_cursor_shape_manager_v1_request_set_shape_event event = { .seat_client = device->seat_client, .device_type = device->type, + .tablet_tool = device->tablet_tool, .serial = serial, .shape = shape, }; @@ -65,6 +72,7 @@ static void device_destroy(struct wlr_cursor_shape_device_v1 *device) { return; } wl_list_remove(&device->seat_client_destroy.link); + wl_list_remove(&device->tablet_tool_destroy.link); wl_resource_set_user_data(device->resource, NULL); // make inert free(device); } @@ -79,9 +87,15 @@ static void device_handle_seat_client_destroy(struct wl_listener *listener, void device_destroy(device); } +static void device_handle_tablet_tool_destroy(struct wl_listener *listener, void *data) { + struct wlr_cursor_shape_device_v1 *device = wl_container_of(listener, device, tablet_tool_destroy); + device_destroy(device); +} + static void create_device(struct wl_resource *manager_resource, uint32_t id, struct wlr_seat_client *seat_client, - enum wlr_cursor_shape_manager_v1_device_type type) { + enum wlr_cursor_shape_manager_v1_device_type type, + struct wlr_tablet_v2_tablet_tool *tablet_tool) { struct wlr_cursor_shape_manager_v1 *manager = manager_from_resource(manager_resource); struct wl_client *client = wl_resource_get_client(manager_resource); @@ -105,14 +119,25 @@ static void create_device(struct wl_resource *manager_resource, uint32_t id, return; } + assert((type == WLR_CURSOR_SHAPE_MANAGER_V1_DEVICE_TYPE_TABLET_TOOL) == + (tablet_tool != NULL)); + device->resource = device_resource; device->manager = manager; device->type = type; + device->tablet_tool = tablet_tool; device->seat_client = seat_client; device->seat_client_destroy.notify = device_handle_seat_client_destroy; wl_signal_add(&seat_client->events.destroy, &device->seat_client_destroy); + if (tablet_tool != NULL) { + device->tablet_tool_destroy.notify = device_handle_tablet_tool_destroy; + wl_signal_add(&tablet_tool->wlr_tool->events.destroy, &device->tablet_tool_destroy); + } else { + wl_list_init(&device->tablet_tool_destroy.link); + } + wl_resource_set_user_data(device_resource, device); } @@ -120,18 +145,22 @@ static void manager_handle_get_pointer(struct wl_client *client, struct wl_resou uint32_t id, struct wl_resource *pointer_resource) { struct wlr_seat_client *seat_client = wlr_seat_client_from_pointer_resource(pointer_resource); create_device(manager_resource, id, seat_client, - WLR_CURSOR_SHAPE_MANAGER_V1_DEVICE_TYPE_POINTER); + WLR_CURSOR_SHAPE_MANAGER_V1_DEVICE_TYPE_POINTER, NULL); } static void manager_handle_get_tablet_tool_v2(struct wl_client *client, struct wl_resource *manager_resource, uint32_t id, struct wl_resource *tablet_tool_resource) { struct wlr_tablet_tool_client_v2 *tablet_tool_client = tablet_tool_client_from_resource(tablet_tool_resource); + struct wlr_seat_client *seat_client = NULL; - if (tablet_tool_client != NULL) { + struct wlr_tablet_v2_tablet_tool *tablet_tool = NULL; + if (tablet_tool_client != NULL && tablet_tool_client->tool != NULL) { seat_client = tablet_tool_client->seat->seat_client; + tablet_tool = tablet_tool_client->tool; } + create_device(manager_resource, id, seat_client, - WLR_CURSOR_SHAPE_MANAGER_V1_DEVICE_TYPE_TABLET_TOOL); + WLR_CURSOR_SHAPE_MANAGER_V1_DEVICE_TYPE_TABLET_TOOL, tablet_tool); } static const struct wp_cursor_shape_manager_v1_interface manager_impl = {