Add pointer warping on wayland #112287

Kiisu-Master · 2025-11-01T15:53:15Z

fixes #64296
Note: I have no idea if how i did things is correct, this is my second time working with c++ and godot source.
I just tried to follow how things were done in the surrounding code.

Tested on latest kwin plasma 6.5.1

Kiisu-Master · 2025-11-02T12:19:19Z

It seems the commit hash in thirdparty/README.md for wayland-protocols didn't get updated here ae74c0c

I just copied the pointer warp xml file from the main branch, should i include the one from 1.45 if its different?

platform/linuxbsd/wayland/wayland_thread.cpp

platform/linuxbsd/wayland/display_server_wayland.cpp

deralmas · 2025-11-02T13:30:07Z

I just copied the pointer warp xml file from the main branch, should i include the one from 1.45 if its different?

Yea, as wayland-protocols is at that version. If the protocol is not available there feel free to make a PR updating it.

Copied this code from pointer_set_hint, should there be a function to remove the duplicate scaling code?

Nah, it's done in only two places now and it's something that we should generally not do, as pointed out by the big comment.

What about the comment?

Not sure tbh. I'll be fair, in these cases I just keep them there, duplicated. You never know if the other half will be there by the time you'll need to read that comment again :P

platform/linuxbsd/wayland/wayland_thread.cpp

Kiisu-Master · 2025-11-04T13:48:11Z

platform/linuxbsd/wayland/wayland_thread.cpp

+		return;
+	}
+
+	struct wl_surface *surface = window_get_wl_surface(p_ss->pointer_data.last_pointed_id);


Whats the difference between last_pointed_id and pointed_id? I just noticed back in pointer_warp it uses pointed_id to get the window...

Hmm doesn't seem to make a difference. Ill just make it use pointed_id here too.

pointed_id is the current pointed window. It will be set to INVALID_WINDOW_ID, while last_pointed_id never gets cleared.

platform/linuxbsd/wayland/wayland_thread.cpp

Kiisu-Master · 2025-11-04T16:53:00Z

I keep forgetting to add changed files before committing

YeldhamDev · 2025-11-05T22:48:13Z

This is not working at all on my end: Fedora Kinoite 42 / KDE Plasma 6.5.1

Kiisu-Master · 2025-11-05T23:16:20Z

How did you test it?
For me it's working with the same plasma version... im on arch.
Just have to make sure that godot is actually using wayland.

Heres a test project i made for this:
PointerWarp.zip

YeldhamDev

Oh, I see. I had prefer_wayland enabled and forgot that it's an editor setting. It works now.

CC @bruvzg to check the code.

deralmas

I was going to try it on my machine but it looks like sway does not implement it yet. Code looks fine except for a small nitpick.

deralmas · 2025-11-05T23:40:03Z

platform/linuxbsd/wayland/wayland_thread.cpp


+	if (name == registry->wp_pointer_warp_name) {
+		if (registry->wp_pointer_warp) {
+			wp_pointer_warp_v1_destroy(registry->wp_pointer_warp);


Don't forget to also destroy it WaylandThread::destroy().

I don't understand what you mean

Ah, you have to destroy it there too? I'll add this tomorrow

Yea it's kinda annoying. I've considered making it automatic but I feel like it would make everything more complex for little gain.

It seems like there is some other ones also not being destroyed there? I think thats why i missed it
wp_text_input_manager , wp_tablet_manager

bruvzg · 2025-11-06T07:48:16Z

thirdparty/README.md


 - Upstream: https://gitlab.freedesktop.org/wayland/wayland-protocols
- Version: 1.45 (54346071a5f211f2c482889f2c8ee3b5ecda63ab, 2025)
+- Version: 1.45 (0091197f5c1b1f2c131f1410e99f9c95d50646be, 2025)


For the reference, old commit (or version) were wrong and correspond to 1.33.

bruvzg · 2025-11-06T07:53:48Z

platform/linuxbsd/wayland/wayland_thread.cpp

+		// 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));
+	}


Probably should be:

if (!ws) { return; } int wl_pos_x = std::round(p_to.x / window_....

Warping to 0,0 is not expected behavior if there's no active window.

Yea great catch!

Should this be also done for pointer_set_hint?

it's been a while since I wrote the original code but yea, I guess that makes more sense.

Chaosus added enhancement platform:linuxbsd topic:platforms topic:thirdparty labels Nov 1, 2025

Chaosus added this to the 4.x milestone Nov 1, 2025

deralmas self-assigned this Nov 2, 2025

Kiisu-Master commented Nov 2, 2025

View reviewed changes

platform/linuxbsd/wayland/wayland_thread.cpp Show resolved Hide resolved

Kiisu-Master commented Nov 2, 2025

View reviewed changes

platform/linuxbsd/wayland/display_server_wayland.cpp Outdated Show resolved Hide resolved

Kiisu-Master force-pushed the wl_pointer_warp branch 2 times, most recently from e95791a to 1d153b6 Compare November 3, 2025 20:27

Kiisu-Master marked this pull request as ready for review November 3, 2025 20:42

Kiisu-Master requested review from a team as code owners November 3, 2025 20:42

deralmas reviewed Nov 3, 2025

View reviewed changes

platform/linuxbsd/wayland/wayland_thread.cpp Show resolved Hide resolved

Kiisu-Master commented Nov 4, 2025

View reviewed changes

Kiisu-Master force-pushed the wl_pointer_warp branch 2 times, most recently from 8850dc3 to 89faf8f Compare November 4, 2025 13:59

deralmas reviewed Nov 4, 2025

View reviewed changes

platform/linuxbsd/wayland/wayland_thread.cpp Show resolved Hide resolved

Kiisu-Master force-pushed the wl_pointer_warp branch from 89faf8f to 9f8a4ef Compare November 4, 2025 16:49

Kiisu-Master force-pushed the wl_pointer_warp branch from 9f8a4ef to 1500375 Compare November 4, 2025 16:54

YeldhamDev approved these changes Nov 5, 2025

View reviewed changes

deralmas requested changes Nov 5, 2025

View reviewed changes

bruvzg self-requested a review November 6, 2025 06:25

bruvzg reviewed Nov 6, 2025

View reviewed changes

deralmas mentioned this pull request Nov 6, 2025

modifiying mouse position doesn't work (Linux Wayland) #64296

Open

Add pointer warping on wayland

876d66e

Kiisu-Master force-pushed the wl_pointer_warp branch from 1500375 to 876d66e Compare November 6, 2025 18:29

Uh oh!

Add pointer warping on wayland #112287

Are you sure you want to change the base?

Add pointer warping on wayland #112287

Conversation

Kiisu-Master commented Nov 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kiisu-Master commented Nov 2, 2025

Uh oh!

Uh oh!

Uh oh!

deralmas commented Nov 2, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Kiisu-Master commented Nov 4, 2025

Uh oh!

YeldhamDev commented Nov 5, 2025

Uh oh!

Kiisu-Master commented Nov 5, 2025

Uh oh!

YeldhamDev left a comment

Choose a reason for hiding this comment

Uh oh!

deralmas left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kiisu-Master Nov 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deralmas Nov 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Kiisu-Master commented Nov 1, 2025 •

edited

Loading

Kiisu-Master Nov 6, 2025 •

edited

Loading

deralmas Nov 6, 2025 •

edited

Loading