Fix multiple controller discovery (#614)

This commit is contained in:
Neolyum authored and GitHub committed 2026-10-12 11:45:00 +00:00
1 parent aa901c3902
commit d71178c955
3 files changed
+16 -1

No files matched your search

@@ -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()
@@ -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
@@ -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) {