From 7c20d4b5c3cf38504d4ea310cef3ed878273a69f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 19 Oct 2026 14:18:26 -0400 Subject: [PATCH] Fix direct-touch right-click and Steam Touch mode restoration (#677) --- .../com/droiddeck/launcher/SessionActivity.kt | 12 ++++ .../launcher/input/DirectTouchHold.kt | 53 ++++++++++++++ .../launcher/input/DirectTouchHoldTest.kt | 66 ++++++++++++++++++ .../launcher/input/SessionTouchRoutingTest.kt | 69 +++++++++++++++++++ 4 files changed, 200 insertions(+) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9f145ab572..8ad1af889b 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -75,6 +75,7 @@ import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadMouse import com.droiddeck.launcher.input.PadState import com.droiddeck.launcher.input.SteamControllerBle +import com.droiddeck.launcher.input.DirectTouchHold import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays @@ -188,6 +189,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private var watching = true private lateinit var touchpad: TouchpadGestures + private lateinit var directTouchHold: DirectTouchHold private lateinit var threeFingerTap: com.droiddeck.launcher.input.ThreeFingerTap private lateinit var scrollTouch: ScrollTouchGestures private lateinit var padMouse: PadMouse @@ -483,6 +485,9 @@ 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) + directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) { + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } threeFingerTap = com.droiddeck.launcher.input.ThreeFingerTap(PointerGestures.slop(this) * 2) padMouse = PadMouse(padMouseListener) bridge.setTouchRoute(object : PadBridge.TouchRoute { @@ -1296,6 +1301,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val nextTouchMode = SessionPrefs.touchMode(this) if (touchMode != nextTouchMode) { if (::touchpad.isInitialized) touchpad.cancel() + if (::directTouchHold.isInitialized) directTouchHold.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) { WaylandCompositor.nativeSendTouch(3, -1, 0, 0) @@ -2286,6 +2292,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (next == routedTouchMode) return if (::touchpad.isInitialized) touchpad.cancel() + if (::directTouchHold.isInitialized) directTouchHold.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false @@ -2353,6 +2360,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) ignoreGameTouch = false return true } + if (directTouchHold.onTouch(event)) return true fun sendTouch(action: Int, index: Int) { val x = event.getX(index).coerceIn(rect.left, rect.right) val y = event.getY(index).coerceIn(rect.top, rect.bottom) @@ -2502,6 +2510,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { controls.visibility = View.GONE steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + applyTouchRouting() return } val buttonsOnly = forced == SessionPrefs.OSC_STEAM_QAM @@ -2514,6 +2523,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (steam == null) { steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + applyTouchRouting() } controls.setButtonsOnly(buttonsOnly) val show = when (forced) { @@ -2576,6 +2586,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { releasePads() touchpad.cancel() scrollTouch.cancel() + directTouchHold.cancel() guestKeysDown.toList().forEach { sendGuestKey(it, false) } keyboard?.hide() sessionClipboard.stop() @@ -2702,6 +2713,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPause() { if (runtimeRemovalBlocked) { super.onPause(); return } sessionClipboard.stop() + if (::directTouchHold.isInitialized) directTouchHold.cancel() drawerOpen = false pcKeyboardOpen = false achievementsOpen = false diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt new file mode 100644 index 0000000000..318941c71c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.input + +import android.os.Handler +import android.os.Looper +import android.view.MotionEvent +import kotlin.math.abs + +class DirectTouchHold( + private val slopPx: Float, + private val listener: PointerGestures.Listener, + private val cancelTouch: () -> Unit, +) { + private val handler = Handler(Looper.getMainLooper()) + private var x = 0f + private var y = 0f + private var consumed = false + private var pressed = false + private val release = Runnable { + if (pressed) listener.onButton(PointerGestures.BTN_RIGHT, false, x, y) + pressed = false + } + private val hold = Runnable { + cancelTouch() + consumed = true + listener.onLongPress() + listener.onButton(PointerGestures.BTN_RIGHT, true, x, y) + pressed = true + handler.postDelayed(release, 50L) + } + + fun cancel() { + handler.removeCallbacks(hold) + handler.removeCallbacks(release) + release.run() + consumed = false + } + + fun onTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + cancel() + x = event.x; y = event.y + handler.postDelayed(hold, 500L) + } + MotionEvent.ACTION_MOVE -> if (event.pointerCount > 1 || + abs(event.x - x) > slopPx || abs(event.y - y) > slopPx) handler.removeCallbacks(hold) + MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_POINTER_UP, + MotionEvent.ACTION_UP -> handler.removeCallbacks(hold) + MotionEvent.ACTION_CANCEL -> cancel() + } + return consumed + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt new file mode 100644 index 0000000000..d7dd5307a9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.MotionEvent +import java.time.Duration +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class DirectTouchHoldTest { + private val events = mutableListOf() + private val hold = DirectTouchHold(8f, object : PointerGestures.Listener { + override fun onMove(x: Float, y: Float) {} + override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { + assertEquals(PointerGestures.BTN_RIGHT, button) + events += "$pressed at $x,$y" + } + override fun onWheel(steps: Int) {} + override fun onLongPress() {} + }) { events += "cancel touch" } + + @Test fun holdReleasesRawTouchBeforeClickAndConsumesTheLift() { + assertFalse(touch(MotionEvent.ACTION_DOWN)) + advance(500) + assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) + assertTrue(touch(MotionEvent.ACTION_UP)) + advance(50) + assertEquals("false at 40.0,30.0", events.last()) + assertFalse(touch(MotionEvent.ACTION_DOWN)) + hold.cancel() + } + + @Test fun tapDragSecondFingerAndCancellationDoNotRightClick() { + for (action in listOf(MotionEvent.ACTION_UP, MotionEvent.ACTION_MOVE, + MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_CANCEL)) { + touch(MotionEvent.ACTION_DOWN) + assertFalse(touch(action, 60f)) + advance(600) + assertTrue(events.isEmpty()) + hold.cancel() + } + } + + @Test fun modeChangeCancelsPendingHoldAndReleasesAnActiveClick() { + touch(MotionEvent.ACTION_DOWN) + hold.cancel() + advance(600) + assertTrue(events.isEmpty()) + touch(MotionEvent.ACTION_DOWN) + advance(500) + hold.cancel() + advance(100) + assertEquals(listOf("cancel touch", "true at 40.0,30.0", "false at 40.0,30.0"), events) + } + + private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) + private fun touch(action: Int, x: Float = 40f): Boolean { + val event = MotionEvent.obtain(0, 0, action, x, 30f, 0) + return hold.onTouch(event).also { event.recycle() } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt new file mode 100644 index 0000000000..610f7499ed --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.input + +import android.view.View +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import java.nio.file.Files +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class SessionTouchRoutingTest { + private lateinit var activity: SessionActivity + private lateinit var steam: SteamTouchControls + private lateinit var touchpad: TouchpadGestures + private val directory = Files.createTempDirectory("touch-routing").toFile() + + @Before fun setUp() { + activity = Robolectric.buildActivity(SessionActivity::class.java).get() + activity.getSharedPreferences("session", 0).edit().clear().commit() + SessionState.mode = SessionService.MODE_STEAM + SteamTouchDevice.prepare(directory) + steam = SteamTouchControls(activity, SteamTouchDevice.current!!, {}, {}) + steam.visibility = View.VISIBLE + touchpad = TouchpadGestures(8f, object : PointerGestures.Listener { + override fun onMove(x: Float, y: Float) {} + override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) {} + override fun onWheel(steps: Int) {} + override fun onLongPress() {} + }) + field("onScreenControls", OnScreenControls(activity, null).apply { visibility = View.GONE }) + field("steamTouchControls", steam) + field("steamTouchOptions", SteamTouchConfig.Options(inputMode = SteamTouchConfig.INPUT_MOUSE, mouseMode = SteamTouchConfig.MOUSE_ABSOLUTE, trackpadSensitivity = 2f)) + field("touchpad", touchpad) + field("routedTouchMode", SessionPrefs.TOUCH_DIRECT) + } + + @After fun tearDown() { + SteamTouchDevice.release() + directory.deleteRecursively() + SessionState.mode = SessionService.MODE_STEAM + } + + @Test fun disablingSteamTouchRestoresEverySavedModeEvenWhenRegularControlsAreAlreadyHidden() { + for (mode in listOf(SessionPrefs.TOUCH_PAD, SessionPrefs.TOUCH_DIRECT, SessionPrefs.TOUCH_AUTO, SessionPrefs.TOUCH_OFF)) { + SessionPrefs.setTouchMode(activity, mode) + SessionPrefs.setOscMode(activity, SessionPrefs.OSC_NEVER) + steam.visibility = View.VISIBLE + invoke("readPrefs") + assertEquals(SessionPrefs.TOUCH_DIRECT, ReflectionHelpers.getField(activity, "routedTouchMode")) + invoke("updateOnScreenControls") + assertEquals(View.GONE, steam.visibility) + assertEquals(mode, ReflectionHelpers.getField(activity, "routedTouchMode")) + assertEquals(1.15f, touchpad.sensitivity, 0f) + } + } + + private fun field(name: String, value: Any) = ReflectionHelpers.setField(activity, name, value) + private fun invoke(name: String) = ReflectionHelpers.callInstanceMethod(activity, name) +}