fix: address mouse capture review feedback#1962
Merged
maximilien-noal merged 2 commits intofeature/mouse_capturefrom Mar 12, 2026
Merged
fix: address mouse capture review feedback#1962maximilien-noal merged 2 commits intofeature/mouse_capturefrom
maximilien-noal merged 2 commits intofeature/mouse_capturefrom
Conversation
Co-authored-by: maximilien-noal <1087524+maximilien-noal@users.noreply.github.com>
Contributor
Author
|
Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details. Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
Copilot
AI
changed the title
[WIP] Add mouse capture feature to game window
fix: address mouse capture review feedback
Mar 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses all review comments from the mouse capture PR review.
Description of Changes
NativeMouseCapture.csx11Display/isCaptured→_x11Display/_isCaptured(underscore-prefix convention)DllImport:"libSystem.dylib"→"CoreGraphics"(symbols live in CoreGraphics framework, not libSystem)DisableCapture():_isCapturednow only set tofalseafter the platform call succeeds — prevents state/OS mismatch on failure, and ensuresCleanup()still releases if an earlier disable failedXGrabPointerconfineTo:IntPtr.Zero→windowHandle— without this, X11 grab doesn't actually confine the cursorMainWindow.axaml.csLayoutUpdated(fires every layout pass → repeated native calls) withSizeChanged/PositionChangedfor re-applying capture only on actual bounds changesAttemptCaptureIfPointerInView→AttemptCapture— no pointer-in-view check was ever performed; name was misleadingDeactivated/Activatedhandlers: capture is released on focus loss (Alt+Tab) and restored on re-activation, preventing the cursor from being trapped outside the windowRationale behind Changes
The original implementation had several correctness and behavioral issues: internal state could desync from OS state on failed platform calls, X11 capture didn't actually confine the cursor,
LayoutUpdatedcaused excessive native syscalls, and Alt+Tab would leave the cursor permanently trapped.Suggested Testing Steps
DllNotFoundExceptionat runtime✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.