From 99258737645346ff3df62e29428dfdbcced092b1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 20 Nov 2026 19:43:09 -0500 Subject: [PATCH] revert(input): restore pre-overhaul controls (#2958) --- .../com/droiddeck/launcher/SessionActivity.kt | 450 ++++++----------- .../launcher/input/ControllerPrefs.kt | 89 +++- .../launcher/input/ControlsChoice.kt | 216 -------- .../launcher/input/ControlsPresenter.kt | 41 -- .../droiddeck/launcher/input/GameControls.kt | 46 -- .../launcher/input/GamepadGeometry.kt | 97 ++-- .../launcher/input/InputLibraries.kt | 242 ++++----- .../droiddeck/launcher/input/InputLibrary.kt | 21 +- .../droiddeck/launcher/input/InputProfile.kt | 11 +- .../launcher/input/InputSurfaceLayout.kt | 37 +- .../launcher/input/InputSurfaceSource.kt | 18 +- .../com/droiddeck/launcher/input/KitLayout.kt | 297 ----------- ...youtGeometry.kt => LegacyGamepadLayout.kt} | 153 +++++- .../launcher/input/OnScreenControls.kt | 172 ++++--- .../launcher/input/OnScreenLayout.kt | 122 ++--- .../droiddeck/launcher/input/PadBridge.java | 21 +- .../com/droiddeck/launcher/input/PadKit.kt | 48 -- .../launcher/input/PhysicalInputBindings.kt | 10 +- .../launcher/input/SteamControllerBle.kt | 13 +- .../launcher/input/SteamTouchControls.kt | 151 +++--- .../launcher/input/TritonInputRouter.kt | 15 +- .../launcher/session/SessionDisplay.kt | 14 +- .../launcher/session/SessionPrefs.kt | 35 +- .../com/droiddeck/launcher/ui/DevPreview.kt | 2 +- .../launcher/ui/InputElementProperties.kt | 4 +- .../launcher/ui/InputLayoutWidgets.kt | 65 ++- .../launcher/ui/InputQuickSettings.kt | 81 +++ .../launcher/ui/InputSettingsPage.kt | 463 +++++++++++++----- .../launcher/ui/InputSurfaceDialog.kt | 360 +++++--------- .../droiddeck/launcher/ui/InputSurfaceView.kt | 334 ++++++++----- .../droiddeck/launcher/ui/LayoutChoiceRow.kt | 87 ---- .../launcher/ui/ModeSettingsDialog.kt | 12 +- .../java/com/droiddeck/launcher/ui/PadArt.kt | 359 -------------- .../launcher/ui/SecondScreenPresentation.kt | 6 +- .../launcher/ui/SessionDrawerPage.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 235 ++++----- app/src/main/res/values-ar/input_library.xml | 11 + app/src/main/res/values-ar/input_strings.xml | 2 + app/src/main/res/values-ar/strings.xml | 28 ++ .../res/values-b+es+419/input_library.xml | 11 + .../res/values-b+es+419/input_strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 28 ++ app/src/main/res/values-bg/input_library.xml | 11 + app/src/main/res/values-bg/input_strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 28 ++ app/src/main/res/values-cs/input_library.xml | 11 + app/src/main/res/values-cs/input_strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 28 ++ app/src/main/res/values-da/input_library.xml | 11 + app/src/main/res/values-da/input_strings.xml | 2 + app/src/main/res/values-da/strings.xml | 28 ++ app/src/main/res/values-de/input_library.xml | 11 + app/src/main/res/values-de/input_strings.xml | 2 + app/src/main/res/values-de/strings.xml | 28 ++ app/src/main/res/values-el/input_library.xml | 11 + app/src/main/res/values-el/input_strings.xml | 2 + app/src/main/res/values-el/strings.xml | 28 ++ app/src/main/res/values-es/input_library.xml | 11 + app/src/main/res/values-es/input_strings.xml | 2 + app/src/main/res/values-es/strings.xml | 28 ++ app/src/main/res/values-fi/input_library.xml | 11 + app/src/main/res/values-fi/input_strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 28 ++ app/src/main/res/values-fr/input_library.xml | 11 + app/src/main/res/values-fr/input_strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 28 ++ app/src/main/res/values-hi/input_library.xml | 11 + app/src/main/res/values-hi/input_strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 28 ++ app/src/main/res/values-hu/input_library.xml | 11 + app/src/main/res/values-hu/input_strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 28 ++ app/src/main/res/values-in/input_library.xml | 11 + app/src/main/res/values-in/input_strings.xml | 2 + app/src/main/res/values-in/strings.xml | 28 ++ app/src/main/res/values-it/input_library.xml | 11 + app/src/main/res/values-it/input_strings.xml | 2 + app/src/main/res/values-it/strings.xml | 28 ++ app/src/main/res/values-ja/input_library.xml | 11 + app/src/main/res/values-ja/input_strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 28 ++ app/src/main/res/values-ko/input_library.xml | 11 + app/src/main/res/values-ko/input_strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 28 ++ app/src/main/res/values-ms/input_library.xml | 11 + app/src/main/res/values-ms/input_strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 28 ++ app/src/main/res/values-nb/input_library.xml | 11 + app/src/main/res/values-nb/input_strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 28 ++ app/src/main/res/values-nl/input_library.xml | 11 + app/src/main/res/values-nl/input_strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 28 ++ app/src/main/res/values-pl/input_library.xml | 11 + app/src/main/res/values-pl/input_strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 28 ++ .../main/res/values-pt-rPT/input_library.xml | 11 + .../main/res/values-pt-rPT/input_strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 28 ++ app/src/main/res/values-pt/input_library.xml | 11 + app/src/main/res/values-pt/input_strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 31 ++ app/src/main/res/values-ro/input_library.xml | 11 + app/src/main/res/values-ro/input_strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 28 ++ app/src/main/res/values-ru/input_library.xml | 11 + app/src/main/res/values-ru/input_strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 28 ++ app/src/main/res/values-sv/input_library.xml | 11 + app/src/main/res/values-sv/input_strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 28 ++ app/src/main/res/values-th/input_library.xml | 11 + app/src/main/res/values-th/input_strings.xml | 2 + app/src/main/res/values-th/strings.xml | 28 ++ app/src/main/res/values-tr/input_library.xml | 11 + app/src/main/res/values-tr/input_strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 28 ++ app/src/main/res/values-uk/input_library.xml | 11 + app/src/main/res/values-uk/input_strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 28 ++ app/src/main/res/values-vi/input_library.xml | 11 + app/src/main/res/values-vi/input_strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 28 ++ .../main/res/values-zh-rCN/input_library.xml | 11 + .../main/res/values-zh-rCN/input_strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 28 ++ .../main/res/values-zh-rHK/input_library.xml | 11 + .../main/res/values-zh-rHK/input_strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 28 ++ .../main/res/values-zh-rTW/input_library.xml | 11 + .../main/res/values-zh-rTW/input_strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 28 ++ app/src/main/res/values/input_library.xml | 13 +- app/src/main/res/values/input_strings.xml | 2 + app/src/main/res/values/strings.xml | 70 ++- .../launcher/input/ControlsChoiceTest.kt | 232 --------- .../launcher/input/ControlsPresenterTest.kt | 75 --- .../launcher/input/InputLayoutToolsTest.kt | 138 +++++- .../launcher/input/InputLibraryTest.kt | 351 ++++++++----- .../launcher/input/InputProfilesTest.kt | 13 +- .../launcher/input/InputSurfaceSourceTest.kt | 56 --- .../droiddeck/launcher/input/KitLayoutTest.kt | 355 -------------- .../launcher/input/LegacyControllerPrefs.kt | 14 - .../input/OnScreenControlPrefsTest.kt | 229 --------- .../launcher/input/OnScreenControlsTest.kt | 156 ++---- .../launcher/input/OnScreenLayoutTest.kt | 157 +++--- .../droiddeck/launcher/input/PadKitTest.kt | 73 --- .../input/PhysicalInputBindingsTest.kt | 4 +- .../launcher/input/PhysicalShortcutsTest.kt | 6 +- .../input/SelectProfileRoutingTest.kt | 2 +- .../launcher/input/SessionKeyboardPadTest.kt | 19 +- .../launcher/input/ShowLayoutTest.kt | 75 --- .../launcher/input/SteamControllerBleTest.kt | 20 +- .../launcher/input/StickDeadZoneTest.kt | 21 +- .../session/SessionBackgroundPrefsTest.kt | 10 + .../launcher/session/SessionDisplayTest.kt | 14 - .../launcher/session/SettingsResetTest.kt | 5 +- .../launcher/ui/GamepadGeometryTest.kt | 64 +-- .../launcher/ui/InputSettingsTest.kt | 416 ++++++++-------- .../launcher/ui/InputSurfaceTouchTest.kt | 54 +- .../launcher/ui/InputUiLayoutTest.kt | 20 +- .../ui/PhysicalShortcutsDialogTest.kt | 3 +- .../launcher/ui/SessionSecondScreenTest.kt | 40 ++ .../test/resources/input/schema14-stock.json | 350 ------------- tools/linuxfs/preload/inputudev.c | 16 +- tools/linuxfs/preload/net.c | 4 - tools/linuxfs/preload/udevmon.c | 56 --- tools/tests/test_cdp_guard.py | 3 +- tools/tests/test_inputudev_preload.py | 38 +- tools/tests/test_udevmon_preload.py | 89 ---- 170 files changed, 3980 insertions(+), 4927 deletions(-) delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/GameControls.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt rename app/src/main/java/com/droiddeck/launcher/input/{LegacyLayoutGeometry.kt => LegacyGamepadLayout.kt} (51%) delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/PadKit.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LayoutChoiceRow.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/ControlsChoiceTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/LegacyControllerPrefs.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/PadKitTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/input/ShowLayoutTest.kt delete mode 100644 app/src/test/resources/input/schema14-stock.json delete mode 100644 tools/tests/test_udevmon_preload.py diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6fc7fbc47..08c8f958c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -171,6 +171,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) + private var adaptiveSticks by mutableStateOf(null) + private var quickButtons by mutableStateOf>(emptyMap()) private var picturePosition by mutableStateOf("center") private var integerScaling by mutableStateOf(false) @@ -189,7 +191,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private var unfoldedPanel by mutableStateOf(null) private var unfoldedColumn: android.widget.LinearLayout? = null + private var unfoldedDeckSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null private var swappedInputSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null + private var unfoldedDeckPanel by mutableStateOf(null) private var deckPanelLayouts: Map = emptyMap() private lateinit var sessionRoot: FrameLayout private var inputRouter: InputRouter? = null @@ -260,7 +264,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var steamController: SteamControllerBle? = null private var onScreenControls: OnScreenControls? = null private var bottomInputControls: OnScreenControls? = null - private var primaryInputLayout by mutableStateOf(null) + private var primaryInputLayout: com.droiddeck.launcher.input.SavedInputLayout? = null private var secondaryInputLayout by mutableStateOf(null) private var steamTouchControls: com.droiddeck.launcher.input.SteamTouchControls? = null private var steamTouchAvailable by mutableStateOf(false) @@ -643,18 +647,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) - private var oscRearButtons by mutableStateOf(false) - private var oscTrackpads by mutableStateOf(false) private var onScreenButtonsVisible by mutableStateOf(false) - private var layoutOptions by mutableStateOf>(emptyList()) - private var layoutChoice by mutableStateOf("") - private var layoutHint by mutableStateOf(null) - private var layoutEditor by mutableStateOf?>(null) - private var layoutEditorScope: String? = null - private var layoutEditorSplit: com.droiddeck.launcher.ui.InputEditorSplit? = null - private var controlsGame: Long? = null - private var controllerInUse = false - private var controlsHiddenByTap = false private var secondScreenMode by mutableStateOf(SessionState.secondScreenMode) private var secondScreenDisplays by mutableStateOf>(emptyList()) private var selectedSecondScreenDisplay by mutableStateOf(SessionState.secondScreenDisplay) @@ -857,7 +850,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bridge.setStickDeadZone(ControllerPrefs.deadZone(this)) bridge.setBuiltinPad(SessionState.mode != SessionService.MODE_STEAM || SessionPrefs.builtinPad(this)) padBridge = bridge - inputRouter = InputRouter(inputOutput).also { bridge.setInputRouter(it); DeckControls.setRouter(it); physicalInputBindings = com.droiddeck.launcher.input.PhysicalInputBindings(it, ::noteRemappedControllerUse) } + inputRouter = InputRouter(inputOutput).also { bridge.setInputRouter(it); DeckControls.setRouter(it); physicalInputBindings = com.droiddeck.launcher.input.PhysicalInputBindings(it) } refreshInputProfile() bridge.setOnChordInput(backQamInput::onChordInput) SessionState.padBridge = bridge @@ -871,15 +864,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bridge.setExcluded(vr::owns) joyConVr = vr } - SteamControllerBle.listener = { - uiHandler.post { - if (isDestroyed) return@post - if (SteamControllerBle.connected) controllerInUse = true - updatePadMotion() - refreshControls() - } - } - steamController = SteamControllerBle(this, inputRouter, ::noteSteamControllerUse).also { it.start() } + SteamControllerBle.listener = { uiHandler.post { updatePadMotion(); refreshControls() } } + steamController = SteamControllerBle(this, inputRouter).also { it.start() } if (Build.VERSION.SDK_INT >= 31 && checkSelfPermission(BLUETOOTH_CONNECT) != android.content.pm.PackageManager.PERMISSION_GRANTED && !SessionPrefs.bluetoothAsked(this)) { SessionPrefs.setBluetoothAsked(this) @@ -892,12 +878,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionState.deckPadListener = deckPadListener openDeckRing("activity created") bridge.setOnPlayerInput(::onPadInput) - bridge.setOnPhysicalInput(::noteControllerUse) - controllerInUse = PadBridge.anyControllerConnected() || SteamControllerBle.connected onScreenControls = OnScreenControls(this, bridge).also { controls -> controls.updateLayout(primaryInputLayout) - controls.onCornerTap = ::onControlsCornerTap - controls.onCornerHold = ::openControllerMenu controls.onTouchMiss = miss@{ event -> if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss event.offsetLocation(controls.left - surfaceView.left.toFloat(), controls.top - surfaceView.top.toFloat()) @@ -977,7 +959,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde hud = DroidDeckHudHost(this) hud.onConfigChanged = { hudConfig = DroidDeckHudConfig.load(this) } hud.passesTouchAt = ::controlTakesTouchAt - hud.attach(root, onScreenControls?.let(root::indexOfChild)?.takeIf { it >= 0 } ?: root.childCount) + hud.attach(root, root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { CompositorHost.rearmFrameGen { applyFrameGen(force = true) } @@ -1269,19 +1251,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) - layoutEditor?.let { (profile, layout, bindings) -> - com.droiddeck.launcher.ui.InputSurfaceDialog(profile, onDismiss = { - layoutEditor = null; inputSettingsOpen = false - refreshInputProfile(); updateOnScreenControls() - }, onChanged = { refreshInputProfile() }, role = InputRole.PRIMARY, layoutId = layout, bindingsId = bindings, - scope = layoutEditorScope, split = layoutEditorSplit) - } - if (inputSettingsOpen && layoutEditor == null) com.droiddeck.launcher.ui.InputSettingsDialog( - desktop = loadingMode() == SessionService.MODE_DESKTOP, + if (inputSettingsOpen) com.droiddeck.launcher.ui.InputSettingsDialog( onBack = { inputSettingsOpen = false; secondScreenPresentation?.refreshControls() }, onChanged = { controllerSettings = ControllerPrefs.read(this@SessionActivity) - oscMode = sessionOscMode() + oscMode = SessionPrefs.oscMode(this@SessionActivity, SessionState.mode == SessionService.MODE_STEAM) padBridge?.setStickDeadZone(ControllerPrefs.deadZone(this@SessionActivity)) joyConVr?.refresh() onScreenControls?.reload() @@ -1462,7 +1436,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, frameGen = frameGen, frameGenTargetGameId = frameGenTargetGameId()?.toString(), - frameGenTargetGameName = frameGenTargetGameName(), + frameGenTargetGameName = when { + !drawerGameProfileFollowState.followsSteam -> + drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName + SessionState.mode == SessionService.MODE_RUN -> + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + else -> drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + }, hasGameOverride = frameGenHasGameOverride, lossless = lossless, oscMode = oscMode, suspendPolicy = suspendPolicy, @@ -1470,7 +1453,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde micAvailable = SessionState.micAvailable && !SessionState.suspended, micEnabled = SessionState.micEnabled, onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) }, - touchAuto = getString(if (usingTouchpad(SessionPrefs.TOUCH_AUTO)) R.string.mode_touch_touchpad else R.string.mode_touch_mouse), + touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), pen = penSettings.takeIf { penSeen }, onPen = { key, value -> SessionPrefs.setPenSetting(this@SessionActivity, key, value); readPrefs() }, fexPreset = fexPreset, @@ -1702,7 +1685,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id)) com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) padType = id - refreshInputProfile() }, backHold = backHold, onBackHold = { on -> @@ -1739,43 +1721,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, onOsc = { v -> SessionPrefs.setOscMode(this@SessionActivity, v) - controlsHiddenByTap = false readPrefs() - applyUnfoldedControls() updateOnScreenControls() + if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null) + Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show() }, - layoutGame = controlsGameName(), - layoutOptions = layoutOptions, - layoutChoice = layoutChoice, - layoutHint = layoutHint, - onLayout = ::chooseLayout, - onDeleteLayout = ::deleteLayout, - oscRearButtons = oscRearButtons.takeIf { - unfoldedPanel == null && oscMode != SessionPrefs.OSC_STEAM_QAM && - !usesSteamTouchLayout() && com.droiddeck.launcher.input.PadKit.current(this).steam && - primaryInputLayout?.let(com.droiddeck.launcher.input.OnScreenLayout::hasBuiltInKit) == true - }, - oscTrackpads = oscTrackpads, - onOscRearButtons = { shown -> - SessionPrefs.setOscRearButtons(this, shown) - oscRearButtons = shown - onScreenControls?.reload() - bottomInputControls?.reload() - }, - onOscTrackpads = { shown -> - SessionPrefs.setOscTrackpads(this, shown) - oscTrackpads = shown - onScreenControls?.reload() - bottomInputControls?.reload() - }, - onEditLayout = when { - layoutChoice == com.droiddeck.launcher.input.GameControls.STEAM -> steamTouchControls?.takeIf { steamTouchAvailable && onScreenButtonsVisible && it.visibility == View.VISIBLE }?.let { view -> { - drawerOpen = false - view.startEditing() - } } - primaryInputLayout?.editable == true -> ({ openLayoutEditor() }) - else -> null - }, + onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({ + drawerOpen = false + steamTouchControls?.startEditing() + }) else null, onSuspendPolicy = { policy -> SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy) suspendPolicy = policy @@ -1835,6 +1789,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, unfoldedControls = unfoldedControls, onUnfoldedControls = ::chooseUnfoldedControls, + adaptiveSticks = adaptiveSticks.takeIf { + unfoldedPanel != null || oscMode != SessionPrefs.OSC_NEVER && oscMode != SessionPrefs.OSC_STEAM_QAM && !steamTouchInUse + }, + onAdaptiveSticks = { on -> + primaryInputLayout?.let { com.droiddeck.launcher.input.InputLibraries.setAdaptiveSticks(this@SessionActivity, it.id, on) } + refreshInputProfile() + }, + quickButtons = quickButtons.takeIf { + unfoldedPanel != null || oscMode != SessionPrefs.OSC_NEVER && !steamTouchInUse + }.orEmpty(), + onQuickButton = { button, on -> + primaryInputLayout?.let { com.droiddeck.launcher.input.InputLibraries.setQuickButton(this@SessionActivity, it.id, button, on) } + refreshInputProfile() + updateOnScreenControls() + }, unfoldedControlsWithController = unfoldedControlsWithController, onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) }, @@ -2054,17 +2023,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, "drawer-components").start() } - private fun frameGenTargetGameName(): String? = when { - !drawerGameProfileFollowState.followsSteam -> - drawerGameProfileRefresh.data?.profiles - ?.firstOrNull { it.first == frameGenTargetGameId() }?.second - SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName - SessionState.mode == SessionService.MODE_RUN -> - com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) - else -> drawerGameProfileRefresh.data?.profiles - ?.firstOrNull { it.first == frameGenTargetGameId() }?.second - } - private fun frameGenTargetGameId(): Long? { if (!drawerGameProfileFollowState.followsSteam) { return drawerGameProfileId @@ -2082,8 +2040,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun loadFrameGenFor(appId: Long?) { - val layoutGame = controlsGameId() - if (layoutGame != controlsGame) { controlsGame = layoutGame; uiHandler.post { refreshInputProfile(); updateOnScreenControls() } } val profileId = appId?.toString() frameGen = FrameGen.mode(this, profileId) frameGenHasGameOverride = appId?.let { @@ -2578,9 +2534,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) - oscMode = sessionOscMode() - oscRearButtons = SessionPrefs.oscRearButtons(this) - oscTrackpads = SessionPrefs.oscTrackpads(this) + oscMode = SessionPrefs.oscMode(this, SessionState.mode == SessionService.MODE_STEAM) backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) physicalShortcuts.bindings = PhysicalShortcuts.read(this) @@ -3666,6 +3620,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde return onScreenControls?.let { takes(it, it::takesTouchAt) } == true || steamTouchControls?.let { takes(it, it::takesTouchAt) } == true || unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true || + unfoldedDeckSurface?.let { takes(it, it::takesTouchAt) } == true || unfoldedColumn?.getChildAt(0)?.let { takes(it) { _, _ -> true } } == true } @@ -3676,7 +3631,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) || PenStream.penIndex(event) >= 0)) { drawerControllerActive = false gestureTouchStreamGate.reset() - if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) noteScreenTouch(event) } return super.dispatchTouchEvent(event) } @@ -4426,73 +4380,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (started && displayId !in inputWindowDisplays && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) } - private fun controlsGameId(): Long? = frameGenTargetGameId() - - private fun controlsGameName(): String? = controlsGameId()?.let { frameGenTargetGameName() } - - private fun gameLibrary(): com.droiddeck.launcher.input.InputLibrary = - com.droiddeck.launcher.input.ControlsChoice.library(this, controlsGameId(), loadingMode() == SessionService.MODE_DESKTOP) - - private fun refreshLayoutOptions() { - val steam = SessionState.mode == SessionService.MODE_STEAM - val game = controlsGameId() - val desktop = loadingMode() == SessionService.MODE_DESKTOP - layoutOptions = com.droiddeck.launcher.input.ControlsChoice.options(this, game, steam, controlsGameName(), desktop) - layoutChoice = com.droiddeck.launcher.input.ControlsChoice.current(this, game, steam, desktop) - layoutHint = if (com.droiddeck.launcher.input.ControlsChoice.steamUnavailable(this, game, steam)) getString(R.string.osc_layout_steam_unavailable) else null - } - - private fun deleteLayout(id: String) { - runCatching { com.droiddeck.launcher.input.ControlsChoice.delete(this, id) }.onFailure { Log.w(TAG, "could not delete layout $id", it) } - refreshLayoutOptions() - } - - private fun chooseLayout(id: String) { - val game = controlsGameId() - val name = controlsGameName() - val desktop = loadingMode() == SessionService.MODE_DESKTOP - val created = runCatching { - if (id == com.droiddeck.launcher.input.ControlsChoice.NEW) { - if (game != null && name != null) com.droiddeck.launcher.input.ControlsChoice.newForGame(this, game, name, desktop) else null - } else { com.droiddeck.launcher.input.ControlsChoice.choose(this, game, id, desktop, name); null } - }.onFailure { Log.w(TAG, "could not choose layout $id", it) }.getOrNull() - releasePads() - refreshInputProfile() - updateOnScreenControls() - if (created != null) openLayoutEditor() - } - - private fun openLayoutEditor() { - val game = controlsGameId() - val name = controlsGameName() - val desktop = loadingMode() == SessionService.MODE_DESKTOP - val target = com.droiddeck.launcher.input.ControlsChoice.editTarget(this, game, desktop) ?: return - val layoutName = com.droiddeck.launcher.input.InputLibraries.read(this).layouts.firstOrNull { it.id == target.second }?.name ?: return - val own = com.droiddeck.launcher.input.ControlsChoice.hasOwn(this, game) - val shared = com.droiddeck.launcher.input.ControlsChoice.shared(this, game) - layoutEditorScope = when { - game == null || name == null || !own -> getString(R.string.osc_scope_default, layoutName) - shared -> getString(R.string.osc_scope_shared, layoutName) - layoutName == name -> getString(R.string.osc_scope_own, name) - else -> getString(R.string.osc_scope_game, layoutName, name) - } - layoutEditorSplit = if (game != null && name != null && shared) com.droiddeck.launcher.ui.InputEditorSplit(getString(R.string.osc_just_this_game), - getString(R.string.osc_scope_game, layoutName, name), - { library, layoutId, bindingsId -> com.droiddeck.launcher.input.ControlsChoice.copyForGame(this, library, game, name, desktop, layoutId, bindingsId) }, - { bindingsId -> com.droiddeck.launcher.input.ControlsChoice.useForGame(this, game, name, bindingsId) }) else null - releasePads() - drawerOpen = false - layoutEditor = target - inputSettingsOpen = true - } - private fun refreshInputProfile() { - val library = gameLibrary() + val library = com.droiddeck.launcher.input.InputLibraries.read(this) val desktop = loadingMode() == SessionService.MODE_DESKTOP inputProfile = library.compileActive(desktop, secondScreenMode.panel(this)) stockInputProfile = library.compileStock(desktop, secondScreenMode.panel(this)) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) - refreshLayoutOptions() + adaptiveSticks = primaryInputLayout?.adaptiveSticks + quickButtons = primaryInputLayout?.takeIf { it.editable }?.let { l -> l.quickButtons.associateWith { it !in l.style.hidden } }.orEmpty() secondaryInputLayout = library.panelLayout(desktop, secondScreenMode.panel(this)) deckPanelLayouts = com.droiddeck.launcher.input.DeckPanel.entries.associateWith { library.panelLayout(desktop, it.bindings) } inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native } @@ -4508,7 +4403,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onScreenControls?.updateLayout(primaryInputLayout) bottomInputControls?.updateLayout(primaryInputLayout) unfoldedPanel?.updateLayout(primaryInputLayout) - if (onScreenControls != null) applyUnfoldedControls() + if (unfoldedPanel != null) applyUnfoldedControls() + showUnfoldedDeckPanel() updateOnScreenPad() secondScreenPresentation?.refreshControls() } @@ -4543,8 +4439,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun controlsBelowWanted(): Boolean { if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false - val mode = sessionOscMode() - if (mode == SessionPrefs.OSC_NEVER || mode == SessionPrefs.OSC_STEAM_QAM || usesSteamTouchLayout()) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -4557,8 +4451,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val tabRow = unfoldedColumn?.getChildAt(0)?.height?.let { it - (com.droiddeck.launcher.ui.BAR_HEIGHT.value * resources.displayMetrics.density + 0.5f).toInt() } ?: 0 - val aspect = if (SessionState.followScreen) 16f / 9f else outputSize().let { (w, h) -> w.toFloat() / h.coerceAtLeast(1) } - val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow, aspect) + val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow) else FrameLayout.LayoutParams.MATCH_PARENT val params = surfaceView.layoutParams as FrameLayout.LayoutParams if (params.height != gameHeight) { @@ -4573,6 +4466,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (panel != null && (!wanted || panel.dock != dock)) { sessionRoot.removeView(unfoldedColumn) unfoldedColumn = null + unfoldedDeckSurface = null + unfoldedDeckPanel = null unfoldedPanel = null panel = null if (!wanted) updateOnScreenControls() @@ -4593,14 +4488,36 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde sessionRoot.addView(column, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedColumn = column unfoldedPanel = panel + showUnfoldedDeckPanel() updateOnScreenControls() } unfoldedColumn?.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height - gameHeight, Gravity.BOTTOM) } private fun unfoldedBar(): View = com.droiddeck.launcher.ui.bottomScreenBarView(this) { - com.droiddeck.launcher.ui.sessionBarModel(getString(R.string.deck_tab_gamepad), - { chooseUnfoldedControls(false) }, { drawerOpen = true }, ::tapSteamButton, ::tapQam) + val deck = unfoldedDeckPanel + com.droiddeck.launcher.ui.sessionBarModel(getString(if (deck != null) R.string.second_mode_deck_controls else R.string.deck_tab_gamepad), + { chooseUnfoldedControls(false) }, { drawerOpen = true }, ::tapSteamButton, ::tapQam, + tabs = deck?.let { com.droiddeck.launcher.ui.deckPanelTabs(this, it, ::selectDeckPanel) }) + } + + private fun showUnfoldedDeckPanel() { + val column = unfoldedColumn + val panel = unfoldedPanel + val selected = SessionPrefs.deckPanel(this).takeIf { column != null && panel?.dock?.grips == true } + unfoldedDeckPanel = selected + val layout = selected?.takeIf { it != com.droiddeck.launcher.input.DeckPanel.GAMEPAD }?.let { deckPanelLayouts[it] } + if (layout != null && unfoldedDeckSurface?.tag == layout) return + unfoldedDeckSurface?.let { it.releaseInputs(); column?.removeView(it) } + unfoldedDeckSurface = null + if (column == null || panel == null) return + if (layout == null) { panel.visibility = View.VISIBLE; return } + panel.releaseAll() + panel.visibility = View.GONE + unfoldedDeckSurface = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, layout.elements, InputRole.PRIMARY, layout.style, haptics = true).also { + it.tag = layout + column.addView(it, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) + } } private fun bottomKeyboardPresentation(): SecondScreenPresentation? { @@ -4810,7 +4727,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun deliversTouches(mode: String) = mode == SessionPrefs.TOUCH_DIRECT || mode == SessionPrefs.TOUCH_AUTO - private fun usingTouchpad(mode: String = routedTouchMode): Boolean = when (mode) { + private fun usingTouchpad(): Boolean = when (routedTouchMode) { SessionPrefs.TOUCH_PAD -> true SessionPrefs.TOUCH_DIRECT -> false else -> SessionState.mode != SessionService.MODE_STEAM || SessionState.steamUi == "desktop" @@ -4954,7 +4871,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var screenTapsClick = true private fun onScreenMouseButtonShown(): Boolean = listOfNotNull( - onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, + onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, unfoldedDeckSurface, secondScreenPresentation?.controlsView, swappedInputSurface, ).any { it.isShown && inputProfile.showsMouseButton(it.inputRole, it.shownElements, stockInputProfile) } @@ -5378,7 +5295,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } val root = onScreenControls?.parent as? android.view.ViewGroup ?: return null val view = com.droiddeck.launcher.input.SteamTouchControls(this, device, - onMenu = ::openControllerMenu, onKeyboard = ::togglePcKeyboard) + onMenu = { drawerOpen = true }, onKeyboard = ::togglePcKeyboard) view.visibility = View.GONE view.onEditingChanged = { touchEditorChanged() } view.onOptions = { options -> @@ -5408,141 +5325,99 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde updateOnScreenPad() val c = onScreenControls glassesSlot = when { - c == null || c.visibility != View.VISIBLE || c.hidden != null -> 0 - c.shortcutsOnly -> -1 - c.inputSurface.shownElements.any { it.id == com.droiddeck.launcher.input.KitLayout.KEYBOARD_ID } -> 2 + c == null || c.visibility != View.VISIBLE || c.isPinnedOnly -> 0 + c.isButtonsOnly -> -1 + primaryInputLayout?.let { l -> l.elements.any { it.quickButton == InputCommand.KEYBOARD && !l.style.hides(it) } } + ?: (controllerSettings?.keyboardButton != false) -> 2 else -> 1 } } - private fun sessionOscMode() = SessionPrefs.oscMode(this, steamSession = SessionState.mode == SessionService.MODE_STEAM) - - private fun usesSteamTouchLayout() = SessionState.mode == SessionService.MODE_STEAM && - com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()) - - private fun controlsPlan(): com.droiddeck.launcher.input.ControlsPresenter.Plan { - val steam = SessionState.mode == SessionService.MODE_STEAM - if (!PadBridge.anyControllerConnected() && !SteamControllerBle.connected) controllerInUse = false - return com.droiddeck.launcher.input.ControlsPresenter.plan(com.droiddeck.launcher.input.ControlsPresenter.State( - mode = sessionOscMode(), - desktop = SessionState.mode == SessionService.MODE_DESKTOP, - virtualPad = !steam || SessionPrefs.builtinPad(this), - covered = controlsCovered(), - controllerInUse = controllerInUse, - hiddenByTap = controlsHiddenByTap, - steamLayout = usesSteamTouchLayout(), - bottomScreen = bottomGame?.surfaceView?.parent is android.view.ViewGroup, - )) - } - - private fun controlsCovered() = pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || keyboardCoversPad() - private fun updateOnScreenPad() { - val controls = onScreenControls ?: return fun hideBottomControls() { bottomInputControls?.takeIf { it.visibility == View.VISIBLE }?.let { it.releaseAll(); it.visibility = View.GONE } } - fun hideSteam() { - steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } - val keyboardOver = controlsCovered() && usesSteamTouchLayout() && sessionOscMode() != SessionPrefs.OSC_STEAM_QAM - if (!keyboardOver) com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + val forced = File(Environment.getExternalStorageDirectory(), "Download/droiddeck-osc") + .takeIf { it.isFile } + ?.let { FileUtils.readString(it)?.trim()?.lowercase() } + ?: SessionPrefs.oscMode(this, SessionState.mode == SessionService.MODE_STEAM) + val controls = onScreenControls ?: return + fun showPinned() { + controls.setPinnedOnly(true) + val pinned = controls.hasPinned && !pipUi && !inputSettingsOpen + if (!pinned) controls.releaseAll() + controls.visibility = if (pinned) View.VISIBLE else View.GONE } - val plan = controlsPlan() - onScreenButtonsVisible = plan.shown - val wantsSteam = plan.place == com.droiddeck.launcher.input.ControlsPresenter.Place.STEAM - val steam = if (wantsSteam) steamTouch() else null - steamTouchInUse = steam != null - uiHandler.removeCallbacks(steamTouchRetry) - if (wantsSteam && steam == null && !isFinishing && !isDestroyed) { - uiHandler.postDelayed(steamTouchRetry, 1000) - } - if (steam != null) { + if (pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || + (SessionState.mode == SessionService.MODE_STEAM && !SessionPrefs.builtinPad(this))) { + onScreenButtonsVisible = false hideBottomControls() - controls.releaseAll(); controls.visibility = View.GONE - if (!plan.shown) { steam.cancelEditing(); steam.releaseAll() } - steam.visibility = if (plan.shown) View.VISIBLE else View.GONE - // Steam takes seconds to configure a newly plugged touch controller, so hiding the layout keeps it plugged. - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = true + showPinned() + steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false applyTouchRouting() return } - hideSteam() - applyTouchRouting() - when (plan.place) { - com.droiddeck.launcher.input.ControlsPresenter.Place.BOTTOM -> { - val bottomRoot = bottomGame?.surfaceView?.parent as android.view.ViewGroup - controls.releaseAll(); controls.visibility = View.GONE - var bottom = bottomInputControls - if (bottom?.parent !== bottomRoot) { - (bottom?.parent as? android.view.ViewGroup)?.removeView(bottom) - bottom = OnScreenControls(bottomRoot.context, padBridge).also { view -> - view.onTouchMiss = { event -> onBottomGameTouch(event) } - view.onCornerTap = ::onControlsCornerTap - view.onCornerHold = ::openControllerMenu - bottomRoot.addView(view, android.view.ViewGroup.LayoutParams(-1, -1)) - } - bottomInputControls = bottom + val buttonsOnly = forced == SessionPrefs.OSC_STEAM_QAM + val wantsSteam = forced == SessionPrefs.OSC_STEAM_TOUCH && SessionState.mode == SessionService.MODE_STEAM + val steam = if (wantsSteam) steamTouch() else null + steamTouchInUse = steam != null + if (wantsSteam && steam == null && !isFinishing && !isDestroyed) { + uiHandler.removeCallbacks(steamTouchRetry) + uiHandler.postDelayed(steamTouchRetry, 1000) + } + if (steam == null) { + steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + applyTouchRouting() + } + controls.setButtonsOnly(buttonsOnly) + val show = when (forced) { + SessionPrefs.OSC_ALWAYS -> true + SessionPrefs.OSC_STEAM_QAM -> true + SessionPrefs.OSC_NEVER -> false + SessionPrefs.OSC_STEAM_TOUCH -> SessionState.mode == SessionService.MODE_STEAM || + (!PadBridge.anyControllerConnected() && SessionState.mode != SessionService.MODE_DESKTOP) + else -> !PadBridge.anyControllerConnected() && !SteamControllerBle.connected && + SessionState.mode != SessionService.MODE_DESKTOP + } + onScreenButtonsVisible = show + val drawn = show && !keyboardCoversPad() + if (steam != null) { + hideBottomControls() + showPinned() + if (!drawn) { steam.cancelEditing(); steam.releaseAll() } + steam.visibility = if (drawn) View.VISIBLE else View.GONE + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = show + applyTouchRouting() + Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden") + return + } + val bottomRoot = bottomGame?.surfaceView?.parent as? android.view.ViewGroup + if (bottomRoot != null && (drawn || controls.hasPinned)) { + controls.releaseAll(); controls.visibility = View.GONE + var bottom = bottomInputControls + if (bottom?.parent !== bottomRoot) { + (bottom?.parent as? android.view.ViewGroup)?.removeView(bottom) + bottom = OnScreenControls(bottomRoot.context, padBridge).also { view -> + view.onTouchMiss = { event -> onBottomGameTouch(event) } + bottomRoot.addView(view, android.view.ViewGroup.LayoutParams(-1, -1)) } - bottom.updateLayout(primaryInputLayout) - bottom.setPresentation(plan.hidden, plan.shortcutsOnly) - bottom.visibility = View.VISIBLE - } - com.droiddeck.launcher.input.ControlsPresenter.Place.MAIN, - com.droiddeck.launcher.input.ControlsPresenter.Place.STEAM -> { - hideBottomControls() - controls.setPresentation(plan.hidden, plan.shortcutsOnly) - controls.visibility = View.VISIBLE - } - else -> { - hideBottomControls() - controls.releaseAll() - controls.visibility = View.GONE + bottomInputControls = bottom } + bottom.updateLayout(primaryInputLayout) + bottom.setButtonsOnly(buttonsOnly) + bottom.setPinnedOnly(!drawn) + bottom.visibility = View.VISIBLE + return } - } - - private fun onControlsCornerTap(next: OnScreenControls.Hidden?) { - controlsHiddenByTap = next == OnScreenControls.Hidden.BY_TAP - if (next == null) controllerInUse = false - updateOnScreenControls() - } - - private fun openControllerMenu() { - drawerPage = SessionDrawerPage.CONTROLLER - drawerOpen = true - } - - private fun noteRemappedControllerUse(event: KeyEvent) { - if (PadBridge.isControllerKeyEvent(event) || - (event.isFromSource(InputDevice.SOURCE_GAMEPAD) && PadBridge.isFromController(event.device))) { - noteControllerUse() - } - } - - private fun noteSteamControllerUse() { - uiHandler.post { - if (!isDestroyed && SteamControllerBle.connected) noteControllerUse() - } - } - - private fun noteControllerUse() { - if (controllerInUse) return - controllerInUse = true - uiHandler.post { - val wasShown = onScreenButtonsVisible - updateOnScreenControls() - if (wasShown && controlsPlan().hidden == OnScreenControls.Hidden.BY_CONTROLLER) - Toast.makeText(this, R.string.osc_hidden_controller, Toast.LENGTH_SHORT).show() - } - } - - private fun noteScreenTouch(event: MotionEvent) { - if (!controllerInUse) return - val corner = onScreenControls?.takeIf { it.isShown }?.let { c -> - val at = IntArray(2).also(c::getLocationOnScreen) - c.cornerTakes(event.rawX - at[0], event.rawY - at[1]) - } == true - if (corner) return - controllerInUse = false - updateOnScreenControls() + hideBottomControls() + val wasDrawn = controls.visibility == View.VISIBLE && !controls.isPinnedOnly + if (!drawn) showPinned() else { controls.setPinnedOnly(false); controls.visibility = View.VISIBLE } + if (drawn == wasDrawn) return + Log.i(TAG, "on-screen controls " + when { + !drawn -> "hidden" + buttonsOnly -> "Steam + QAM" + else -> "full pad" + }) } private fun desktopTextInput() = @@ -5926,7 +5801,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (!screenOff) { gestureSettingsOpen = false inputSettingsOpen = false - layoutEditor = null } releasePads() heldKeys.clear() @@ -6304,7 +6178,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (event.actionMasked == MotionEvent.ACTION_DOWN) { drawerControllerActive = false gestureTouchStreamGate.reset() - if (controllerInUse && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { controllerInUse = false; updateOnScreenControls() } } if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false return onTouchEvent(event) @@ -6350,7 +6223,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } androidx.compose.runtime.key(profileLayout) { androidx.compose.ui.viewinterop.AndroidView( - factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge).also { it.showLayout(profileLayout); swappedInputSurface = it } }, + factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(), + surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()).also { swappedInputSurface = it } }, modifier = Modifier.fillMaxWidth().weight(1f), onRelease = { if (swappedInputSurface === it) swappedInputSurface = null }, ) @@ -6677,7 +6551,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde super.onRequestPermissionsResult(requestCode, permissions, grantResults) if (requestCode != REQUEST_BLUETOOTH || grantResults.firstOrNull() != android.content.pm.PackageManager.PERMISSION_GRANTED) return steamController?.stop() - steamController = SteamControllerBle(this, inputRouter, ::noteSteamControllerUse).also { it.start() } + steamController = SteamControllerBle(this, inputRouter).also { it.start() } } companion object { diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt index a94147e71..5231a753a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -7,6 +7,21 @@ object ControllerPrefs { const val STEAM_BLUE = 0xFF1A9FFF.toInt() const val OFF = "off" + val tints = listOf( + STEAM_BLUE to R.string.ctrl_tint_steam_blue, + 0xFF66C0F4.toInt() to R.string.ctrl_tint_sky, + 0xFFE8EEF4.toInt() to R.string.ctrl_tint_white, + 0xFFC77DFF.toInt() to R.string.ctrl_tint_violet, + 0xFF3DDC84.toInt() to R.string.ctrl_tint_green, + 0xFFFFA726.toInt() to R.string.ctrl_tint_amber, + 0xFFFF5252.toInt() to R.string.ctrl_tint_red, + 0xFFFF6FB5.toInt() to R.string.ctrl_tint_pink, + ) + + val opacities = listOf(40, 60, 80, 100) + + val sizes = listOf(80, 90, 100, 110, 125) + val deadZones = listOf(0, 5, 8, 12, 15, 20, 25) const val DEFAULT_DEAD_ZONE_PERCENT = 12 @@ -24,15 +39,20 @@ object ControllerPrefs { OFF to R.string.ctrl_target_hidden, ) - /** Settings still read: the rest only seed the one-time library and layout migrations. */ class Settings( val tint: Int, val opacity: Int, + val size: Int, val stickClick: Boolean, + val adaptiveSticks: Boolean, val rumble: Boolean, + val steamButton: Boolean, + val qamButton: Boolean, + val keyboardButton: Boolean, val selectSteam: Boolean, val joyConVr: Boolean, val snap: Boolean, + val customLayout: Boolean, val mapping: Map, val deadZone: Int, ) @@ -43,17 +63,50 @@ object ControllerPrefs { val p = prefs(context) return Settings( tint = p.getInt("tint", STEAM_BLUE), - opacity = p.getInt("opacity", 100).coerceIn(1, 100), + opacity = p.getInt("opacity", 100).takeIf { it in opacities } ?: 100, + size = p.getInt("size", 100).takeIf { it in sizes } ?: 100, stickClick = p.getBoolean("stickClick", true), + adaptiveSticks = p.getBoolean("adaptiveSticks", true), rumble = rumbleEnabled(context), + steamButton = p.getBoolean("steamButton", true), + qamButton = p.getBoolean("qamButton", true), + keyboardButton = p.getBoolean("keyboardButton", true), selectSteam = p.getBoolean("selectSteam", false), joyConVr = joyConVr(context), snap = snap(context), - mapping = mappable.associate { (id, _) -> id to (p.getString("map.$id", id)?.takeIf { t -> targets.any { it.first == t } } ?: id) }, + customLayout = p.all.keys.any { it.startsWith("layout.") }, + mapping = mappable.associate { (id, _) -> id to target(context, id) }, deadZone = deadZone(context), ) } + fun target(context: Context, id: String): String = + prefs(context).getString("map.$id", id)?.takeIf { t -> targets.any { it.first == t } } ?: id + + fun setTarget(context: Context, id: String, target: String) { + prefs(context).edit().putString("map.$id", target).apply() + } + + fun setTint(context: Context, tint: Int) { + prefs(context).edit().putInt("tint", tint).apply() + } + + fun setOpacity(context: Context, percent: Int) { + prefs(context).edit().putInt("opacity", percent).apply() + } + + fun setSize(context: Context, percent: Int) { + prefs(context).edit().putInt("size", percent).apply() + } + + fun setStickClick(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("stickClick", on).apply() + } + + fun setAdaptiveSticks(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("adaptiveSticks", on).apply() + } + fun rumbleEnabled(context: Context): Boolean = prefs(context).getBoolean("rumble", true) fun deadZone(context: Context): Int = @@ -67,6 +120,18 @@ object ControllerPrefs { prefs(context).edit().putBoolean("rumble", on).apply() } + fun setSteamButton(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("steamButton", on).apply() + } + + fun setKeyboardButton(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("keyboardButton", on).apply() + } + + fun setSelectSteam(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("selectSteam", on).apply() + } + fun joyConVr(context: Context): Boolean = prefs(context).getBoolean("joyConVr", true) fun setJoyConVr(context: Context, on: Boolean) { @@ -79,6 +144,24 @@ object ControllerPrefs { prefs(context).edit().putBoolean("snap", on).apply() } + fun layout(context: Context, width: Int, height: Int): Map> { + val raw = prefs(context).getString("layout.${width}x$height", null) ?: return emptyMap() + return raw.split(';').mapNotNull { entry -> + val (group, pos) = entry.split(':').takeIf { it.size == 2 } ?: return@mapNotNull null + val (x, y) = pos.split(',').mapNotNull { it.toFloatOrNull() }.takeIf { it.size == 2 } ?: return@mapNotNull null + group to (x to y) + }.toMap() + } + + fun setLayout(context: Context, width: Int, height: Int, positions: Map>) { + val raw = positions.entries.joinToString(";") { (group, pos) -> "$group:${pos.first},${pos.second}" } + prefs(context).edit().putString("layout.${width}x$height", raw).apply() + } + + fun resetLayout(context: Context, width: Int, height: Int) { + prefs(context).edit().remove("layout.${width}x$height").apply() + } + fun resetAll(context: Context) { prefs(context).edit().clear().putBoolean("rumble", true).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt b/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt deleted file mode 100644 index f31bceb8b..000000000 --- a/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt +++ /dev/null @@ -1,216 +0,0 @@ -package com.droiddeck.launcher.input - -import android.content.Context -import com.droiddeck.launcher.R -import com.droiddeck.launcher.session.SessionPrefs - -/** The on-screen layout each game draws, shared by the in-game Controller page and Settings › Controller. A null game is the default. */ -object ControlsChoice { - const val NEW = "new" - const val DEFAULT = "default" - - data class Game(val id: Long, val name: String, val layout: String) - - private fun own(library: InputLibrary, id: String?): String? = id?.takeIf { bindings -> - library.bindings.any { it.id == bindings && !it.physical && it.layoutId?.let { l -> library.layouts.any { x -> x.id == l && x.supports(InputRole.PRIMARY) } } == true } - } - - private fun own(context: Context, library: InputLibrary, game: Long?) = own(library, GameControls.bindings(context, game)) - - /** The input library with [game]'s main-screen layout selected, without saving it. */ - fun library(context: Context, game: Long?, desktop: Boolean): InputLibrary { - val library = InputLibraries.read(context) - val chosen = own(context, library, game) - return if (chosen == null) library else library.selectPart(desktop, InputRole.PRIMARY, chosen) - } - - data class Option(val id: String, val name: String, val detail: String? = null, val deletable: Boolean = false) - - /** Layouts made for one game, so they're listed only for that game. Layouts made before that was recorded are recognised by carrying the name of the game that draws them. */ - private fun owners(context: Context, library: InputLibrary): Map> { - val named = GameControls.games(context).mapNotNull { game -> - val layout = own(library, GameControls.bindings(context, game))?.let { library.preset(it).layoutId } ?: return@mapNotNull null - val name = GameControls.name(context, game) ?: return@mapNotNull null - (layout to game).takeIf { library.layouts.any { it.id == layout && it.name == name } } - } - return (named + GameControls.madeFor(context).toList()).groupBy({ it.first }, { it.second }).mapValues { it.value.toSet() } - } - - private fun defaults(library: InputLibrary) = - listOf(false, true).mapNotNull { library.activeLayout(it, InputRole.PRIMARY)?.id }.toSet() - - private fun deletable(context: Context, library: InputLibrary, layout: SavedInputLayout): Boolean { - if (!layout.editable || layout.id == InputLibraries.OVERLAY || layout.id in defaults(library)) return false - if (GameControls.games(context).any { game -> own(library, GameControls.bindings(context, game))?.let { library.preset(it).layoutId } == layout.id }) return false - return library.profiles.none { p -> p.parts.any { (role, part) -> part.layout == layout.id && drawn(library, p.id, role) } } && - library.bindings.none { it.layoutId == layout.id && library.selectedBindings(it.id) } - } - - /** Whether [profile]'s [role] part is what a mode shows, rather than one a choice made since covers. */ - private fun drawn(library: InputLibrary, profile: String, role: InputRole) = - listOf(false, true).any { desktop -> library.activeId(desktop) == profile && library.selection(desktop).parts[role] == null } - - private fun keeps(library: InputLibrary, profile: String) = - profile == InputProfile.GAME || profile == InputProfile.DESKTOP || listOf(false, true).any { library.activeId(it) == profile } - - fun options(context: Context, game: Long?, steamMode: Boolean, gameName: String? = null, desktop: Boolean = false): List