fbeac16c96
audit / cargo-audit (push) Successful in 1m13s
apple / swift (push) Successful in 1m14s
release / apple (push) Successful in 8m2s
android / android (push) Successful in 10m42s
ci / web (push) Successful in 48s
ci / docs-site (push) Successful in 58s
ci / rust (push) Successful in 12m23s
apple / screenshots (push) Successful in 5m27s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 1m43s
windows-msix / package (x64, C:\Users\Public\ffmpeg, x86_64-pc-windows-msvc, C:\t) (push) Successful in 1m21s
ci / bench (push) Successful in 4m49s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 1m10s
deb / build-publish (push) Successful in 4m0s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 6s
decky / build-publish (push) Successful in 26s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 5s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 4s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 5s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 4s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 1m20s
windows-host / package (push) Failing after 23s
flatpak / build-publish (push) Successful in 4m39s
rpm / build-publish (bazzite, punktfunk-fedora-rpm) (push) Successful in 9m42s
rpm / build-publish (fedora-44, punktfunk-fedora44-rpm) (push) Successful in 9m16s
docker / deploy-docs (push) Successful in 34s
Bump windows-reactor + windows to a4f7b2cb (from b4129fcc) for the new PointerEntered/PointerExited events; migration is mechanical renames only (SymbolGlyph->Symbol, placeholder->placeholder_text, on_changed-> on_text_changed/on_toggled, on_menu_item_clicked->on_item_clicked, on_ready->on_mounted). New runtime model: reactor lost its build.rs, so the client build.rs stages the WinAppSDK bootstrap via windows-reactor-setup::as_framework_dependent() and main calls windows_reactor::bootstrap() (missing either = 0x80040154 at launch); staged filenames unchanged, so pack-msix and the MSIX manifest are untouched. - Host tiles: WinUI pointer-over fill (ControlFillSecondary) via the new pointer enter/exit events, hover id in root state (backend-wired handlers bypass the reconciler flush, like the flyout clicks). - Settings: stock NavigationView sidebar (Windows-Settings pattern) with Display/Video/Input/Audio/About panes, built-in back arrow, wide content column, and a per-section content slide-up tween. The section card is KEYED by section: an in-place diff across sections re-sets a reused ComboBox's items (clearing WinUI's selection) but skips selected_index when the values compare equal, rendering a blank selection - the key forces a remount. Card titles/descriptions dropped; per-control guidance moved to hover tooltips (ToolTipService). - New "Show the stats overlay (HUD)" setting (show_hud, default on), honored mid-stream via the 400 ms HUD re-render. - Add-host modal: entrance fade + slide-up tween (scrim fades with it). - Self-initiated disconnect (Ctrl+Alt+Shift+D -> Ended(None)) returns to the host list silently instead of raising the error banner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
404 lines
16 KiB
Rust
404 lines
16 KiB
Rust
//! The settings screen. Every control writes straight back to the persisted [`Settings`]
|
|
//! (there is no Apply step), via the small [`setting_combo`]/[`setting_toggle`] builders.
|
|
|
|
use super::style::*;
|
|
use super::{AppCtx, Screen};
|
|
use crate::trust::Settings;
|
|
use punktfunk_core::config::GamepadPref;
|
|
use std::sync::Arc;
|
|
use windows_reactor::*;
|
|
|
|
/// `(0, 0)` = the native size of the display the window is on, resolved at connect.
|
|
const RESOLUTIONS: &[(u32, u32)] = &[
|
|
(0, 0),
|
|
(1280, 720),
|
|
(1920, 1080),
|
|
(2560, 1440),
|
|
(3840, 2160),
|
|
];
|
|
/// `0` = the display's native refresh, resolved at connect.
|
|
const REFRESH: &[u32] = &[0, 30, 60, 90, 120, 144, 165, 240];
|
|
/// Decode backend presets: `(stored value, display label)`.
|
|
const DECODERS: &[(&str, &str)] = &[
|
|
("auto", "Automatic (GPU, fall back to CPU)"),
|
|
("hardware", "Hardware (GPU / D3D11VA)"),
|
|
("software", "Software (CPU)"),
|
|
];
|
|
/// Audio channel presets: `(channel count, display label)`. The host clamps to what it can
|
|
/// capture; the resolved count drives the decoder + WASAPI render layout.
|
|
const AUDIO_CHANNELS: &[(u8, &str)] = &[(2, "Stereo"), (6, "5.1 Surround"), (8, "7.1 Surround")];
|
|
/// Preferred-codec presets: `(stored value, display label)`. Soft — the host falls back if it
|
|
/// can't encode the chosen codec.
|
|
const CODECS: &[(&str, &str)] = &[
|
|
("auto", "Automatic"),
|
|
("hevc", "HEVC (H.265)"),
|
|
("h264", "H.264 (AVC)"),
|
|
("av1", "AV1"),
|
|
];
|
|
/// Virtual-pad presets: `(stored value, display label)` — the pad the HOST creates. Same set the
|
|
/// GTK client offers; "Automatic" resolves from the physical controller at connect.
|
|
const GAMEPADS: &[(&str, &str)] = &[
|
|
("auto", "Automatic (match the controller)"),
|
|
("xbox360", "Xbox 360"),
|
|
("dualsense", "DualSense"),
|
|
("xboxone", "Xbox One"),
|
|
("dualshock4", "DualShock 4"),
|
|
];
|
|
/// Host compositor presets: `(stored value, display label)`. Advisory — the host falls back to
|
|
/// auto-detect when the choice is unavailable. Only meaningful against a Linux host.
|
|
const COMPOSITORS: &[(&str, &str)] = &[
|
|
("auto", "Automatic"),
|
|
("kwin", "KWin"),
|
|
("wlroots", "wlroots (Sway/Hyprland)"),
|
|
("mutter", "Mutter (GNOME)"),
|
|
("gamescope", "gamescope"),
|
|
];
|
|
|
|
/// A `ComboBox` bound to one settings field: shows `names`, starts at `current`, and runs
|
|
/// `apply(settings, picked_index)` under the settings lock, then saves. The index handed to
|
|
/// `apply` is already clamped to `names`.
|
|
fn setting_combo(
|
|
ctx: &Arc<AppCtx>,
|
|
header: &str,
|
|
names: Vec<String>,
|
|
current: usize,
|
|
apply: impl Fn(&mut Settings, usize) + 'static,
|
|
) -> ComboBox {
|
|
let ctx = ctx.clone();
|
|
let max = names.len().saturating_sub(1);
|
|
ComboBox::new(names)
|
|
.header(header)
|
|
.selected_index(current as i32)
|
|
.on_selection_changed(move |i: i32| {
|
|
let mut s = ctx.settings.lock().unwrap();
|
|
apply(&mut s, (i.max(0) as usize).min(max));
|
|
s.save();
|
|
})
|
|
}
|
|
|
|
/// The labels of a `(value, label)` preset table, plus the index of `is_current`'s match.
|
|
fn presets<V>(table: &[(V, &str)], is_current: impl Fn(&V) -> bool) -> (Vec<String>, usize) {
|
|
let names = table.iter().map(|(_, l)| l.to_string()).collect();
|
|
let current = table.iter().position(|(v, _)| is_current(v)).unwrap_or(0);
|
|
(names, current)
|
|
}
|
|
|
|
/// A `ToggleSwitch` bound to one boolean settings field.
|
|
fn setting_toggle(
|
|
ctx: &Arc<AppCtx>,
|
|
header: &str,
|
|
on: bool,
|
|
apply: impl Fn(&mut Settings, bool) + 'static,
|
|
) -> ToggleSwitch {
|
|
let ctx = ctx.clone();
|
|
ToggleSwitch::new(on)
|
|
.header(header)
|
|
.on_content("On")
|
|
.off_content("Off")
|
|
.on_toggled(move |v: bool| {
|
|
let mut s = ctx.settings.lock().unwrap();
|
|
apply(&mut s, v);
|
|
s.save();
|
|
})
|
|
}
|
|
|
|
/// A settings card: just the controls. No heading (the section title is the NavigationView
|
|
/// header) and no description paragraph — per-control guidance is a `.tooltip(...)` on the
|
|
/// control itself (a paragraph in the card reads as the first control's label).
|
|
fn settings_card(controls: Vec<Element>) -> Element {
|
|
card(vstack(controls).spacing(10.0)).into()
|
|
}
|
|
|
|
/// The settings screen: a stock WinUI `NavigationView` (the Windows-Settings sidebar pattern) —
|
|
/// one pane item per section, the section's card as the content, the built-in back arrow
|
|
/// returning to the host list. `section`/`set_section` are the selected pane tag, held in ROOT
|
|
/// state (this page stays hook-free): `on_selection_changed` is wired in the reactor backend, so
|
|
/// only a root `AsyncSetState` reliably re-renders the new section in. `progress` is the
|
|
/// section-switch entrance tween (0 → 1), mapped onto the content column's opacity + offset.
|
|
pub(crate) fn settings_page(
|
|
ctx: &Arc<AppCtx>,
|
|
set_screen: &AsyncSetState<Screen>,
|
|
section: &str,
|
|
set_section: &AsyncSetState<String>,
|
|
progress: f64,
|
|
) -> Element {
|
|
let s = ctx.settings.lock().unwrap().clone();
|
|
|
|
// --- Display ---------------------------------------------------------------------------
|
|
let (res_names, res_i) = {
|
|
let names: Vec<String> = RESOLUTIONS
|
|
.iter()
|
|
.map(|&(w, h)| {
|
|
if w == 0 {
|
|
"Native display".into()
|
|
} else {
|
|
format!("{w} \u{00D7} {h}")
|
|
}
|
|
})
|
|
.collect();
|
|
let i = RESOLUTIONS
|
|
.iter()
|
|
.position(|&(w, h)| w == s.width && h == s.height)
|
|
.unwrap_or(0);
|
|
(names, i)
|
|
};
|
|
let res_combo = setting_combo(ctx, "Resolution", res_names, res_i, |s, i| {
|
|
(s.width, s.height) = RESOLUTIONS[i];
|
|
})
|
|
.tooltip(
|
|
"The host creates a virtual display at exactly this size. \u{201C}Native display\u{201D} \
|
|
resolves to the monitor this window is on at connect.",
|
|
);
|
|
let (hz_names, hz_i) = {
|
|
let names: Vec<String> = REFRESH
|
|
.iter()
|
|
.map(|&r| {
|
|
if r == 0 {
|
|
"Native".into()
|
|
} else {
|
|
format!("{r} Hz")
|
|
}
|
|
})
|
|
.collect();
|
|
let i = REFRESH.iter().position(|&r| r == s.refresh_hz).unwrap_or(0);
|
|
(names, i)
|
|
};
|
|
let hz_combo = setting_combo(ctx, "Refresh rate", hz_names, hz_i, |s, i| {
|
|
s.refresh_hz = REFRESH[i];
|
|
})
|
|
.tooltip("\u{201C}Native\u{201D} resolves to this display's refresh rate at connect.");
|
|
let (comp_names, comp_i) = presets(COMPOSITORS, |v| *v == s.compositor);
|
|
let comp_combo = setting_combo(ctx, "Host compositor", comp_names, comp_i, |s, i| {
|
|
s.compositor = COMPOSITORS[i].0.to_string();
|
|
})
|
|
.tooltip(
|
|
"Linux hosts only, and advisory \u{2014} the host falls back to auto-detect when the \
|
|
choice is unavailable.",
|
|
);
|
|
|
|
// --- Video -----------------------------------------------------------------------------
|
|
let (dec_names, dec_i) = presets(DECODERS, |v| *v == s.decoder);
|
|
let decoder_combo = setting_combo(ctx, "Video decoder", dec_names, dec_i, |s, i| {
|
|
s.decoder = DECODERS[i].0.to_string();
|
|
})
|
|
.tooltip(
|
|
"Hardware decode (D3D11VA) is far lighter than software \u{2014} keep it on Automatic \
|
|
unless debugging.",
|
|
);
|
|
// GPU picker, only on a multi-GPU box (hybrid laptop, eGPU): which adapter decodes + presents.
|
|
// Stored as the adapter description; empty = automatic (the window's monitor's adapter).
|
|
let gpus = crate::gpu::adapter_names();
|
|
let gpu_combo = (gpus.len() > 1).then(|| {
|
|
let mut names = vec!["Automatic (the display's GPU)".to_string()];
|
|
names.extend(gpus.iter().cloned());
|
|
let current = gpus
|
|
.iter()
|
|
.position(|n| *n == s.adapter)
|
|
.map_or(0, |i| i + 1);
|
|
let gpus = gpus.clone();
|
|
setting_combo(ctx, "GPU", names, current, move |s, i| {
|
|
s.adapter = if i == 0 {
|
|
String::new()
|
|
} else {
|
|
gpus[i - 1].clone()
|
|
};
|
|
})
|
|
.tooltip(
|
|
"Which adapter decodes and presents the stream. Applies to the next stream; \
|
|
Automatic uses the GPU driving this window's display.",
|
|
)
|
|
});
|
|
let (codec_names, codec_i) = presets(CODECS, |v| *v == s.codec);
|
|
let codec_combo = setting_combo(ctx, "Video codec", codec_names, codec_i, |s, i| {
|
|
s.codec = CODECS[i].0.to_string();
|
|
})
|
|
.tooltip(
|
|
"A soft preference \u{2014} the host falls back to the best codec both sides support.",
|
|
);
|
|
// Free-form Mb/s (0 = host default) instead of presets, so a speed-test recommendation
|
|
// round-trips exactly.
|
|
let bitrate_box = {
|
|
let ctx = ctx.clone();
|
|
NumberBox::new(f64::from(s.bitrate_kbps) / 1000.0)
|
|
.header("Bitrate (Mb/s, 0 = automatic)")
|
|
.range(0.0, 3000.0)
|
|
.on_value_changed(move |v: f64| {
|
|
let mut s = ctx.settings.lock().unwrap();
|
|
s.bitrate_kbps = (v.clamp(0.0, 3000.0) * 1000.0) as u32;
|
|
s.save();
|
|
})
|
|
.tooltip(
|
|
"0 lets the host decide. Run a per-host speed test from the host list for a \
|
|
recommendation.",
|
|
)
|
|
};
|
|
let hdr_toggle = setting_toggle(ctx, "HDR (10-bit, BT.2020 PQ)", s.hdr_enabled, |s, on| {
|
|
s.hdr_enabled = on
|
|
})
|
|
.tooltip(
|
|
"Advertise 10-bit HDR10 so the host upgrades HDR content. Needs a display in HDR mode; \
|
|
SDR content is unaffected.",
|
|
);
|
|
|
|
// --- Input -----------------------------------------------------------------------------
|
|
// Which physical controller forwards as pad 0: automatic = the most recently connected;
|
|
// pinning survives until the app exits (Swift/GTK parity).
|
|
let pads = ctx.gamepad.pads();
|
|
let (fwd_names, fwd_i) = {
|
|
let mut names = vec!["Automatic (most recent)".to_string()];
|
|
names.extend(pads.iter().map(|p| {
|
|
let kind = p.kind_label();
|
|
if kind.is_empty() {
|
|
p.name.clone()
|
|
} else {
|
|
format!("{} \u{00B7} {kind}", p.name)
|
|
}
|
|
}));
|
|
let i = ctx
|
|
.gamepad
|
|
.pinned()
|
|
.and_then(|id| pads.iter().position(|p| p.id == id))
|
|
.map_or(0, |i| i + 1);
|
|
(names, i)
|
|
};
|
|
let forward_combo = {
|
|
let svc = ctx.gamepad.clone();
|
|
let ids: Vec<u32> = pads.iter().map(|p| p.id).collect();
|
|
ComboBox::new(fwd_names)
|
|
.header("Forwarded controller")
|
|
.selected_index(fwd_i as i32)
|
|
.on_selection_changed(move |i: i32| {
|
|
let sel = i.max(0) as usize;
|
|
svc.set_pinned(if sel == 0 {
|
|
None
|
|
} else {
|
|
ids.get(sel - 1).copied()
|
|
});
|
|
})
|
|
.tooltip(
|
|
"Exactly one controller is forwarded to the host; \u{201C}Automatic\u{201D} \
|
|
picks the most recently connected.",
|
|
)
|
|
};
|
|
let (pad_names, pad_i) = presets(GAMEPADS, |v| {
|
|
GamepadPref::from_name(v) == GamepadPref::from_name(&s.gamepad)
|
|
});
|
|
let pad_combo = setting_combo(ctx, "Gamepad type", pad_names, pad_i, |s, i| {
|
|
s.gamepad = GAMEPADS[i].0.to_string();
|
|
})
|
|
.tooltip(
|
|
"The virtual pad the host creates. \u{201C}Automatic\u{201D} matches your physical \
|
|
controller.",
|
|
);
|
|
let shortcuts_toggle = setting_toggle(
|
|
ctx,
|
|
"Capture system shortcuts (Alt+Tab, Win, \u{2026})",
|
|
s.inhibit_shortcuts,
|
|
|s, on| s.inhibit_shortcuts = on,
|
|
)
|
|
.tooltip("Off: Alt+Tab, Win & co. act on this machine while the stream input is captured.");
|
|
|
|
// --- Audio -----------------------------------------------------------------------------
|
|
let (ac_names, ac_i) = presets(AUDIO_CHANNELS, |v| *v == s.audio_channels);
|
|
let channels_combo = setting_combo(ctx, "Audio channels", ac_names, ac_i, |s, i| {
|
|
s.audio_channels = AUDIO_CHANNELS[i].0;
|
|
})
|
|
.tooltip("The host downmixes if its output has fewer channels.");
|
|
let mic_toggle = setting_toggle(
|
|
ctx,
|
|
"Stream microphone to the host",
|
|
s.mic_enabled,
|
|
|s, on| s.mic_enabled = on,
|
|
)
|
|
.tooltip("Sends the default microphone to the host's virtual mic source.");
|
|
|
|
let hud_toggle = setting_toggle(ctx, "Show the stats overlay (HUD)", s.show_hud, |s, on| {
|
|
s.show_hud = on
|
|
})
|
|
.tooltip("The in-stream overlay: mode, codec, fps, bitrate, latency, decode path.");
|
|
|
|
let licenses_button = {
|
|
let ss = set_screen.clone();
|
|
button("Third-party licenses").on_click(move || ss.call(Screen::Licenses))
|
|
};
|
|
|
|
// The selected section's content — per-control guidance lives on hover tooltips, so the
|
|
// card is just the controls.
|
|
let (title, card): (&str, Element) = match section {
|
|
"video" => (
|
|
"Video",
|
|
settings_card({
|
|
let mut controls: Vec<Element> = vec![decoder_combo.into()];
|
|
if let Some(c) = gpu_combo {
|
|
controls.push(c.into());
|
|
}
|
|
controls.extend([
|
|
codec_combo.into(),
|
|
bitrate_box.into(),
|
|
hdr_toggle.into(),
|
|
hud_toggle.into(),
|
|
]);
|
|
controls
|
|
}),
|
|
),
|
|
"input" => (
|
|
"Input",
|
|
settings_card(vec![
|
|
forward_combo.into(),
|
|
pad_combo.into(),
|
|
shortcuts_toggle.into(),
|
|
]),
|
|
),
|
|
"audio" => (
|
|
"Audio",
|
|
settings_card(vec![channels_combo.into(), mic_toggle.into()]),
|
|
),
|
|
"about" => ("About", settings_card(vec![licenses_button.into()])),
|
|
_ => (
|
|
"Display",
|
|
settings_card(vec![res_combo.into(), hz_combo.into(), comp_combo.into()]),
|
|
),
|
|
};
|
|
|
|
// The stock WinUI sidebar (Windows-Settings pattern): pane on the left, the section's card
|
|
// as content, the NavigationView's own back arrow returning to the host list. Auto display
|
|
// mode collapses the pane on a narrow window, exactly like Windows Settings.
|
|
let items = vec![
|
|
NavViewItem::new("Display")
|
|
.tag("display")
|
|
.icon(Symbol::FullScreen),
|
|
NavViewItem::new("Video").tag("video").icon(Symbol::Video),
|
|
NavViewItem::new("Input")
|
|
.tag("input")
|
|
.icon(Symbol::Keyboard),
|
|
NavViewItem::new("Audio").tag("audio").icon(Symbol::Volume),
|
|
NavViewItem::new("About").tag("about").icon(Symbol::Help),
|
|
];
|
|
// The card is KEYED by section so switching panes REMOUNTS it instead of diffing one
|
|
// section's controls into another's: an in-place diff re-sets a reused ComboBox's items
|
|
// (which clears WinUI's selection) but skips `selected_index` whenever the two sections'
|
|
// values compare equal — the combo then renders with no selected option. A fresh mount
|
|
// applies every prop, so the selection always displays.
|
|
//
|
|
// The content column (not the NavigationView — the sidebar must stay put) carries the
|
|
// section-switch entrance: fade + slide-up from the root-driven tween.
|
|
let content = page_wide(vec![card.with_key(section)])
|
|
.opacity(progress)
|
|
.margin(edges(0.0, (1.0 - progress) * 22.0, 0.0, 0.0));
|
|
NavigationView::new(items, content)
|
|
.pane_title("Settings")
|
|
.header(title)
|
|
.selected_tag(section)
|
|
.on_selection_changed({
|
|
let ss = set_section.clone();
|
|
move |tag: String| ss.call(tag)
|
|
})
|
|
.settings_visible(false)
|
|
.back_enabled(true)
|
|
.on_back_requested({
|
|
let ss = set_screen.clone();
|
|
move || ss.call(Screen::Hosts)
|
|
})
|
|
.into()
|
|
}
|