Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions apps/rsnap/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use std::sync::{
Arc,
atomic::{AtomicBool, AtomicU64, Ordering},
};
#[cfg(target_os = "macos")]
use std::time::Instant;

use color_eyre::eyre::Result;
use global_hotkey::{GlobalHotKeyEvent, GlobalHotKeyManager, hotkey::HotKey};
Expand Down Expand Up @@ -69,6 +71,8 @@ struct App {
#[cfg(target_os = "macos")]
menubar_quit_menu_id: Option<MenuId>,
overlay_session: Option<OverlaySession>,
#[cfg(target_os = "macos")]
prewarmed_overlay_session: Option<OverlaySession>,
settings_window: Option<SettingsWindow>,
settings_window_capture_window_id: Option<u32>,
settings: AppSettings,
Expand All @@ -87,6 +91,10 @@ struct App {
#[cfg(target_os = "macos")]
overlay_session_generation: u64,
#[cfg(target_os = "macos")]
overlay_session_prewarm_requested: bool,
#[cfg(target_os = "macos")]
overlay_session_prewarm_retry_not_before: Option<Instant>,
#[cfg(target_os = "macos")]
startup_permissions_checked: bool,
}
impl App {
Expand Down Expand Up @@ -124,6 +132,8 @@ impl App {
#[cfg(target_os = "macos")]
menubar_quit_menu_id: None,
overlay_session: None,
#[cfg(target_os = "macos")]
prewarmed_overlay_session: None,
settings_window: None,
settings_window_capture_window_id: None,
settings,
Expand All @@ -142,6 +152,10 @@ impl App {
#[cfg(target_os = "macos")]
overlay_session_generation: 0,
#[cfg(target_os = "macos")]
overlay_session_prewarm_requested: true,
#[cfg(target_os = "macos")]
overlay_session_prewarm_retry_not_before: None,
#[cfg(target_os = "macos")]
startup_permissions_checked: false,
}
}
Expand Down
103 changes: 94 additions & 9 deletions apps/rsnap/src/app/capture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ use rsnap_overlay::{HudAnchor, OverlayConfig, OverlayControl, OverlayExit, Overl

#[cfg(target_os = "macos")]
const SCROLL_INPUT_OBSERVER_READY_TIMEOUT: Duration = Duration::from_millis(250);
#[cfg(target_os = "macos")]
const OVERLAY_SESSION_PREWARM_RETRY_BACKOFF: Duration = Duration::from_secs(1);

impl App {
fn self_capture_exception_window_ids(&self) -> Vec<u32> {
Expand Down Expand Up @@ -87,11 +89,14 @@ impl App {

pub(super) fn apply_overlay_settings(&mut self) {
let config = self.overlay_config();
let Some(session) = self.overlay_session.as_mut() else {
return;
};

session.set_config(config);
if let Some(session) = self.overlay_session.as_mut() {
session.set_config(config.clone());
}
#[cfg(target_os = "macos")]
if let Some(session) = self.prewarmed_overlay_session.as_mut() {
session.set_config(config);
}
}

pub(super) fn start_capture_session(
Expand All @@ -115,15 +120,22 @@ impl App {
else {
return;
};
let (overlay_session_build_ms, mut overlay_session) = {
let (overlay_session_source, overlay_session_build_ms, mut overlay_session) = {
let overlay_session_build_started_at = Instant::now();
let overlay_session = OverlaySession::with_config(self.overlay_config());

(overlay_session_build_started_at.elapsed().as_millis(), overlay_session)
let (overlay_session_source, overlay_session) =
self.take_overlay_session_for_capture_start();

(
overlay_session_source,
overlay_session_build_started_at.elapsed().as_millis(),
overlay_session,
)
};

#[cfg(target_os = "macos")]
{
self.overlay_session_prewarm_requested = false;
self.overlay_session_prewarm_retry_not_before = None;
self.overlay_session_generation = self.overlay_session_generation.wrapping_add(1);

self.pending_deferred_ocr_generation
Expand Down Expand Up @@ -153,6 +165,7 @@ impl App {
op = "capture.start_phase_timing",
requested_by = %requested_by,
result = "started",
overlay_session_source,
hotkey = %self.capture_key_label(),
overlay_session_build_ms,
hook_wiring_ms,
Expand Down Expand Up @@ -187,14 +200,82 @@ impl App {
error = %err,
requested_by = %requested_by,
result = "error",
overlay_session_source,
overlay_session_build_ms,
hook_wiring_ms,
overlay_start_ms,
total_ms = capture_start_started_at.elapsed().as_millis(),
screen_recording_preflight_ms,
scroll_input_reset_ms,
"Failed to start overlay session."
)
);

#[cfg(target_os = "macos")]
{
self.overlay_session_prewarm_requested = true;
}
},
}
}

#[cfg(target_os = "macos")]
fn take_overlay_session_for_capture_start(&mut self) -> (&'static str, OverlaySession) {
if let Some(overlay_session) = self.prewarmed_overlay_session.take() {
("prewarmed", overlay_session)
} else {
("fresh", OverlaySession::with_config(self.overlay_config()))
}
}

#[cfg(not(target_os = "macos"))]
fn take_overlay_session_for_capture_start(&mut self) -> (&'static str, OverlaySession) {
("fresh", OverlaySession::with_config(self.overlay_config()))
}

#[cfg(target_os = "macos")]
pub(super) fn maybe_prewarm_overlay_session(&mut self, event_loop: &ActiveEventLoop) {
if !self.overlay_session_prewarm_requested
|| self.overlay_session.is_some()
|| self.prewarmed_overlay_session.is_some()
{
return;
}
if self
.overlay_session_prewarm_retry_not_before
.is_some_and(|not_before| Instant::now() < not_before)
{
return;
}

let prewarm_started_at = Instant::now();
let mut overlay_session = OverlaySession::with_config(self.overlay_config());

match overlay_session.prewarm(event_loop) {
Ok(()) => {
self.prewarmed_overlay_session = Some(overlay_session);
self.overlay_session_prewarm_requested = false;
self.overlay_session_prewarm_retry_not_before = None;

tracing::info!(
op = "capture.prewarm_phase_timing",
result = "prewarmed",
total_ms = prewarm_started_at.elapsed().as_millis(),
"Capture startup resources prewarmed."
);
},
Err(err) => {
self.overlay_session_prewarm_requested = true;
self.overlay_session_prewarm_retry_not_before =
Some(Instant::now() + OVERLAY_SESSION_PREWARM_RETRY_BACKOFF);

tracing::warn!(
op = "capture.prewarm_phase_timing",
error = %err,
result = "error",
retry_backoff_ms = OVERLAY_SESSION_PREWARM_RETRY_BACKOFF.as_millis(),
total_ms = prewarm_started_at.elapsed().as_millis(),
"Failed to prewarm capture startup resources."
);
},
}
}
Expand Down Expand Up @@ -340,6 +421,10 @@ impl App {

#[cfg(target_os = "macos")]
{
self.prewarmed_overlay_session = None;
self.overlay_session_prewarm_requested = true;
self.overlay_session_prewarm_retry_not_before = None;

self.scroll_input_shared_state.set_enabled(false);
self.scroll_input_shared_state.set_event_waker(None);
self.scroll_input_shared_state.clear();
Expand Down
5 changes: 5 additions & 0 deletions apps/rsnap/src/app/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ impl ApplicationHandler<UserEvent> for App {
self.install_tray(event_loop);
#[cfg(target_os = "macos")]
self.maybe_present_startup_permissions(event_loop);
#[cfg(target_os = "macos")]
self.maybe_prewarm_overlay_session(event_loop);
}

fn user_event(&mut self, event_loop: &ActiveEventLoop, event: UserEvent) {
Expand Down Expand Up @@ -219,6 +221,9 @@ impl ApplicationHandler<UserEvent> for App {

self.handle_overlay_control(control);
}

#[cfg(target_os = "macos")]
self.maybe_prewarm_overlay_session(event_loop);
}
}

Expand Down
Loading
Loading