forked from unom/punktfunk
enricobuehlerandClaude Fable 5
38b9f310e2
Ship the Android client's 3-tier stats-overlay semantics in every other client (design/stats-unification.md vocabulary): Off → Compact (one line: fps · e2e ms · Mb/s + loss flag) → Normal (mode + e2e p50/p95 + loss counters) → Detailed (decoder path, HDR tag, per-stage latency equation). Apple: new StatsVerbosity in PunktfunkKit persisted under punktfunk.statsVerbosity (migrates the legacy hudEnabled bool: explicit off → Off, else Normal). The existing three-finger tap (TouchMouse, trackpad/pointer modes only — touch passthrough untouched) now cycles the tiers instead of toggling, matching Android; ⌃⌥⇧S (menu + captured-state monitor) cycles the same ladder. Tiered StreamHUDView (compact glass pill / headline HUD / full equation HUD); the iOS corner disconnect also shows in Compact (the pill carries no button). Tier pickers on iOS, macOS, tvOS and the gamepad settings UI. Session stack (Linux + Windows + Deck share punktfunk-session): shared pf_client_core::trust::StatsVerbosity; Settings grows stats_verbosity with a show_stats fallback, and writes keep the legacy bool in sync so pre-tier binaries reading the same JSON agree on off vs on. Ctrl+Alt+Shift+S cycles the tier and re-renders the OSD immediately from the last stats window; the stdout stats: line always carries the full Detailed text so the shell status card and scripts keep a stable shape; --stats bumps Off → Normal without demoting a richer tier. Tier pickers in the GTK dialog, the WinUI settings page and the console-UI settings row; shortcut copy updated (GTK shortcuts window, Windows help, session README). The Windows legacy builtin path keeps its bool HUD. Tests: tier migration/round-trip in trust.rs, tiered stats_text output in pf-presenter. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
69 lines
3.1 KiB
Swift
69 lines
3.1 KiB
Swift
// The app's "Stream" menu (macOS menu bar + iPad hardware-keyboard shortcuts). These live at
|
|
// the Scene level so they keep working when the HUD overlay is hidden. The shortcuts are the
|
|
// CROSS-CLIENT set every punktfunk client reserves — Ctrl+Alt+Shift+Q (release the captured
|
|
// mouse) / +D (disconnect) / +S (stats) — and the menu is their discoverable surface on macOS
|
|
// (the Linux client has its GTK Shortcuts window, Windows its start-of-stream banner). While
|
|
// input is CAPTURED these key equivalents never reach the menu (the stream view swallows
|
|
// keys); InputCapture's monitor detects the same combos there and performs the same actions —
|
|
// the menu covers the released state and discoverability. The stats item cycles the shared
|
|
// `statsVerbosity` tier (off → compact → normal → detailed → off); ContentView reads the same
|
|
// @AppStorage and reacts.
|
|
//
|
|
// tvOS has no menu bar / hardware-keyboard command surface (disconnect there is the Siri
|
|
// Remote's Menu button, handled by ContentView's `.onExitCommand`), so this whole file is
|
|
// non-tvOS only.
|
|
|
|
#if !os(tvOS)
|
|
import PunktfunkKit
|
|
import SwiftUI
|
|
|
|
/// The live session's menu-reachable actions, published by ContentView via
|
|
/// `.focusedSceneValue` so the Scene-level commands can drive it.
|
|
struct SessionFocus {
|
|
var isStreaming: Bool
|
|
var disconnect: () -> Void
|
|
}
|
|
|
|
private struct SessionFocusKey: FocusedValueKey {
|
|
typealias Value = SessionFocus
|
|
}
|
|
|
|
extension FocusedValues {
|
|
var sessionFocus: SessionFocus? {
|
|
get { self[SessionFocusKey.self] }
|
|
set { self[SessionFocusKey.self] = newValue }
|
|
}
|
|
}
|
|
|
|
struct StreamCommands: Commands {
|
|
@FocusedValue(\.sessionFocus) private var session
|
|
// The raw string so @AppStorage observes the shared key; the absent-key default runs the
|
|
// legacy-hudEnabled migration (same pattern as ContentView/SettingsView).
|
|
@AppStorage(DefaultsKey.statsVerbosity) private var statsVerbosityRaw
|
|
= StatsVerbosity.current.rawValue
|
|
|
|
var body: some Commands {
|
|
CommandMenu("Stream") {
|
|
Button("Cycle Statistics") {
|
|
let current = StatsVerbosity(rawValue: statsVerbosityRaw) ?? .normal
|
|
statsVerbosityRaw = current.next().rawValue
|
|
}
|
|
.keyboardShortcut("s", modifiers: [.control, .option, .shift])
|
|
// Reaches the key window's stream view via NotificationCenter — capture is view
|
|
// state the Scene can't touch directly. (Captured, the combo is handled by
|
|
// InputCapture's monitor before menus see it; this item is the released-state
|
|
// path and the shortcut's menu-bar documentation.)
|
|
Button("Release Mouse") {
|
|
NotificationCenter.default.post(name: .punktfunkReleaseCapture, object: nil)
|
|
}
|
|
.keyboardShortcut("q", modifiers: [.control, .option, .shift])
|
|
.disabled(session?.isStreaming != true)
|
|
Divider()
|
|
Button("Disconnect") { session?.disconnect() }
|
|
.keyboardShortcut("d", modifiers: [.control, .option, .shift])
|
|
.disabled(session?.isStreaming != true)
|
|
}
|
|
}
|
|
}
|
|
#endif
|