forked from unom/punktfunk
enricobuehler
49a8f4f1d1
Version currency for the virtual-keyboard keymap in pf-inject's wlroots path
(`inject/linux/wlr.rs`), the crate's only consumer.
Additive on the Rust side: one new wrapper, `Keymap::key_get_mods_for_level`,
and the `extern` declaration behind it. Nothing we call changed shape -- we use
`Context::new`, `Keymap::new_from_names`, `get_as_string`, `State::new`,
`Keycode::new`, `KeyDirection` and the `serialize_mods`/`serialize_layout` pair,
all untouched. The feature set is unchanged too: `default = ["wayland"]` in both
releases, so `x11` -- the feature that would pull `as-raw-xcb-connection` -- stays
off and this links only `libxkbcommon`, exactly as before.
The one thing worth writing down is the new symbol's floor. On .25's
libxkbcommon 1.13.1 it reads
`xkb_keymap_key_get_mods_for_level@@V_1.0.0`, so the declaration wants
libxkbcommon >= 1.0.0 (2020) if it is ever referenced. Nothing in the workspace
calls the wrapper, so no relocation for it reaches our binaries -- and every ship
target clears 1.0 by years regardless (Ubuntu 22.04 is 1.4, Debian 12 is 1.5,
Debian 13 is 1.7). pf-inject's test binary, which unlike the rlib actually links,
builds and runs clean.
Two internal fixes come along, both in constructors we do not use:
`new_from_string` passes the Rust string's pointer + length to
`xkb_keymap_new_from_buffer` instead of round-tripping through a `CString`
(whose `unwrap()` panicked on an interior NUL), and `new_from_fd` passes the
full mapped `size` rather than `size - 1`.
Verified on .25 (Ubuntu 26.04, `CARGO_BUILD_JOBS=2`), all rc=0:
cargo build -p pf-inject --locked
cargo clippy -p pf-inject --locked -- -D warnings
cargo clippy -p pf-inject --all-targets --locked -- -D warnings
cargo test -p pf-inject --locked 127 passed, 0 failed, 8 ignored
+ motion_contract: 7 passed, 0 failed
cargo check -p punktfunk-host --locked
cargo clippy -p punktfunk-host --locked -- -D warnings
cargo fmt --all --check
Clippy is run BOTH ways because host CI lints without `--all-targets`.
`cargo tree -i ring` stays empty.
84 lines
4.2 KiB
TOML
84 lines
4.2 KiB
TOML
# Input injection (plan §W6): the per-OS injector backends (wlroots virtual-input, KWin fake_input,
|
|
# libei/reis, gamescope-EI on Linux; SendInput on Windows) + the virtual-gamepad HID stack (DualSense/
|
|
# DualShock4/Switch Pro/Steam Controller/Deck over uhid/usbip and the Windows UMDF drivers), extracted
|
|
# into a subsystem crate. Consumes punktfunk_core::input (the neutral GamepadEvent/InputEvent vocabulary,
|
|
# moved to core in W5) and the pf-driver-proto wire contract; NEVER reaches the orchestrator (the one
|
|
# gamescope-EI socket path is the shared pf-paths contract, not a vdisplay reach-in).
|
|
[package]
|
|
name = "pf-inject"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license = "MIT OR Apache-2.0"
|
|
description = "punktfunk host input injection: per-OS keyboard/mouse injectors + the virtual-gamepad HID backends behind one InputInjector trait."
|
|
publish = false
|
|
|
|
[dependencies]
|
|
punktfunk-core = { path = "../punktfunk-core", features = ["quic"] }
|
|
pf-driver-proto = { path = "../pf-driver-proto" }
|
|
pf-host-config = { path = "../pf-host-config" }
|
|
pf-paths = { path = "../pf-paths" }
|
|
# The Windows gamepad-channel bootstrap reuses the IDD-push WUDFHost verification + the resident-mouse
|
|
# compose-kick hook (both live in pf-capture).
|
|
pf-capture = { path = "../pf-capture" }
|
|
anyhow = "1"
|
|
tracing = "0.1"
|
|
|
|
[target.'cfg(target_os = "linux")'.dependencies]
|
|
libc = "0.2"
|
|
parking_lot = "0.12"
|
|
# The RemoteDesktop portal for the libei injector on KWin/GNOME (headless grant via kde-authorized).
|
|
ashpd = { version = "0.13", features = ["remote_desktop"] }
|
|
# Input injection into headless Sway via the wlroots virtual-input Wayland protocols.
|
|
wayland-client = "0.31"
|
|
wayland-protocols-wlr = { version = "0.3", features = ["client"] }
|
|
wayland-protocols-misc = { version = "0.3", features = ["client"] }
|
|
wayland-protocols = { version = "0.32", features = ["client"] }
|
|
# Codegen for KDE's `org_kde_kwin_fake_input` (vendored in `protocols/fake-input.xml`); the generated
|
|
# interface tables reference `wayland-backend`.
|
|
wayland-scanner = "0.31"
|
|
wayland-backend = "0.3"
|
|
# libei (EI sender) for the portable input path on KWin/GNOME (RemoteDesktop portal) + gamescope-EI.
|
|
reis = { version = "0.7.1", features = ["tokio"] }
|
|
futures-util = "0.3"
|
|
# `macros` is for the `tokio::select!` in the libei and steam_usbip worker loops. It used to be
|
|
# absent and compile anyway, borrowed from punktfunk-core's `quic` feature via unification — i.e. an
|
|
# unrelated crate dropping it would have broken this one.
|
|
tokio = { version = "1", features = ["rt", "rt-multi-thread", "net", "time", "macros"] }
|
|
# Builds/validates the xkb keymap uploaded to the virtual keyboard + tracks modifier state.
|
|
xkbcommon = "0.9"
|
|
# Vendored + trimmed usbip server core — presents a virtual Steam Deck over USB/IP for Steam Input.
|
|
usbip-sim = { path = "../punktfunk-host/vendor/usbip-sim" }
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
# The streamed-output desktop rect (CCD source rect) absolute input maps into — the same
|
|
# resolver the cursor-readback poller uses, so inject and readback always agree.
|
|
pf-win-display = { path = "../pf-win-display" }
|
|
windows = { version = "0.62", features = [
|
|
"Win32_Foundation",
|
|
"Win32_Security",
|
|
"Win32_Security_Authorization",
|
|
"Win32_Devices_DeviceAndDriverInstallation",
|
|
"Win32_Devices_Enumeration_Pnp",
|
|
# SwDeviceCreate's SW_DEVICE_CREATE_INFO references DEVPROPKEY (Properties).
|
|
"Win32_Devices_Properties",
|
|
# The channel proof: HidD_GetIndexedString + GUID_DEVINTERFACE_HID (the pads/mouse leg) and
|
|
# CreateFileW to open the device interface the proof is asked over.
|
|
"Win32_Devices_HumanInterfaceDevice",
|
|
"Win32_Storage_FileSystem",
|
|
"Win32_System_Memory",
|
|
"Win32_System_IO",
|
|
"Win32_System_StationsAndDesktops",
|
|
"Win32_System_Threading",
|
|
"Win32_UI_Input_KeyboardAndMouse",
|
|
# Synthetic pointer devices (PT_PEN / PT_TOUCH) — the pen/touch injectors. The device
|
|
# create/destroy + POINTER_TYPE_INFO live under Controls in this metadata layout;
|
|
# InjectSyntheticPointerInput + POINTER_*_INFO under Input_Pointer.
|
|
"Win32_UI_Controls",
|
|
"Win32_UI_Input_Pointer",
|
|
"Win32_UI_WindowsAndMessaging",
|
|
] }
|
|
|
|
[lints]
|
|
workspace = true
|