-
-
Notifications
You must be signed in to change notification settings - Fork 270
feat: Improve pointer exclusivity handling #1152
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Unnvaldr
wants to merge
2
commits into
utkarshdalal:master
Choose a base branch
from
Unnvaldr:feat-improve-pointer-exclusivity-handling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+164
−47
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
92 changes: 92 additions & 0 deletions
92
app/src/main/java/com/winlator/inputcontrols/InputCaptureManager.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package com.winlator.inputcontrols; | ||
|
|
||
| import android.view.View; | ||
|
|
||
| import timber.log.Timber; | ||
|
|
||
| public class InputCaptureManager { | ||
| private final View targetView; | ||
|
|
||
| private boolean captureEnabled = false; | ||
| private boolean pointerCaptureRequested = true; | ||
|
|
||
| public InputCaptureManager(View targetView) { | ||
| this.targetView = targetView; | ||
| } | ||
|
|
||
| public boolean isCaptureEnabled() { | ||
| return captureEnabled; | ||
| } | ||
|
|
||
| public void setCaptureEnabled(boolean captureEnabled) { | ||
| this.captureEnabled = captureEnabled; | ||
| } | ||
|
|
||
| public boolean isPointerCaptureRequested() { | ||
| return pointerCaptureRequested; | ||
| } | ||
|
|
||
| public void setPointerCaptureRequested(boolean pointerCaptureRequested) { | ||
| this.pointerCaptureRequested = pointerCaptureRequested; | ||
| } | ||
|
|
||
| public void onWindowFocusChanged(@SuppressWarnings("unused") boolean hasFocus) { | ||
| refreshPointerCapture(); | ||
| } | ||
|
|
||
| public void onAttachedToWindow() { | ||
| enablePointerCapture(); | ||
| } | ||
|
|
||
| public void onDetachedFromWindow() { | ||
| disablePointerCapture(); | ||
| } | ||
|
|
||
| public void refreshPointerCapture() { | ||
| boolean shouldCapture = targetView.hasFocus() && pointerCaptureRequested; | ||
| boolean hasCapture = targetView.hasPointerCapture(); | ||
|
|
||
| if (shouldCapture && !hasCapture) { | ||
| enablePointerCapture(); | ||
| setPointerCaptureRequested(true); | ||
| } else if (!shouldCapture && hasCapture) { | ||
| disablePointerCapture(); | ||
| setPointerCaptureRequested(false); | ||
| } | ||
| } | ||
|
|
||
| public void togglePointerCapture() { | ||
| if (!captureEnabled) return; | ||
| if (targetView.hasPointerCapture()) { | ||
| disablePointerCapture(); | ||
| setPointerCaptureRequested(false); | ||
| } else { | ||
| enablePointerCapture(); | ||
| setPointerCaptureRequested(true); | ||
| } | ||
| } | ||
|
|
||
| public void disablePointerCapture() { | ||
| if (!captureEnabled) return; | ||
| if (!targetView.hasPointerCapture() || !pointerCaptureRequested) { | ||
| Timber.tag("TouchpadView").v("Pointer capture: Pointer capture not detected, skipped"); | ||
| return; | ||
| } | ||
| targetView.releasePointerCapture(); | ||
| Timber.tag("TouchpadView").v("Pointer capture: Pointer capture release (state=%s).", targetView.hasPointerCapture()); | ||
| } | ||
|
|
||
| public void enablePointerCapture() { | ||
| if (!captureEnabled) return; | ||
| if (!targetView.hasFocus() && !targetView.requestFocus()) { | ||
| Timber.tag("TouchpadView").w("Pointer capture: Unable to request pointer capture, view is unfocused and cannot regain focus!"); | ||
| return; | ||
| } | ||
| if (targetView.hasPointerCapture() && !pointerCaptureRequested) { | ||
|
Unnvaldr marked this conversation as resolved.
|
||
| Timber.v("Pointer capture: Pointer capture already requested, skipped"); | ||
| return; | ||
| } | ||
| targetView.requestPointerCapture(); | ||
| Timber.tag("TouchpadView").v("Pointer capture: Pointer capture request (state=%s).", targetView.hasPointerCapture()); | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-check capture eligibility inside the delayed refresh.
tryCapturePointer()validatesshowQuickMenu/editor/touchscreen state before posting, but those flags can change during the 100ms delay. A device event that races withgameBack()or edit-mode entry can still reacquire pointer capture over the overlay.Suggested fix
🤖 Prompt for AI Agents