From 15003758d2ddb00af4076b30177e333b8393a0e3 Mon Sep 17 00:00:00 2001 From: Kiisu_Master <142301391+Kiisu-Master@users.noreply.github.com> Date: Sat, 1 Nov 2025 17:42:50 +0200 Subject: [PATCH] Add pointer warping on wayland --- platform/linuxbsd/wayland/SCsub | 1 + .../wayland/display_server_wayland.cpp | 13 +--- platform/linuxbsd/wayland/wayland_thread.cpp | 70 ++++++++++++++++++ platform/linuxbsd/wayland/wayland_thread.h | 6 ++ thirdparty/README.md | 4 +- .../staging/pointer-warp/README | 7 ++ .../staging/pointer-warp/pointer-warp-v1.xml | 72 +++++++++++++++++++ 7 files changed, 160 insertions(+), 13 deletions(-) create mode 100644 thirdparty/wayland-protocols/staging/pointer-warp/README create mode 100644 thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml diff --git a/platform/linuxbsd/wayland/SCsub b/platform/linuxbsd/wayland/SCsub index 2fe1c36ffaba..08ad10d16152 100644 --- a/platform/linuxbsd/wayland/SCsub +++ b/platform/linuxbsd/wayland/SCsub @@ -69,6 +69,7 @@ generated_sources = [ generate_from_xml( "xdg_toplevel_icon", "#thirdparty/wayland-protocols/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml" ), + generate_from_xml("pointer_warp", "#thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml"), # Unstable protocols generate_from_xml( "idle_inhibit", "#thirdparty/wayland-protocols/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index 34df102564f3..b577d19b1822 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -449,20 +449,9 @@ bool DisplayServerWayland::mouse_is_mode_override_enabled() const { return mouse_mode_override_enabled; } -// NOTE: This is hacked together (and not guaranteed to work in the first place) -// as for some reason the there's no proper way to ask the compositor to warp -// the pointer, although, at the time of writing, there's a proposal for a -// proper protocol for this. See: -// https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/158 void DisplayServerWayland::warp_mouse(const Point2i &p_to) { MutexLock mutex_lock(wayland_thread.mutex); - - WaylandThread::PointerConstraint old_constraint = wayland_thread.pointer_get_constraint(); - - wayland_thread.pointer_set_constraint(WaylandThread::PointerConstraint::LOCKED); - wayland_thread.pointer_set_hint(p_to); - - wayland_thread.pointer_set_constraint(old_constraint); + wayland_thread.pointer_warp(p_to); } Point2i DisplayServerWayland::mouse_get_position() const { diff --git a/platform/linuxbsd/wayland/wayland_thread.cpp b/platform/linuxbsd/wayland/wayland_thread.cpp index 423554ea411c..52dbdbe5d0cb 100644 --- a/platform/linuxbsd/wayland/wayland_thread.cpp +++ b/platform/linuxbsd/wayland/wayland_thread.cpp @@ -659,6 +659,12 @@ void WaylandThread::_wl_registry_on_global(void *data, struct wl_registry *wl_re return; } + if (strcmp(interface, wp_pointer_warp_v1_interface.name) == 0) { + registry->wp_pointer_warp = (struct wp_pointer_warp_v1 *)wl_registry_bind(wl_registry, name, &wp_pointer_warp_v1_interface, 1); + registry->wp_pointer_warp_name = name; + return; + } + if (strcmp(interface, FIFO_INTERFACE_NAME) == 0) { registry->wp_fifo_manager_name = name; } @@ -1023,6 +1029,17 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry return; } + if (name == registry->wp_pointer_warp_name) { + if (registry->wp_pointer_warp) { + wp_pointer_warp_v1_destroy(registry->wp_pointer_warp); + registry->wp_pointer_warp = nullptr; + } + + registry->wp_pointer_warp_name = 0; + + return; + } + { // Iterate through all of the seats to find if any got removed. List::Element *E = registry->wl_seats.front(); @@ -3374,6 +3391,21 @@ void WaylandThread::seat_state_set_hint(SeatState *p_ss, int p_x, int p_y) { zwp_locked_pointer_v1_set_cursor_position_hint(p_ss->wp_locked_pointer, wl_fixed_from_int(p_x), wl_fixed_from_int(p_y)); } +void WaylandThread::seat_state_warp_pointer(SeatState *p_ss, int p_x, int p_y) { + if (registry.wp_pointer_warp == nullptr) { + return; + } + + if (p_ss->pointer_data.pointed_id == DisplayServer::INVALID_WINDOW_ID) { + return; + } + + struct wl_surface *surface = window_get_wl_surface(p_ss->pointer_data.pointed_id); + ERR_FAIL_NULL(surface); + + wp_pointer_warp_v1_warp_pointer(registry.wp_pointer_warp, surface, p_ss->wl_pointer, wl_fixed_from_int(p_x), wl_fixed_from_int(p_y), p_ss->pointer_enter_serial); +} + void WaylandThread::seat_state_confine_pointer(SeatState *p_ss) { ERR_FAIL_NULL(p_ss); @@ -4400,6 +4432,44 @@ void WaylandThread::pointer_set_hint(const Point2i &p_hint) { } } +void WaylandThread::pointer_warp(const Point2i &p_to) { + // NOTE: This is for compositors that don't support the pointer-warp protocol. + // It's hacked together and not guaranteed to work. + if (registry.wp_pointer_warp == nullptr) { + PointerConstraint old_constraint = pointer_get_constraint(); + + pointer_set_constraint(PointerConstraint::LOCKED); + pointer_set_hint(p_to); + + pointer_set_constraint(old_constraint); + + return; + } + + SeatState *ss = wl_seat_get_seat_state(wl_seat_current); + if (!ss) { + return; + } + + WindowState *ws = window_get_state(ss->pointer_data.pointed_id); + + int wl_pos_x = 0; + int wl_pos_y = 0; + + if (ws) { + // NOTE: It looks like it's not really recommended to convert from + // "godot-space" to "wayland-space" and in general I received mixed feelings + // discussing about this. I'm not really sure about the maths behind this but, + // oh well. ¯\_(ツ)_/¯ + // See: https://oftc.irclog.whitequark.org/wayland/2023-08-23#1692756914-1692816818 + wl_pos_x = std::round(p_to.x / window_state_get_scale_factor(ws)); + wl_pos_y = std::round(p_to.y / window_state_get_scale_factor(ws)); + } + + if (ss) { + seat_state_warp_pointer(ss, wl_pos_x, wl_pos_y); + } +} WaylandThread::PointerConstraint WaylandThread::pointer_get_constraint() const { return pointer_constraint; } diff --git a/platform/linuxbsd/wayland/wayland_thread.h b/platform/linuxbsd/wayland/wayland_thread.h index b0add5ec89cd..93ed599ae54e 100644 --- a/platform/linuxbsd/wayland/wayland_thread.h +++ b/platform/linuxbsd/wayland/wayland_thread.h @@ -58,6 +58,7 @@ #include "wayland/protocol/cursor_shape.gen.h" #include "wayland/protocol/pointer_constraints.gen.h" #include "wayland/protocol/pointer_gestures.gen.h" +#include "wayland/protocol/pointer_warp.gen.h" #include "wayland/protocol/relative_pointer.gen.h" #undef pointer #include "wayland/protocol/fractional_scale.gen.h" @@ -225,6 +226,9 @@ class WaylandThread { struct zwp_text_input_manager_v3 *wp_text_input_manager = nullptr; uint32_t wp_text_input_manager_name = 0; + struct wp_pointer_warp_v1 *wp_pointer_warp = nullptr; + uint32_t wp_pointer_warp_name = 0; + // We're really not meant to use this one directly but we still need to know // whether it's available. uint32_t wp_fifo_manager_name = 0; @@ -1012,6 +1016,7 @@ class WaylandThread { void seat_state_unlock_pointer(SeatState *p_ss); void seat_state_lock_pointer(SeatState *p_ss); void seat_state_set_hint(SeatState *p_ss, int p_x, int p_y); + void seat_state_warp_pointer(SeatState *p_ss, int p_x, int p_y); void seat_state_confine_pointer(SeatState *p_ss); static void seat_state_update_cursor(SeatState *p_ss); @@ -1070,6 +1075,7 @@ class WaylandThread { void pointer_set_constraint(PointerConstraint p_constraint); void pointer_set_hint(const Point2i &p_hint); + void pointer_warp(const Point2i &p_to); PointerConstraint pointer_get_constraint() const; DisplayServer::WindowID pointer_get_pointed_window_id() const; DisplayServer::WindowID pointer_get_last_pointed_window_id() const; diff --git a/thirdparty/README.md b/thirdparty/README.md index efd9dc924752..5ce0b62fc710 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -1157,7 +1157,7 @@ Files extracted from upstream source: # wayland-protocols - Upstream: https://gitlab.freedesktop.org/wayland/wayland-protocols -- Version: 1.45 (54346071a5f211f2c482889f2c8ee3b5ecda63ab, 2025) +- Version: 1.45 (0091197f5c1b1f2c131f1410e99f9c95d50646be, 2025) - License: MIT Files extracted from upstream source: @@ -1171,6 +1171,8 @@ Files extracted from upstream source: - `staging/xdg-activation/README` - `staging/xdg-activation/xdg-activation-v1.xml` - `staging/xdg-system-bell/xdg-system-bell-v1.xml` +- `staging/pointer-warp/pointer-warp-v1.xml` +- `staging/pointer-warp/README` - `unstable/idle-inhibit/README` - `unstable/idle-inhibit/idle-inhibit-unstable-v1.xml` - `unstable/pointer-constraints/README` diff --git a/thirdparty/wayland-protocols/staging/pointer-warp/README b/thirdparty/wayland-protocols/staging/pointer-warp/README new file mode 100644 index 000000000000..a94847545465 --- /dev/null +++ b/thirdparty/wayland-protocols/staging/pointer-warp/README @@ -0,0 +1,7 @@ +pointer-warp protocol + +Maintainers: +Neal Gompa (@Conan_Kudo) +Xaver Hugl (@Zamundaaa) +Matthias Klumpp (@mak) +Vlad Zahorodnii (@zzag) diff --git a/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml b/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml new file mode 100644 index 000000000000..158dad83c5db --- /dev/null +++ b/thirdparty/wayland-protocols/staging/pointer-warp/pointer-warp-v1.xml @@ -0,0 +1,72 @@ + + + + Copyright © 2024 Neal Gompa + Copyright © 2024 Xaver Hugl + Copyright © 2024 Matthias Klumpp + Copyright © 2024 Vlad Zahorodnii + + 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 interface allows applications to request the pointer to be + moved to a position relative to a wl_surface. + + Note that if the desired behavior is to constrain the pointer to an area + or lock it to a position, this protocol does not provide a reliable way + to do that. The pointer constraint and pointer lock protocols should be + used for those use cases instead. + + 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 pointer warp manager. + + + + + + Request the compositor to move the pointer to a surface-local position. + Whether or not the compositor honors the request is implementation defined, + but it should + - honor it if the surface has pointer focus, including + when it has an implicit pointer grab + - reject it if the enter serial is incorrect + - reject it if the requested position is outside of the surface + + Note that the enter serial is valid for any surface of the client, + and does not have to be from the surface the pointer is warped to. + + + + + + + + + +