enricobuehlerandClaude Fable 5
944c03dd32
The client half of the host's new `os=` advert, shared once in pf-client-core: `sanitize_os` (mDNS is unauthenticated input — lowercase `[a-z0-9._-]` tokens, capped) and `os_icon_tokens`, the most-specific-first walk with the brand aliases (`macos`→apple, `steamos`→steam) every platform resolves through. `DiscoveredHost` carries the chain, `KnownHost` persists it (`serde(default)`, elided when empty — older stores load unchanged and older clients read back exactly what they wrote), `upsert` moves it only when carried, and `learn_os` mirrors `learn_mac` — no-op, no disk write when unchanged — so the mark survives the host going to sleep. GTK shells: the card's status row leads with a recolorable symbolic glyph. That needed real embedded assets — the shells had none — so `data/` gains the ten `pf-os-*-symbolic` SVGs compiled into a gresource (new build.rs, glib-build-tools) and registered on the icon theme at startup; the Adwaita theme then tints them like every other status glyph. WinUI shell: reactor renders raster-from-URI only, so the embedded mid-gray PNGs (legible on both themes) materialize once into %LOCALAPPDATA%\punktfunk\os-icons\ — the library's poster-art pattern — and the tile's status row leads with a 16px image. The couch UI plumbs `HostRow.os` (live advert preferred, else the store) for a Skia glyph that is a declared follow-up; `--list-hosts` / `hosts --json` emit the stored chain so the Decky plugin can read it. A host that advertises no `os` renders everywhere exactly as it did before the field existed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
37 lines
1.7 KiB
Rust
37 lines
1.7 KiB
Rust
//! Embed the Windows version-info + icon resources into `punktfunk-session.exe`. The
|
|
//! icon drives Explorer, and `pf-presenter`'s `win32::stamp_window_icon` loads it by
|
|
//! ordinal 1 onto the SDL window's title bar / taskbar / Alt-Tab (SDL's own window-class
|
|
//! icon is the generic default).
|
|
|
|
fn main() {
|
|
// Linux: compile the shell's embedded assets (`data/` — the host-card OS-mark symbolic
|
|
// icons) into a gresource bundle, registered at startup via
|
|
// `gio::resources_register_include!`. Host-gated like the Windows leg below.
|
|
#[cfg(target_os = "linux")]
|
|
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("linux") {
|
|
glib_build_tools::compile_resources(
|
|
&["data"],
|
|
"data/resources.gresource.xml",
|
|
"punktfunk-client.gresource",
|
|
);
|
|
}
|
|
|
|
// cfg(windows) is the HOST (skips Linux/macOS builds of this cross-platform binary);
|
|
// CARGO_CFG_WINDOWS is the TARGET (x64 and cross-compiled ARM64 both pass).
|
|
#[cfg(windows)]
|
|
if std::env::var_os("CARGO_CFG_WINDOWS").is_some() {
|
|
let icon = "../../packaging/windows/branding/punktfunk.ico";
|
|
println!("cargo:rerun-if-changed={icon}");
|
|
winresource::WindowsResource::new()
|
|
// Ordinal 1 — pf-presenter's win32.rs loads it by this id for WM_SETICON.
|
|
.set_icon_with_id(icon, "1")
|
|
// The version-info strings Windows surfaces for the bare exe — UAC prompts,
|
|
// Task Manager and Properties→Details all show FileDescription (without one
|
|
// the exe appears as its raw filename).
|
|
.set("FileDescription", "Punktfunk Session")
|
|
.set("ProductName", "Punktfunk")
|
|
.compile()
|
|
.expect("embed windows icon resource");
|
|
}
|
|
}
|