From 091c6e09b1bbca6dc7d7191f92a375c4524bba64 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 29 Feb 2024 11:38:34 +0100 Subject: [PATCH] tablet-v2: only send id event is vendor is set Some tablets may not have a USB vendor/product set. References: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/180#note_2303637 --- types/tablet_v2/wlr_tablet_v2_tablet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/types/tablet_v2/wlr_tablet_v2_tablet.c b/types/tablet_v2/wlr_tablet_v2_tablet.c index 184570f6..4c49c20b 100644 --- a/types/tablet_v2/wlr_tablet_v2_tablet.c +++ b/types/tablet_v2/wlr_tablet_v2_tablet.c @@ -102,13 +102,14 @@ void add_tablet_client(struct wlr_tablet_seat_client_v2 *seat, client, destroy_tablet_v2); zwp_tablet_seat_v2_send_tablet_added(seat->resource, client->resource); - // Send the expected events if (tablet->wlr_tablet->base.name) { zwp_tablet_v2_send_name(client->resource, tablet->wlr_tablet->base.name); } - zwp_tablet_v2_send_id(client->resource, - tablet->wlr_device->vendor, tablet->wlr_device->product); + if (tablet->wlr_device->vendor != 0) { + zwp_tablet_v2_send_id(client->resource, + tablet->wlr_device->vendor, tablet->wlr_device->product); + } const char **path_ptr; wl_array_for_each(path_ptr, &tablet->wlr_tablet->paths) {