Skip to content

Comments

fix: make pointer lock work on Wayland#49283

Merged
jkleinsc merged 1 commit intoelectron:40-x-yfrom
vainiovano:wayland-pointer-lock
Feb 17, 2026
Merged

fix: make pointer lock work on Wayland#49283
jkleinsc merged 1 commit intoelectron:40-x-yfrom
vainiovano:wayland-pointer-lock

Conversation

@vainiovano
Copy link

@vainiovano vainiovano commented Dec 30, 2025 •
edited by codebytere
Loading

Description of Change

Chromium used to only implement pointer lock on Wayland in
Chrome-specific code, and this prevented Electron from making use of it.
This has been fixed on chromium main, so backport this as a patch to
Electron.

Checklist

Release Notes

Notes: Made pointer lock work on Wayland.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Dec 30, 2025
@vainiovano vainiovano mentioned this pull request Dec 30, 2025
Closed
3 tasks
@vainiovano
Copy link
Author

vainiovano commented Dec 30, 2025

Electron fiddle of MDN pointer lock demo for testing: https://gist.github.com/vainiovano/1c845b46e7b85012daee9f5e6aa0c874

@nikwen
Copy link
Member

nikwen commented Dec 30, 2025

Thanks for the PR!

Chromium only implements pointer lock for Wayland in BrowserDesktopWindowTreeHostLinux and not DesktopWindowTreeHostLinux

Would it make sense to fix this upstream by implementing it in DesktopWindowTreeHostLinux, too?

@vainiovano
Copy link
Author

vainiovano commented Dec 31, 2025

Would it make sense to fix this upstream by implementing it in DesktopWindowTreeHostLinux, too?

Yeah, I don't see anything that would prevent implementing it there, and this was in fact suggested in the initial PR that implemented pointer lock on Wayland. I opened https://chromium-review.googlesource.com/c/chromium/src/+/7362747 for this.

@redactedontop
Copy link

redactedontop commented Jan 3, 2026

Thank you SO MUCH!

nikwen
nikwen previously requested changes Jan 5, 2026
View reviewed changes
Copy link
Member

@nikwen nikwen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much, @vainiovano! 🙏

I just got a notification that your patch was merged upstream.

Could you update this PR to be a backport of that patch? Here are our docs for how the patch system works.

In short:

  1. Go into src
  2. Apply your patch
  3. git commit
  4. e patches chromium
  5. cd electron
  6. git commit
  7. git push -f

@vainiovano vainiovano force-pushed the wayland-pointer-lock branch from 5b3b036 to 1ecd2ce Compare January 6, 2026 08:38
@vainiovano vainiovano requested a review from a team as a code owner January 6, 2026 08:38
@vainiovano
Copy link
Author

vainiovano commented Jan 6, 2026

@nikwen This has now been turned into a backport of the upstream patch

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Jan 6, 2026
@vainiovano vainiovano force-pushed the wayland-pointer-lock branch from 1ecd2ce to b5f6e3c Compare January 6, 2026 18:31
@ckerr ckerr added semver/patch backwards-compatible bug fixes target/40-x-y PR should also be added to the "40-x-y" branch. labels Jan 7, 2026
@Play-InTheWay Play-InTheWay mentioned this pull request Jan 11, 2026
Open
@vainiovano vainiovano force-pushed the wayland-pointer-lock branch from b5f6e3c to 427bae4 Compare January 13, 2026 15:03
@vainiovano vainiovano requested review from a team as code owners January 13, 2026 15:03
@vainiovano vainiovano changed the base branch from main to 40-x-y January 13, 2026 15:03
github-actions[bot]
github-actions bot previously requested changes Jan 13, 2026
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @vainiovano! It looks like this pull request touches one of our dependency or CI files, and per our contribution policy we do not accept these types of changes in PRs.

@vainiovano
Copy link
Author

vainiovano commented Jan 13, 2026

I updated this to target the 40-x-y branch since my upstream patch has been included on main for a while.

@vainiovano vainiovano requested a review from ckerr January 13, 2026 15:07
@vainiovano vainiovano force-pushed the wayland-pointer-lock branch from 427bae4 to 203272d Compare January 14, 2026 19:01
@github-actions github-actions bot added the target/41-x-y PR should also be added to the "41-x-y" branch. label Jan 19, 2026
@codebytere codebytere added the backport-check-skip Skip trop's backport validity checking label Jan 20, 2026
@Creationsss Creationsss mentioned this pull request Jan 30, 2026
Closed
@codebytere
Copy link
Member

codebytere commented Feb 11, 2026

@vainiovano it looks like the patch fails to apply?

@vainiovano
Copy link
Author

vainiovano commented Feb 11, 2026

@codebytere It looks like the chromium update in ee64692 is conflicting with 45a6bfb: the patch got backported upstream, and the electron backport is now conflicting with it.

@vainiovano
Copy link
Author

vainiovano commented Feb 12, 2026

Rebased to bring in 21c6e4e which drops the v8 patch

@vainiovano
fix: make pointer lock work on Wayland
d2ff1fa 
Chromium used to only implement pointer lock on Wayland in
Chrome-specific code, and this prevented Electron from making use of it.
This has been fixed on chromium main, so backport this as a patch to
Electron.
@jkleinsc jkleinsc dismissed stale reviews from github-actions[bot] and nikwen February 17, 2026 20:35

stale

@jkleinsc jkleinsc merged commit 3302c4d into electron:40-x-y Feb 17, 2026
102 of 104 checks passed
@welcome
Copy link

welcome bot commented Feb 17, 2026

Congrats on merging your first pull request! 🎉🎉🎉

@release-clerk
Copy link

release-clerk bot commented Feb 17, 2026

Release Notes Persisted

Made pointer lock work on Wayland.

@trop trop bot mentioned this pull request Feb 17, 2026
Closed
@trop
Copy link
Contributor

trop bot commented Feb 17, 2026

I was unable to backport this PR to "40-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot added needs-manual-bp/40-x-y and removed target/40-x-y PR should also be added to the "40-x-y" branch. labels Feb 17, 2026
@trop
Copy link
Contributor

trop bot commented Feb 17, 2026

I have automatically backported this PR to "41-x-y", please check out #49837

@trop trop bot added in-flight/41-x-y and removed needs-manual-bp/40-x-y target/41-x-y PR should also be added to the "41-x-y" branch. in-flight/41-x-y labels Feb 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkleinsc jkleinsc jkleinsc approved these changes

@nikwen nikwen nikwen left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

@ckerr ckerr Awaiting requested review from ckerr

Assignees

No one assigned

Labels

backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vainiovano @nikwen @redactedontop @codebytere @ckerr @jkleinsc