forked from moonlight-stream/moonlight-android
-
-
Notifications
You must be signed in to change notification settings - Fork 84
fix(input): add tap-to-click to screen DS5 touchpad #516
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 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
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
64 changes: 64 additions & 0 deletions
64
app/src/main/java/com/limelight/binding/input/touchpad/ScreenDs5TapClickDetector.kt
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,64 @@ | ||
| package com.limelight.binding.input.touchpad | ||
|
|
||
| import kotlin.math.abs | ||
|
|
||
| /** | ||
| * Decides whether a finger lift completes a DualSense clickpad tap. | ||
| * | ||
| * Mirrors the verified HarmonyOS behavior: a tap is a single-finger contact | ||
| * that stays short (<= [timeThresholdMs]) and still (<= [movementThresholdPx] | ||
| * from the press point). A second finger or drifting movement disqualifies the | ||
| * gesture, and eligibility never returns once lost. | ||
| */ | ||
| internal class ScreenDs5TapClickDetector( | ||
| private val movementThresholdPx: Float, | ||
| private val timeThresholdMs: Long = DEFAULT_TAP_TIME_MS, | ||
| ) { | ||
| private var pointerId = -1 | ||
| private var startX = 0f | ||
| private var startY = 0f | ||
| private var startTime = 0L | ||
| private var tapEligible = false | ||
|
|
||
| fun onDown(pointerId: Int, x: Float, y: Float, eventTime: Long) { | ||
| this.pointerId = pointerId | ||
| startX = x | ||
| startY = y | ||
| startTime = eventTime | ||
| tapEligible = true | ||
| } | ||
|
|
||
| /** A second finger landing disqualifies the whole gesture. */ | ||
| fun onPointerDown() { | ||
| tapEligible = false | ||
| } | ||
|
|
||
| fun onMove(pointerId: Int, x: Float, y: Float) { | ||
| if (pointerId != this.pointerId) return | ||
| if (exceedsMovement(x, y)) tapEligible = false | ||
| } | ||
|
|
||
| /** Returns true when the lift completes a valid tap; consumes the gesture either way. */ | ||
| fun onUp(pointerId: Int, x: Float, y: Float, eventTime: Long): Boolean { | ||
| val isTap = tapEligible && | ||
| pointerId == this.pointerId && | ||
| eventTime - startTime <= timeThresholdMs && | ||
| !exceedsMovement(x, y) | ||
| reset() | ||
| return isTap | ||
| } | ||
|
|
||
| fun cancel() = reset() | ||
|
|
||
| private fun exceedsMovement(x: Float, y: Float) = | ||
| abs(x - startX) > movementThresholdPx || abs(y - startY) > movementThresholdPx | ||
|
|
||
| private fun reset() { | ||
| pointerId = -1 | ||
| tapEligible = false | ||
| } | ||
|
|
||
| private companion object { | ||
| const val DEFAULT_TAP_TIME_MS = 250L | ||
| } | ||
| } |
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
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
59 changes: 59 additions & 0 deletions
59
app/src/test/java/com/limelight/binding/input/touchpad/ScreenDs5TapClickDetectorTest.kt
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,59 @@ | ||
| package com.limelight.binding.input.touchpad | ||
|
|
||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Test | ||
|
|
||
| class ScreenDs5TapClickDetectorTest { | ||
| private val detector = ScreenDs5TapClickDetector(movementThresholdPx = 24f) | ||
|
|
||
| @Test | ||
| fun quickStillTapClicks() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| detector.onMove(0, 108f, 212f) | ||
| assertTrue(detector.onUp(0, 110f, 215f, 1_200L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun slowLiftDoesNotClick() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| assertFalse(detector.onUp(0, 100f, 200f, 1_300L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun driftingFingerDoesNotClick() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| detector.onMove(0, 140f, 240f) | ||
| assertFalse(detector.onUp(0, 150f, 250f, 1_100L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun secondFingerDisqualifiesTap() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| detector.onPointerDown() | ||
| assertFalse(detector.onUp(0, 100f, 200f, 1_100L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun eligibilityNeverReturnsAfterMovement() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| detector.onMove(0, 140f, 200f) | ||
| detector.onMove(0, 100f, 200f) | ||
| assertFalse(detector.onUp(0, 100f, 200f, 1_100L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun cancelResetsGesture() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| detector.cancel() | ||
| assertFalse(detector.onUp(0, 100f, 200f, 1_100L)) | ||
| } | ||
|
|
||
| @Test | ||
| fun upConsumesGestureForNextFinger() { | ||
| detector.onDown(0, 100f, 200f, 1_000L) | ||
| assertTrue(detector.onUp(0, 100f, 200f, 1_100L)) | ||
| // A stale second-lift event for the consumed gesture must not click. | ||
| assertFalse(detector.onUp(0, 100f, 200f, 1_150L)) | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.