diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index b60705d365..898ecd1e4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -826,6 +826,7 @@ class MainActivity : ComponentActivity() { onSteamButton = { on -> ControllerPrefs.setSteamButton(this, on); refreshController() }, onQamButton = { on -> ControllerPrefs.setQamButton(this, on); refreshController() }, onKeyboardButton = { on -> ControllerPrefs.setKeyboardButton(this, on); refreshController() }, + onSelectSteam = { on -> ControllerPrefs.setSelectSteam(this, on); refreshController() }, onEditLayout = { startActivity(Intent(this, ControllerEditorActivity::class.java)) }, onResetLayout = { ControllerPrefs.resetAllLayouts(this); refreshController() }, onMapping = { settingsMode = null; showPerformance = false; showProtons = false; showComponents = false; showMapping = true }, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 568846abd0..38578b5d50 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -385,6 +385,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } val bridge = PadBridge(File(LinuxRuntime.sessionRoot(this), "dev/input")) + bridge.setSelectSteam(ControllerPrefs.read(this).selectSteam) padBridge = bridge SessionState.padBridge = bridge padMotion = com.droiddeck.launcher.input.PadMotion(this) { 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 747308b759..739f83d3f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -46,6 +46,7 @@ object ControllerPrefs { val steamButton: Boolean, val qamButton: Boolean, val keyboardButton: Boolean, + val selectSteam: Boolean, val snap: Boolean, val customLayout: Boolean, val mapping: Map, @@ -65,6 +66,7 @@ object ControllerPrefs { steamButton = p.getBoolean("steamButton", true), qamButton = p.getBoolean("qamButton", true), keyboardButton = p.getBoolean("keyboardButton", true), + selectSteam = p.getBoolean("selectSteam", false), snap = p.getBoolean("snap", true), customLayout = p.all.keys.any { it.startsWith("layout.") }, mapping = mappable.associate { (id, _) -> id to target(context, id) }, @@ -121,6 +123,11 @@ object ControllerPrefs { prefs(context).edit().putBoolean("keyboardButton", on).apply() } + /** The physical Select button opens the Steam menu instead of View/Select. */ + fun setSelectSteam(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("selectSteam", on).apply() + } + fun setSnap(context: Context, on: Boolean) { prefs(context).edit().putBoolean("snap", on).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 85d2d80a91..fd5818ac0c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -65,6 +65,7 @@ public final class PadBridge { private final PadState effectiveState = new PadState(); private final Handler mainHandler = new Handler(Looper.getMainLooper()); private boolean open; + private volatile boolean selectSteam; private boolean systemGuidePressed; private boolean systemQamPressed; private boolean qamChordActive; @@ -113,6 +114,11 @@ public final class PadBridge { for (int slot = 1; slot < SLOTS; slot++) playerStates[slot] = new PadState(); } + /** The physical Select button opens the Steam menu instead of View/Select (Setup → Controller). */ + public void setSelectSteam(boolean on) { + selectSteam = on; + } + /** Opens the ring; safe to call more than once. */ public synchronized boolean start() { if (!open) { @@ -222,6 +228,11 @@ public final class PadBridge { case KeyEvent.KEYCODE_BUTTON_L1: pad.press(4, pressed); break; case KeyEvent.KEYCODE_BUTTON_R1: pad.press(5, pressed); break; case KeyEvent.KEYCODE_BUTTON_SELECT: + // Optionally (Setup → Controller) the physical Select button opens the Steam menu + // instead of View/Select: on some handhelds it sits next to the Steam button. + if (selectSteam) pad.press(PadState.GUIDE, pressed); + else pad.press(6, pressed); + break; case KeyEvent.KEYCODE_BACK: pad.press(6, pressed); break; case KeyEvent.KEYCODE_BUTTON_START: case KeyEvent.KEYCODE_MENU: pad.press(7, pressed); break; diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt index 8785c4ef03..40cb450768 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt @@ -28,6 +28,7 @@ class ControllerActions( val onSteamButton: (Boolean) -> Unit, val onQamButton: (Boolean) -> Unit, val onKeyboardButton: (Boolean) -> Unit, + val onSelectSteam: (Boolean) -> Unit, val onEditLayout: () -> Unit, val onResetLayout: () -> Unit, val onMapping: () -> Unit, @@ -70,6 +71,7 @@ fun ColumnScope.ControllerRows(host: MenuHost, oscMode: String, c: ControllerPre ToggleRow(host, "controller-steam", stringResource(R.string.ctrl_steam_button), null, c.steamButton, onChange = a.onSteamButton) ToggleRow(host, "controller-qam", stringResource(R.string.ctrl_qam_button), null, c.qamButton, onChange = a.onQamButton) ToggleRow(host, "controller-keyboard", stringResource(R.string.ctrl_keyboard_button), null, c.keyboardButton, onChange = a.onKeyboardButton) + ToggleRow(host, "controller-select-steam", stringResource(R.string.ctrl_select_steam), stringResource(R.string.ctrl_select_steam_hint), c.selectSteam, onChange = a.onSelectSteam) SettingsRow(stringResource(R.string.ctrl_layout), if (c.customLayout) stringResource(R.string.ctrl_layout_custom) else stringResource(R.string.ctrl_layout_default)) { Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { SecondaryButton(stringResource(R.string.ctrl_edit)) { a.onEditLayout() } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6695dfa3a4..0afc9ae5ba 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -839,6 +839,8 @@ Botón Steam Botón QAM Botón de teclado + Pulsa Select para abrir el menú de Steam + En lugar de View/Select. Animaciones Los sticks aparecen donde tocas y se ocultan al soltar Disposición diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ed5442ecae..c43a7a5b63 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -730,6 +730,8 @@ Bouton Steam Bouton QAM Bouton clavier + Appuyez sur Select pour ouvrir le menu Steam + À la place de View/Select. Animations Le joystick apparaîtra là où vous touchez et se masquera une fois relâché Disposition diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ec909e94ad..968c8ee6e1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -831,6 +831,8 @@ Steamボタン QAMボタン キーボードボタン + Selectを押してSteamメニューを開く + View/Selectの代わり。 アニメーション スティックは触れた位置に表示され、離すと非表示になります レイアウト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 961dfce204..827249b872 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -831,6 +831,8 @@ Steam 버튼 QAM 버튼 키보드 버튼 + Select를 눌러 Steam 메뉴 열기 + View/Select 대신. 애니메이션 스틱이 터치한 위치에 나타나며 손을 떼면 숨겨집니다 레이아웃 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9e39a6775d..fa549a4249 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -814,6 +814,8 @@ Кнопка Steam Кнопка QAM Кнопка клавиатуры + Нажмите Select, чтобы открыть меню Steam + Вместо View/Select. Анимации Стики появляются в месте касания и исчезают после отпускания Раскладка diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fe1ee83942..91555692de 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -831,6 +831,8 @@ Steam 按钮 QAM 按钮 键盘按钮 + 按 Select 打开 Steam 菜单 + 代替 View/Select。 动画 摇杆出现在触摸处,松手后隐藏 布局 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 136dc4a78e..7809e3d0d3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -831,6 +831,8 @@ Steam 按鈕 QAM 按鈕 鍵盤按鈕 + 按 Select 開啟 Steam 選單 + 代替 View/Select。 動畫 搖桿會在你觸控的位置出現,放開後隱藏 佈局 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6c3e0e7316..1a65a655ea 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -831,6 +831,8 @@ Steam 按鈕 QAM 按鈕 鍵盤按鈕 + 按 Select 開啟 Steam 功能表 + 代替 View/Select。 動畫 搖桿會出現在你觸控的位置,並在放開後隱藏 版面配置 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14abe19e1c..be139954c6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -849,6 +849,8 @@ Steam button QAM button Keyboard button + Press Select to open the Steam menu + Instead of View/Select. Animations Sticks appear where you touch and hide on release Layout diff --git a/docs/development/evidence/select-steam-toggle.png b/docs/development/evidence/select-steam-toggle.png new file mode 100644 index 0000000000..5f5b480570 Binary files /dev/null and b/docs/development/evidence/select-steam-toggle.png differ