From d71178c955d2fd0d5243bccb187e46a5ce5b15f5 Mon Sep 17 00:00:00 2001 From: Neolyum <44875198+Neolyum@users.noreply.github.com> Date: Mon, 12 Oct 2026 13:45:00 +0200 Subject: [PATCH] Fix multiple controller discovery (#614) --- .../main/java/com/droiddeck/launcher/SessionActivity.kt | 2 ++ .../main/java/com/droiddeck/launcher/input/PadBridge.java | 8 ++++++++ .../java/com/droiddeck/launcher/session/SessionService.kt | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 883492d57a..95d5a13d6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -338,6 +338,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val deviceListener = object : InputManager.InputDeviceListener { override fun onInputDeviceAdded(deviceId: Int) { logInputDevice("connected", deviceId) + padBridge?.syncConnectedControllers() updateOnScreenControls() updatePointerCapture() } @@ -2407,6 +2408,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } (getSystemService(INPUT_SERVICE) as? InputManager) ?.registerInputDeviceListener(deviceListener, Handler(Looper.getMainLooper())) + if (SessionState.guestPid > 1) padBridge?.syncConnectedControllers() onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) updateOnScreenControls() 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 9eff5a89bf..a93c8b9a67 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -257,6 +257,14 @@ public final class PadBridge { return false; } + /** Publishes every currently connected controller so the client can enumerate all players. */ + public synchronized void syncConnectedControllers() { + for (int deviceId : InputDevice.getDeviceIds()) { + InputDevice device = InputDevice.getDevice(deviceId); + if (isFromController(device)) publish(slotFor(device)); + } + } + /** * Called (main thread) when a player presses a button, pushes a stick, trigger or d-pad past * halfway, or uses the on-screen controls - the session hides its mouse cursor then. Resting diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 4910015614..2f606dcd25 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -381,7 +381,12 @@ class SessionService : Service() { val controllersOn = !File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists() SessionState.deckPad = false deckBinds = emptyList() - if (controllersOn) addControllerEnvironment(guest, fakeInputDir, sessionDir) + if (controllersOn) { + addControllerEnvironment(guest, fakeInputDir, sessionDir) + // Steam enumerates /dev/input while it starts. Make every attached controller's + // discovery node exist after the rings and guest environment are ready. + SessionState.padBridge?.syncConnectedControllers() + } // The user's own games, for the runtime's shortcuts writer to put in the client's library // before the client starts (see frontend/AddedGames and droiddeck-steam-shortcuts). if (steamHere) {