diff --git a/cursor-shape-v1.xml b/cursor-shape-v1.xml deleted file mode 100644 index 56f6a1a6..00000000 --- a/cursor-shape-v1.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - Copyright 2018 The Chromium Authors - Copyright 2023 Simon Ser - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice (including the next - paragraph) shall be included in all copies or substantial portions of the - Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - - - - - This global offers an alternative, optional way to set cursor images. This - new way uses enumerated cursors instead of a wl_surface like - wl_pointer.set_cursor does. - - Warning! The protocol described in this file is currently in the testing - phase. Backward compatible changes may be added together with the - corresponding interface version bump. Backward incompatible changes can - only be done by creating a new major version of the extension. - - - - - Destroy the cursor shape manager. - - - - - - Obtain a wp_cursor_shape_device_v1 for a wl_pointer object. - - - - - - - - Obtain a wp_cursor_shape_device_v1 for a zwp_tablet_tool_v2 object. - - - - - - - - - This interface advertises the list of supported cursor shapes for a - device, and allows clients to set the cursor shape. - - - - - This enum describes cursor shapes. - - The names are taken from the CSS W3C specification: - https://w3c.github.io/csswg-drafts/css-ui/#cursor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Destroy the cursor shape device. - - The device cursor shape remains unchanged. - - - - - - Sets the device cursor to the specified shape. The compositor will - change the cursor image based on the specified shape. - - The cursor actually changes only if the input device focus is one of - the requesting client's surfaces. If any, the previous cursor image - (surface or shape) is replaced. - - The "shape" argument must be a valid enum entry, otherwise the - invalid_shape protocol error is raised. - - This is similar to the wl_pointer.set_cursor and - zwp_tablet_tool_v2.set_cursor requests, but this request accepts a - shape instead of contents in the form of a surface. Clients can mix - set_cursor and set_shape requests. - - The serial parameter must match the latest wl_pointer.enter or - zwp_tablet_tool_v2.proximity_in serial number sent to the client. - Otherwise the request will be ignored. - - - - - - diff --git a/meson.build b/meson.build index ed0bf4a0..8535a4d1 100644 --- a/meson.build +++ b/meson.build @@ -170,11 +170,13 @@ else fractional_scale = false endif -# TODO: check wayland-protocols version -wl_proto_xml += [wayland_protocols_datadir + '/unstable/tablet/tablet-unstable-v2.xml', # required by cursor-shape-v1 - 'cursor-shape-v1.xml', # TODO: use wayland-protocols - ] -add_project_arguments('-DHAVE_CURSOR_SHAPE', language: 'c') +if wayland_protocols.version().version_compare('>=1.31') # TODO: 1.32 + wl_proto_xml += [ + wayland_protocols_datadir + '/unstable/tablet/tablet-unstable-v2.xml', # required by cursor-shape-v1 + wayland_protocols_datadir + '/staging/cursor-shape/cursor-shape-v1.xml', + ] + add_project_arguments('-DHAVE_CURSOR_SHAPE', language: 'c') +endif foreach prot : wl_proto_xml wl_proto_headers += custom_target(