mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
feat: three-finger tap toggles Steam's on-screen keyboard in game mode (#782)
This commit is contained in:
1 parent
82f757f000
commit
356f048f00
4 files changed
+179
-12
No files matched your search
@@ -175,6 +175,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
private var watching = true
|
||||
private lateinit var touchpad: TouchpadGestures
|
||||
private lateinit var threeFingerTap: com.droiddeck.launcher.input.ThreeFingerTap
|
||||
private var touchMode by mutableStateOf(SessionPrefs.TOUCH_AUTO)
|
||||
private var cursorPos by mutableStateOf(androidx.compose.ui.geometry.Offset(-100f, -100f))
|
||||
private var cursorVisible by mutableStateOf(false)
|
||||
@@ -417,6 +418,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) }
|
||||
keyboard = KeyboardHost(this).also { root.addView(it) }
|
||||
touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener)
|
||||
threeFingerTap = com.droiddeck.launcher.input.ThreeFingerTap(PointerGestures.slop(this) * 2)
|
||||
val noCursor = android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL)
|
||||
root.pointerIcon = noCursor
|
||||
surfaceView.pointerIcon = noCursor
|
||||
@@ -2015,6 +2017,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||
if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event)
|
||||
if (routedTouchMode == SessionPrefs.TOUCH_OFF) return true
|
||||
if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") {
|
||||
val wasActive = threeFingerTap.active
|
||||
if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard()
|
||||
if (threeFingerTap.active && !wasActive) {
|
||||
if (usingTouchpad()) touchpad.cancel() else WaylandCompositor.nativeSendTouch(3, -1, 0, 0)
|
||||
}
|
||||
if (threeFingerTap.active || wasActive) return true
|
||||
}
|
||||
if (usingTouchpad()) {
|
||||
val rect = drawnRect() ?: return false
|
||||
if (touchpad.bounds != rect) {
|
||||
|
||||
@@ -55,7 +55,8 @@ public final class PadBridge {
|
||||
private boolean systemGuidePressed;
|
||||
private boolean systemQamPressed;
|
||||
private boolean qamChordActive;
|
||||
private boolean qamSyntheticAPressed;
|
||||
private int chordButton = -1;
|
||||
private boolean chordButtonPressed;
|
||||
private boolean qamTapPressed;
|
||||
private int qamChordGeneration;
|
||||
private volatile Runnable onPlayerInput;
|
||||
@@ -115,7 +116,7 @@ public final class PadBridge {
|
||||
systemGuidePressed = false;
|
||||
systemQamPressed = false;
|
||||
qamChordActive = false;
|
||||
qamSyntheticAPressed = false;
|
||||
chordButtonPressed = false;
|
||||
qamTapPressed = false;
|
||||
qamChordGeneration++;
|
||||
if (open) {
|
||||
@@ -340,7 +341,7 @@ public final class PadBridge {
|
||||
boolean qamStarted = qamPressed && !systemQamPressed;
|
||||
systemGuidePressed = guidePressed;
|
||||
systemQamPressed = qamPressed;
|
||||
if (qamStarted && !nativeQam()) startQamChord();
|
||||
if (qamStarted && !nativeQam()) startChord(PadState.A);
|
||||
else publish();
|
||||
}
|
||||
|
||||
@@ -367,7 +368,7 @@ public final class PadBridge {
|
||||
|
||||
public synchronized void triggerQam() {
|
||||
if (!nativeQam()) {
|
||||
startQamChord();
|
||||
startChord(PadState.A);
|
||||
return;
|
||||
}
|
||||
if (qamTapPressed) return;
|
||||
@@ -383,12 +384,17 @@ public final class PadBridge {
|
||||
publish();
|
||||
}
|
||||
|
||||
private void startQamChord() {
|
||||
public synchronized void triggerSteamKeyboard() {
|
||||
startChord(PadState.X);
|
||||
}
|
||||
|
||||
private void startChord(int button) {
|
||||
if (qamChordActive) return;
|
||||
qamChordActive = true;
|
||||
chordButton = button;
|
||||
int generation = ++qamChordGeneration;
|
||||
publish();
|
||||
chordHandler.postDelayed(() -> pressQamA(generation), qamGuideLeadMs());
|
||||
chordHandler.postDelayed(() -> pressChordButton(generation), qamGuideLeadMs());
|
||||
}
|
||||
|
||||
static long qamGuideLeadMs() {
|
||||
@@ -397,16 +403,16 @@ public final class PadBridge {
|
||||
return Math.max(QAM_GUIDE_LEAD_MIN_MS, Math.min(QAM_GUIDE_LEAD_MAX_MS, frame * QAM_GUIDE_LEAD_FRAMES));
|
||||
}
|
||||
|
||||
private synchronized void pressQamA(int generation) {
|
||||
private synchronized void pressChordButton(int generation) {
|
||||
if (generation != qamChordGeneration || !qamChordActive) return;
|
||||
qamSyntheticAPressed = true;
|
||||
chordButtonPressed = true;
|
||||
publish();
|
||||
chordHandler.postDelayed(() -> releaseQamA(generation), QAM_A_HOLD_MS);
|
||||
chordHandler.postDelayed(() -> releaseChordButton(generation), QAM_A_HOLD_MS);
|
||||
}
|
||||
|
||||
private synchronized void releaseQamA(int generation) {
|
||||
private synchronized void releaseChordButton(int generation) {
|
||||
if (generation != qamChordGeneration || !qamChordActive) return;
|
||||
qamSyntheticAPressed = false;
|
||||
chordButtonPressed = false;
|
||||
publish();
|
||||
chordHandler.postDelayed(() -> releaseQamGuide(generation), QAM_GUIDE_TAIL_MS);
|
||||
}
|
||||
@@ -525,7 +531,7 @@ public final class PadBridge {
|
||||
effectiveState.copyFrom(state);
|
||||
if (guide) effectiveState.press(PadState.GUIDE, true);
|
||||
if (qam) effectiveState.press(PadState.QAM, true);
|
||||
if (qamSyntheticAPressed) effectiveState.press(PadState.A, true);
|
||||
if (chordButtonPressed) effectiveState.press(chordButton, true);
|
||||
writer.writePad(effectiveState);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.view.MotionEvent
|
||||
import kotlin.math.hypot
|
||||
|
||||
class ThreeFingerTap(private val slopPx: Float) {
|
||||
var active = false
|
||||
private set
|
||||
|
||||
private val starts = HashMap<Int, Pair<Float, Float>>()
|
||||
private var downAt = 0L
|
||||
private var threeAt = 0L
|
||||
private var valid = false
|
||||
|
||||
fun onTouch(event: MotionEvent): Boolean {
|
||||
when (event.actionMasked) {
|
||||
MotionEvent.ACTION_DOWN -> {
|
||||
starts.clear()
|
||||
active = false
|
||||
valid = true
|
||||
downAt = event.eventTime
|
||||
note(event, event.actionIndex)
|
||||
}
|
||||
MotionEvent.ACTION_POINTER_DOWN -> {
|
||||
note(event, event.actionIndex)
|
||||
if (event.pointerCount > 3) valid = false
|
||||
if (event.pointerCount == 3 && !active) {
|
||||
active = true
|
||||
threeAt = event.eventTime
|
||||
if (threeAt - downAt > LAND_MS) valid = false
|
||||
}
|
||||
}
|
||||
MotionEvent.ACTION_MOVE -> for (i in 0 until event.pointerCount) {
|
||||
val start = starts[event.getPointerId(i)] ?: continue
|
||||
if (hypot(event.getX(i) - start.first, event.getY(i) - start.second) > slopPx) valid = false
|
||||
}
|
||||
MotionEvent.ACTION_UP -> {
|
||||
val fired = active && valid && event.eventTime - threeAt < TAP_MS
|
||||
active = false
|
||||
return fired
|
||||
}
|
||||
MotionEvent.ACTION_CANCEL -> active = false
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
private fun note(event: MotionEvent, index: Int) {
|
||||
starts[event.getPointerId(index)] = event.getX(index) to event.getY(index)
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val LAND_MS = 250L
|
||||
const val TAP_MS = 350L
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user