enricobuehler
9fb41affba
windows / build (aarch64-pc-windows-msvc) (pull_request) Successful in 1m14s
apple / swift (pull_request) Successful in 1m30s
apple / screenshots (pull_request) Skipped
ci / docs-site (pull_request) Successful in 1m37s
ci / rust-arm64 (pull_request) Successful in 2m41s
ci / web (pull_request) Successful in 3m30s
windows / build (x86_64-pc-windows-msvc) (pull_request) Successful in 2m16s
android / android (pull_request) Successful in 5m37s
ci / rust (pull_request) Successful in 8m4s
Turn "Forward controllers" off and four rows below it stop meaning anything — nothing is forwarded, so there is no pad type to pick and no guide button to route. GTK desensitised them, the touch settings on both mobile clients dimmed them and the console UI refused the step; the Windows client and BOTH controller-navigable screens left them fully live, so you could sit there changing settings that did nothing. Windows: `.enabled(s.gamepad_forwarding)` on the forwarded-controller picker, pad type, guide button and hold-Select rows — the same builder the echo-cancellation row already used to follow the mic switch. Apple's gamepad settings had no way to say it: `Row` carried `adjustable` (which only hides the chevrons) and nothing else. Added `Row.enabled`, dimmed the row CONTENTS only so the glass still reads as a focusable row, and enforced the inertness centrally in `adjust(id:)` / `activate(id:)` rather than in each builder's closure. The hint bar drops "Adjust"/"Change" on a dimmed row, because advertising them was the same lie the live row told. Android's gamepad settings already had `GpRow.enabled` — documented as "dimmed + inert" — but it only faded the label: every dimmed row still stepped and still wrote its setting. The "No profiles yet" placeholder looked inert only because its own closures were empty. Made it real in one named place (`liveRow`), covering all three input paths (left/right, A, and a tap on the already-focused row), then gated the pad rows on it. Also on that screen: the DualSense / DualShock passthrough toggle, which the touch settings have carried beside its SC2 twin all along. It was missing exactly where it matters most — a TV box has no touch interface to fall back to, so there was no way to reach it at all. Apple capture, separately: with forwarding off, opening a slot still claimed EVERY element's system gesture and powered the controller's IMU. Neither reaches the host, so the first only took the user's screenshot/Home gestures away for nothing and the second drained the pad's battery streaming gyro over Bluetooth. Narrowed rather than skipped — the escape chord is read off the same slot and on tvOS is the ONLY controller way out of a stream, so the chord's own four buttons keep their claim. A test pins the alias list against the chord mask; if they drift the symptom is a session nobody can leave, with nothing logged. Closes R17, R18, R19 (design/haptics-sweep-2026-08-03.md M11). R17 as filed named Windows and "Apple"; Apple's TOUCH settings were already correct and Android's controller-navigable screen was not — both corrected here. Verified: Windows clippy -D warnings exit 0 on a real Windows box; Apple swift build clean + full suite 192 tests / 0 failures (3 new); Android :app: + :kit: green (5 new); cargo fmt --all --check clean. Each fix probed by reverting it — every probe failed the tests it should.
53 lines
2.5 KiB
Swift
53 lines
2.5 KiB
Swift
import GameController
|
|
import XCTest
|
|
|
|
@testable import PunktfunkKit
|
|
|
|
/// The escape chord's mask and its GameController alias list have to describe the same four
|
|
/// buttons. `GamepadCapture.openSlot` claims the system gesture of every element while forwarding
|
|
/// is on, but only of `escapeChordElements` while it is off — so if the alias list ever stops
|
|
/// covering the mask, the missing button's press stays the system's and the chord never completes.
|
|
///
|
|
/// That matters most on tvOS, where this chord is the only controller way out of a stream: the
|
|
/// symptom is a session nobody can leave with the pad in their hands, and nothing logs or crashes.
|
|
/// Hence a test on the invariant rather than trusting the comment beside it.
|
|
@MainActor
|
|
final class GamepadEscapeChordTests: XCTestCase {
|
|
|
|
/// The intended alias↔bit pairing, spelled out independently of the implementation.
|
|
private let pairing: [(alias: String, bit: UInt32)] = [
|
|
(GCInputLeftShoulder, GamepadWire.leftShoulder),
|
|
(GCInputRightShoulder, GamepadWire.rightShoulder),
|
|
(GCInputButtonMenu, GamepadWire.start),
|
|
(GCInputButtonOptions, GamepadWire.back),
|
|
]
|
|
|
|
func testChordMaskIsExactlyTheFourPairedButtons() {
|
|
XCTAssertEqual(
|
|
pairing.reduce(UInt32(0)) { $0 | $1.bit },
|
|
GamepadCapture.escapeChord,
|
|
"the chord mask and the alias pairing describe different buttons")
|
|
}
|
|
|
|
func testEveryChordBitHasAnElementToClaim() {
|
|
// One alias per bit — a mask that grew a fifth button without a matching alias would
|
|
// leave that button's gesture with the OS while forwarding is off.
|
|
XCTAssertEqual(
|
|
GamepadCapture.escapeChordElements.count,
|
|
GamepadCapture.escapeChord.nonzeroBitCount,
|
|
"alias list and chord mask differ in size")
|
|
XCTAssertEqual(GamepadCapture.escapeChordElements, pairing.map(\.alias))
|
|
}
|
|
|
|
/// The claim list is a strict subset of what a forwarding slot takes — it is a NARROWING of
|
|
/// the full sweep, never an extra grab, and it must not be empty (that would be "skip", which
|
|
/// is the behaviour this deliberately avoids).
|
|
func testClaimListIsNonEmptyAndAllDistinct() {
|
|
XCTAssertFalse(GamepadCapture.escapeChordElements.isEmpty)
|
|
XCTAssertEqual(
|
|
Set(GamepadCapture.escapeChordElements).count,
|
|
GamepadCapture.escapeChordElements.count,
|
|
"a repeated alias would mean a chord bit has no element")
|
|
}
|
|
}
|