enricobuehler
236c59754b
clients/windows/src/gamepad.rs was a 629-line near-verbatim fork of
pf-client-core's SDL gamepad service, frozen at an old single-pad design.
Commit 9822fc3b removed its attach/detach entry points but left the machinery,
so `Worker.attached` was initialized None and never set — ~300-400 lines
(button/axis/touchpad/motion forwarding, Ds5Feedback, the rumble/HID feedback
loop) were logically unreachable, never flagged because the guards read a
runtime Option the compiler can't prove is always None. The live remainder
(pad enumeration + pin persistence) had drifted from core: it opened every
device for metadata (vs core's no-open id-getters), force-enabled the Valve
HIDAPI drivers unconditionally, lacked the steam_virtual skip (so it could pin
Steam Input's virtual pad and kill gyro), and derived the pin key from an
opened handle — risking a cross-process byte-mismatch with the session, which
resolves the same key from id-getters.
The shell's only live job is enumerating pads for the Settings list and
persisting the pin; the spawned punktfunk-session already runs the full
pf-client-core service and does all real forwarding (session/main.rs). So
delete the fork and point the shell at pf_client_core::gamepad::GamepadService
directly — its start()/pads()/set_pinned()/clone() + PadInfo{key,name,
kind_label()} are a strict superset of what the shell uses. Idle, core's
service is hands-off the hardware (id-getter metadata, no device open, HIDAPI
off), which is the intended behavior and fixes the drift class above.
- delete clients/windows/src/gamepad.rs (-629) and `mod gamepad;`
- main.rs / app/mod.rs: use pf_client_core::gamepad::GamepadService
- drop the now-unused direct sdl3 dep (pf-client-core pulls it on Windows with
the same build-from-source,hidapi features); sync Cargo.lock
Pre-checks (dev Mac): std mpsc Sender<T>: Sync confirmed on the pinned 1.96.0
(so core's GamepadService is Sync for the WinUI cross-thread sharing, no core
change needed); rustfmt clean; no dangling refs. Windows compile is deferred
to CI (windows-only crate, unbuildable on macOS).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
82 lines
4.4 KiB
TOML
82 lines
4.4 KiB
TOML
[package]
|
|
name = "punktfunk-client-windows"
|
|
description = "Native Windows punktfunk/1 client — WinUI 3 (windows-reactor) shell, SDL3 gamepads; streaming runs in the spawned punktfunk-session binary"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
repository.workspace = true
|
|
|
|
[[bin]]
|
|
name = "punktfunk-client"
|
|
path = "src/main.rs"
|
|
|
|
# Everything is Windows-gated so `cargo build --workspace` stays green on Linux/macOS (the
|
|
# other native clients live in clients/linux and clients/apple); on other
|
|
# platforms this builds as a stub binary. Mirrors the Linux client's cfg(target_os="linux")
|
|
# gating exactly.
|
|
[target.'cfg(windows)'.dependencies]
|
|
# The protocol core, linked directly (no C ABI) — same as the GTK Linux client. NativeClient
|
|
# is Sync (mutexed plane receivers), so it drops into a UI app cleanly.
|
|
punktfunk-core = { path = "../../crates/punktfunk-core", features = ["quic"] }
|
|
# The shared client service layer: the trust/settings stores (ONE `Settings` struct for the
|
|
# shell and the spawned session binary — src/trust.rs re-exports it) and the game-library
|
|
# data model (fetch + art pipeline) behind the library page.
|
|
pf-client-core = { path = "../../crates/pf-client-core" }
|
|
|
|
# WinUI 3 UI via windows-reactor (a declarative React-like framework backed by WinUI). Its
|
|
# `build.rs` downloads the Windows App SDK NuGets and stages the bootstrap DLL + resources.pri
|
|
# next to the exe; it requires `CARGO_WORKSPACE_DIR` to be set in the build env. Unpublished
|
|
# (version 0.0.0) and fast-moving, so pinned to a verified commit.
|
|
windows-reactor = { git = "https://github.com/microsoft/windows-rs", rev = "a4f7b2cb7c63c6bb7fc77a2affe57145be1d8c4f" }
|
|
# Win32 / Direct3D11 / DXGI for the SwapChainPanel composition swapchain. Pulled from the SAME
|
|
# windows-rs commit as windows-reactor so their `windows-core` unifies — the `IDXGISwapChain1`
|
|
# we hand to `SwapChainPanelHandle::set_swap_chain` must satisfy reactor's `windows_core::Interface`.
|
|
windows = { git = "https://github.com/microsoft/windows-rs", rev = "a4f7b2cb7c63c6bb7fc77a2affe57145be1d8c4f", features = [
|
|
"Win32_Foundation",
|
|
"Win32_Graphics_Dxgi",
|
|
"Win32_Graphics_Dxgi_Common",
|
|
# GetCurrentPackageFullName — the packaged-run probe guarding the explicit
|
|
# AppUserModelID (main.rs; MSIX identity must win over the dev-run tag).
|
|
"Win32_Storage_Packaging_Appx",
|
|
"Win32_Graphics_Direct3D",
|
|
"Win32_Graphics_Direct3D11",
|
|
"Win32_Graphics_Direct3D_Fxc",
|
|
"Win32_Graphics_Gdi",
|
|
"Win32_System_Console",
|
|
"Win32_System_LibraryLoader",
|
|
"Win32_System_Threading",
|
|
"Win32_UI_HiDpi",
|
|
"Win32_UI_Input_KeyboardAndMouse",
|
|
# Win32 window subclassing (SetWindowSubclass/DefSubclassProc) — the stream input hooks
|
|
# subclass the WinUI window + its content-island children to swallow WM_SETCURSOR so the
|
|
# local cursor stays hidden while the pointer is locked (WinUI otherwise re-asserts the arrow
|
|
# on every pointer move, defeating a one-shot ShowCursor(false)).
|
|
"Win32_UI_Shell",
|
|
"Win32_UI_WindowsAndMessaging",
|
|
] }
|
|
|
|
# FFmpeg — used only to enumerate which codecs this client can decode (probe::decodable_codecs),
|
|
# advertised to the host on the speed-test connect. Same pin as the host/Linux client. (Real
|
|
# decode + present live in the spawned punktfunk-session binary.)
|
|
ffmpeg-next = "8"
|
|
|
|
# Gamepad enumeration + pin persistence for Settings runs on pf-client-core's shared SDL service
|
|
# (see the `gamepad` field in app/); the spawned punktfunk-session does the actual forwarding. SDL3
|
|
# itself (built from source via the bundled CMake on Windows) is pulled transitively by
|
|
# pf-client-core with the same `build-from-source,hidapi` features, so it is not a direct dep here.
|
|
mdns-sd = "0.20"
|
|
async-channel = "2"
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
# Embeds the app icon as an exe resource (build.rs) — Windows hosts only (rc.exe from the SDK).
|
|
# windows-reactor-setup stages the Windows App SDK runtime bootstrap (framework-dependent) next
|
|
# to the exe — the new-model replacement for the old windows-reactor build.rs; same pinned rev.
|
|
[target.'cfg(windows)'.build-dependencies]
|
|
winresource = "0.1"
|
|
windows-reactor-setup = { git = "https://github.com/microsoft/windows-rs", rev = "a4f7b2cb7c63c6bb7fc77a2affe57145be1d8c4f" }
|