From fe429b2463f279a6274bb6f42a3e23525a3c97aa Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 12 Apr 2024 14:55:17 +0200 Subject: [PATCH] Switch to stable tablet-v2 protocol References: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/284 --- backend/wayland/backend.c | 2 +- backend/wayland/meson.build | 2 +- backend/wayland/tablet_v2.c | 2 +- include/types/wlr_tablet_v2.h | 2 +- include/wlr/types/wlr_tablet_tool.h | 2 +- include/wlr/types/wlr_tablet_v2.h | 2 +- protocol/meson.build | 2 +- types/tablet_v2/wlr_tablet_v2.c | 2 +- types/tablet_v2/wlr_tablet_v2_pad.c | 2 +- types/tablet_v2/wlr_tablet_v2_tablet.c | 2 +- types/tablet_v2/wlr_tablet_v2_tool.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 9522de405..b0bce786c 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -26,7 +26,7 @@ #include "xdg-activation-v1-client-protocol.h" #include "xdg-decoration-unstable-v1-client-protocol.h" #include "xdg-shell-client-protocol.h" -#include "tablet-unstable-v2-client-protocol.h" +#include "tablet-v2-client-protocol.h" #include "relative-pointer-unstable-v1-client-protocol.h" #include "viewporter-client-protocol.h" diff --git a/backend/wayland/meson.build b/backend/wayland/meson.build index a4803478e..fcf9fdd8f 100644 --- a/backend/wayland/meson.build +++ b/backend/wayland/meson.build @@ -18,7 +18,7 @@ client_protos = [ 'pointer-gestures-unstable-v1', 'presentation-time', 'relative-pointer-unstable-v1', - 'tablet-unstable-v2', + 'tablet-v2', 'viewporter', 'xdg-activation-v1', 'xdg-decoration-unstable-v1', diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c index aec67dc0d..3f6a16eed 100644 --- a/backend/wayland/tablet_v2.c +++ b/backend/wayland/tablet_v2.c @@ -10,7 +10,7 @@ #include "backend/wayland.h" #include "util/time.h" -#include "tablet-unstable-v2-client-protocol.h" +#include "tablet-v2-client-protocol.h" struct tablet_tool { /* static */ diff --git a/include/types/wlr_tablet_v2.h b/include/types/wlr_tablet_v2.h index 2e54adcb7..af6a25838 100644 --- a/include/types/wlr_tablet_v2.h +++ b/include/types/wlr_tablet_v2.h @@ -1,7 +1,7 @@ #ifndef TYPES_WLR_TABLET_V2_H #define TYPES_WLR_TABLET_V2_H -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" #include #include diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index a7ab9382e..97abd5608 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -15,7 +15,7 @@ /* * Copy+Paste from libinput, but this should neither use libinput, nor - * tablet-unstable-v2 headers, so we can't include them + * tablet-v2 headers, so we can't include them */ enum wlr_tablet_tool_type { /** A generic pen */ diff --git a/include/wlr/types/wlr_tablet_v2.h b/include/wlr/types/wlr_tablet_v2.h index d3a659494..6da893b9c 100644 --- a/include/wlr/types/wlr_tablet_v2.h +++ b/include/wlr/types/wlr_tablet_v2.h @@ -12,7 +12,7 @@ #include #include -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" /* This can probably be even lower,the tools don't have a lot of buttons */ #define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16 diff --git a/protocol/meson.build b/protocol/meson.build index a424366d1..a4476918b 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -15,6 +15,7 @@ protocols = { # Stable upstream protocols 'linux-dmabuf-v1': wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml', 'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml', + 'tablet-v2': wl_protocol_dir / 'stable/tablet/tablet-v2.xml', 'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml', 'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', @@ -42,7 +43,6 @@ protocols = { 'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml', 'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml', 'relative-pointer-unstable-v1': wl_protocol_dir / 'unstable/relative-pointer/relative-pointer-unstable-v1.xml', - 'tablet-unstable-v2': wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml', 'text-input-unstable-v3': wl_protocol_dir / 'unstable/text-input/text-input-unstable-v3.xml', 'xdg-decoration-unstable-v1': wl_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', 'xdg-foreign-unstable-v1': wl_protocol_dir / 'unstable/xdg-foreign/xdg-foreign-unstable-v1.xml', diff --git a/types/tablet_v2/wlr_tablet_v2.c b/types/tablet_v2/wlr_tablet_v2.c index b0f35dffd..28671c9b0 100644 --- a/types/tablet_v2/wlr_tablet_v2.c +++ b/types/tablet_v2/wlr_tablet_v2.c @@ -8,7 +8,7 @@ #include #include #include -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" #define TABLET_MANAGER_VERSION 1 diff --git a/types/tablet_v2/wlr_tablet_v2_pad.c b/types/tablet_v2/wlr_tablet_v2_pad.c index 76208cace..ab7c3fc49 100644 --- a/types/tablet_v2/wlr_tablet_v2_pad.c +++ b/types/tablet_v2/wlr_tablet_v2_pad.c @@ -7,7 +7,7 @@ #include #include #include -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" static const struct wlr_tablet_pad_v2_grab_interface default_pad_grab_interface; diff --git a/types/tablet_v2/wlr_tablet_v2_tablet.c b/types/tablet_v2/wlr_tablet_v2_tablet.c index 81ccbbc7d..36609e8a6 100644 --- a/types/tablet_v2/wlr_tablet_v2_tablet.c +++ b/types/tablet_v2/wlr_tablet_v2_tablet.c @@ -7,7 +7,7 @@ #include #include -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" void destroy_tablet_v2(struct wl_resource *resource) { struct wlr_tablet_client_v2 *tablet = tablet_client_from_resource(resource); diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c index 9700e9043..8574a9a2f 100644 --- a/types/tablet_v2/wlr_tablet_v2_tool.c +++ b/types/tablet_v2/wlr_tablet_v2_tool.c @@ -8,7 +8,7 @@ #include #include "util/set.h" #include "util/time.h" -#include "tablet-unstable-v2-protocol.h" +#include "tablet-v2-protocol.h" static const struct wlr_tablet_tool_v2_grab_interface default_tool_grab_interface;