mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
Controller: optional Select button that opens the Steam menu (#384)
* Controller: optional Select button that opens the Steam menu * Controller: translate the Select-opens-Steam-menu option * Controller: clearer wording for the Select-opens-Steam-menu option * docs: evidence for the Select-opens-Steam-menu option --------- Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com>
This commit is contained in:
1 parent
a4ea72cb90
commit
20f919d708
15 files changed
+40
No files matched your search
@@ -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 },
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<String, String>,
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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() }
|
||||
|
||||
@@ -839,6 +839,8 @@
|
||||
<string name="ctrl_steam_button">Botón Steam</string>
|
||||
<string name="ctrl_qam_button">Botón QAM</string>
|
||||
<string name="ctrl_keyboard_button">Botón de teclado</string>
|
||||
<string name="ctrl_select_steam">Pulsa Select para abrir el menú de Steam</string>
|
||||
<string name="ctrl_select_steam_hint">En lugar de View/Select.</string>
|
||||
<string name="setup_animations">Animaciones</string>
|
||||
<string name="ctrl_adaptive_hint">Los sticks aparecen donde tocas y se ocultan al soltar</string>
|
||||
<string name="ctrl_layout">Disposición</string>
|
||||
|
||||
@@ -730,6 +730,8 @@
|
||||
<string name="ctrl_steam_button">Bouton Steam</string>
|
||||
<string name="ctrl_qam_button">Bouton QAM</string>
|
||||
<string name="ctrl_keyboard_button">Bouton clavier</string>
|
||||
<string name="ctrl_select_steam">Appuyez sur Select pour ouvrir le menu Steam</string>
|
||||
<string name="ctrl_select_steam_hint">À la place de View/Select.</string>
|
||||
<string name="setup_animations">Animations</string>
|
||||
<string name="ctrl_adaptive_hint">Le joystick apparaîtra là où vous touchez et se masquera une fois relâché</string>
|
||||
<string name="ctrl_layout">Disposition</string>
|
||||
|
||||
@@ -831,6 +831,8 @@
|
||||
<string name="ctrl_steam_button">Steamボタン</string>
|
||||
<string name="ctrl_qam_button">QAMボタン</string>
|
||||
<string name="ctrl_keyboard_button">キーボードボタン</string>
|
||||
<string name="ctrl_select_steam">Selectを押してSteamメニューを開く</string>
|
||||
<string name="ctrl_select_steam_hint">View/Selectの代わり。</string>
|
||||
<string name="setup_animations">アニメーション</string>
|
||||
<string name="ctrl_adaptive_hint">スティックは触れた位置に表示され、離すと非表示になります</string>
|
||||
<string name="ctrl_layout">レイアウト</string>
|
||||
|
||||
@@ -831,6 +831,8 @@
|
||||
<string name="ctrl_steam_button">Steam 버튼</string>
|
||||
<string name="ctrl_qam_button">QAM 버튼</string>
|
||||
<string name="ctrl_keyboard_button">키보드 버튼</string>
|
||||
<string name="ctrl_select_steam">Select를 눌러 Steam 메뉴 열기</string>
|
||||
<string name="ctrl_select_steam_hint">View/Select 대신.</string>
|
||||
<string name="setup_animations">애니메이션</string>
|
||||
<string name="ctrl_adaptive_hint">스틱이 터치한 위치에 나타나며 손을 떼면 숨겨집니다</string>
|
||||
<string name="ctrl_layout">레이아웃</string>
|
||||
|
||||
@@ -814,6 +814,8 @@
|
||||
<string name="ctrl_steam_button">Кнопка Steam</string>
|
||||
<string name="ctrl_qam_button">Кнопка QAM</string>
|
||||
<string name="ctrl_keyboard_button">Кнопка клавиатуры</string>
|
||||
<string name="ctrl_select_steam">Нажмите Select, чтобы открыть меню Steam</string>
|
||||
<string name="ctrl_select_steam_hint">Вместо View/Select.</string>
|
||||
<string name="setup_animations">Анимации</string>
|
||||
<string name="ctrl_adaptive_hint">Стики появляются в месте касания и исчезают после отпускания</string>
|
||||
<string name="ctrl_layout">Раскладка</string>
|
||||
|
||||
@@ -831,6 +831,8 @@
|
||||
<string name="ctrl_steam_button">Steam 按钮</string>
|
||||
<string name="ctrl_qam_button">QAM 按钮</string>
|
||||
<string name="ctrl_keyboard_button">键盘按钮</string>
|
||||
<string name="ctrl_select_steam">按 Select 打开 Steam 菜单</string>
|
||||
<string name="ctrl_select_steam_hint">代替 View/Select。</string>
|
||||
<string name="setup_animations">动画</string>
|
||||
<string name="ctrl_adaptive_hint">摇杆出现在触摸处,松手后隐藏</string>
|
||||
<string name="ctrl_layout">布局</string>
|
||||
|
||||
@@ -831,6 +831,8 @@
|
||||
<string name="ctrl_steam_button">Steam 按鈕</string>
|
||||
<string name="ctrl_qam_button">QAM 按鈕</string>
|
||||
<string name="ctrl_keyboard_button">鍵盤按鈕</string>
|
||||
<string name="ctrl_select_steam">按 Select 開啟 Steam 選單</string>
|
||||
<string name="ctrl_select_steam_hint">代替 View/Select。</string>
|
||||
<string name="setup_animations">動畫</string>
|
||||
<string name="ctrl_adaptive_hint">搖桿會在你觸控的位置出現,放開後隱藏</string>
|
||||
<string name="ctrl_layout">佈局</string>
|
||||
|
||||
@@ -831,6 +831,8 @@
|
||||
<string name="ctrl_steam_button">Steam 按鈕</string>
|
||||
<string name="ctrl_qam_button">QAM 按鈕</string>
|
||||
<string name="ctrl_keyboard_button">鍵盤按鈕</string>
|
||||
<string name="ctrl_select_steam">按 Select 開啟 Steam 功能表</string>
|
||||
<string name="ctrl_select_steam_hint">代替 View/Select。</string>
|
||||
<string name="setup_animations">動畫</string>
|
||||
<string name="ctrl_adaptive_hint">搖桿會出現在你觸控的位置,並在放開後隱藏</string>
|
||||
<string name="ctrl_layout">版面配置</string>
|
||||
|
||||
@@ -849,6 +849,8 @@
|
||||
<string name="ctrl_steam_button">Steam button</string>
|
||||
<string name="ctrl_qam_button">QAM button</string>
|
||||
<string name="ctrl_keyboard_button">Keyboard button</string>
|
||||
<string name="ctrl_select_steam">Press Select to open the Steam menu</string>
|
||||
<string name="ctrl_select_steam_hint">Instead of View/Select.</string>
|
||||
<string name="setup_animations">Animations</string>
|
||||
<string name="ctrl_adaptive_hint">Sticks appear where you touch and hide on release</string>
|
||||
<string name="ctrl_layout">Layout</string>
|
||||
|
||||
Reference in new issue
Block a user