Skip to content

refactor: move macos frozen capture policy behind adapter boundary #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yvette-carlisle merged 2 commits into from
Apr 15, 2026
Merged

refactor: move macos frozen capture policy behind adapter boundary #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517aeaa
{"schema":"maestro/commit/1","summary":"move macos frozen capture pol…
yvette-carlisle Apr 15, 2026
3dd508e
{"schema":"maestro/commit/1","summary":"tune adapter vstyle on macos …
yvette-carlisle Apr 15, 2026
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
226 changes: 2 additions & 224 deletions packages/rsnap-overlay/src/overlay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ mod cursor_context_runtime;
mod cursor_runtime;
mod frozen_arrow_runtime;
mod frozen_brush_runtime;
mod frozen_capture_backend_adapter;
mod frozen_export_runtime;
mod frozen_mosaic_runtime;
mod frozen_selection_runtime;
Expand Down Expand Up @@ -185,13 +186,9 @@ use self::trace_recording::{
#[cfg(target_os = "macos")]
use crate::deferred_text_recognition::DeferredTextRecognitionRequest;
#[cfg(target_os = "macos")]
use crate::live_frame_stream_macos::{
CursorSampleRequest, MacLiveFrameStream, STREAM_REGION_FRAME_MAX_AGE,
};
use crate::live_frame_stream_macos::{CursorSampleRequest, MacLiveFrameStream};
use crate::scroll_capture::{self, ScrollDirection, ScrollObserveOutcome, ScrollSession};
use crate::state::LiveCursorSample;
#[cfg(target_os = "macos")]
use crate::state::MonitorImageSnapshot;
use crate::worker::CapturedMonitorRegionResult;
use crate::{
state::{
Expand Down Expand Up @@ -1674,163 +1671,6 @@ impl OverlaySession {
}
}

#[cfg(target_os = "macos")]
fn snapshot_can_finish_frozen_capture(
&self,
window_target: Option<WindowFreezeCaptureTarget>,
) -> bool {
window_target.is_none()
|| self.config.window_capture_alpha_mode == WindowCaptureAlphaMode::Background
}

#[cfg(target_os = "macos")]
fn usable_frozen_capture_snapshot(
&self,
monitor: MonitorRect,
snapshot: Option<Arc<MonitorImageSnapshot>>,
) -> Option<(Arc<MonitorImageSnapshot>, u128)> {
let snapshot = snapshot.filter(|snapshot| snapshot.monitor == monitor)?;
let snapshot_age = snapshot.captured_at.elapsed();

if snapshot_age > STREAM_REGION_FRAME_MAX_AGE {
return None;
}

Some((snapshot, snapshot_age.as_millis()))
}

#[cfg(target_os = "macos")]
fn maybe_finish_frozen_capture_from_snapshot(
&mut self,
monitor: MonitorRect,
window_target: Option<WindowFreezeCaptureTarget>,
cursor: Option<GlobalPoint>,
snapshot: Option<Arc<MonitorImageSnapshot>>,
source: &'static str,
) -> bool {
if !self.snapshot_can_finish_frozen_capture(window_target) {
return false;
}

let Some((snapshot, snapshot_age_ms)) =
self.usable_frozen_capture_snapshot(monitor, snapshot)
else {
return false;
};
let snapshot_image = snapshot.image.as_ref().clone();
let export_image = snapshot_image.clone();
let restore_hidden_capture_windows = self.capture_windows_hidden;

self.commit_frozen_preview(monitor, snapshot_image, cursor);
self.note_frozen_transition_preview_committed(monitor, source, Some(snapshot_age_ms));
self.promote_frozen_capture_display_ready(monitor);
self.set_frozen_capture_export_ready(monitor);
self.state.commit_frozen_export_image(export_image);
self.note_frozen_transition_final_ready(
monitor,
source,
window_target.map(|target| target.window_id),
);

self.freeze_capture_send_full_count = 0;
self.frozen_window_image = None;
self.toolbar_state.needs_redraw = true;

if restore_hidden_capture_windows {
self.destroy_live_only_aux_windows();
self.restore_capture_windows_visibility();
} else {
self.capture_windows_hidden = false;
}

self.sync_frozen_toolbar_state();
self.request_redraw_for_monitor(monitor);
#[cfg(target_os = "macos")]
{
self.request_aux_window_creation_if_needed();
self.request_redraw_toolbar_window();
}

true
}

#[cfg(target_os = "macos")]
fn request_pending_frozen_capture_live_stream_refresh(&self, monitor: MonitorRect) {
let Some(stream) = self.live_sample_stream.as_ref() else {
return;
};
let after_frame_seq =
stream.latest_frame_frontier_for_monitor(monitor).map_or(0, |(frame_seq, _)| frame_seq);
let _ = stream.refresh_monitor_nonblocking_if_stale(monitor, after_frame_seq, true);
}

#[cfg(target_os = "macos")]
fn maybe_seed_frozen_capture_preview_from_snapshot(
&mut self,
monitor: MonitorRect,
cursor: Option<GlobalPoint>,
snapshot: Option<Arc<MonitorImageSnapshot>>,
source: &'static str,
) -> bool {
let Some((snapshot, snapshot_age_ms)) =
self.usable_frozen_capture_snapshot(monitor, snapshot)
else {
return false;
};
let snapshot_image = snapshot.image.as_ref().clone();

self.commit_frozen_preview(monitor, snapshot_image, cursor);
self.note_frozen_transition_preview_committed(monitor, source, Some(snapshot_age_ms));

self.toolbar_state.needs_redraw = true;

self.sync_frozen_toolbar_state();
self.request_redraw_for_monitor(monitor);
self.request_aux_window_creation_if_needed();
self.request_redraw_toolbar_window();

true
}

#[cfg(target_os = "macos")]
fn maybe_update_pending_frozen_capture_from_live_stream_snapshot(
&mut self,
monitor: MonitorRect,
) -> bool {
if !self.pending_freeze_capture_matches(monitor)
|| self.frozen_capture_export_ready()
|| self.frozen_capture_worker_inflight()
{
return false;
}

let window_target = self.pending_window_freeze_capture_for_monitor(monitor);
let snapshot = self
.live_sample_stream
.as_ref()
.and_then(|stream| stream.peek_latest_rgba_snapshot(monitor));

if self.snapshot_can_finish_frozen_capture(window_target) {
return self.maybe_finish_frozen_capture_from_snapshot(
monitor,
window_target,
self.state.cursor,
snapshot,
"live_stream_snapshot_followup",
);
}
if self.frozen_preview_visible() {
return false;
}

self.maybe_seed_frozen_capture_preview_from_snapshot(
monitor,
self.state.cursor,
snapshot,
"live_stream_snapshot_preview_followup",
)
}

fn seed_frozen_toolbar_default_position(
&mut self,
monitor: MonitorRect,
Expand Down Expand Up @@ -2052,68 +1892,6 @@ impl OverlaySession {
self.refresh_frozen_helper_windows_for_transition(monitor);
}

#[cfg(target_os = "macos")]
fn begin_frozen_capture_with_rect_macos(
&mut self,
monitor: MonitorRect,
window_target: Option<WindowFreezeCaptureTarget>,
cursor: Option<GlobalPoint>,
) -> bool {
if let Some(cursor) = cursor {
self.update_cursor_state(monitor, cursor);
}

self.state.live_bg_monitor = None;
self.state.live_bg_image = None;
self.capture_windows_hidden = false;

let snapshot = self
.live_sample_stream
.as_ref()
.and_then(|stream| stream.peek_latest_rgba_snapshot(monitor));

if self.maybe_finish_frozen_capture_from_snapshot(
monitor,
window_target,
cursor,
snapshot.clone(),
"live_stream_snapshot_at_freeze_begin",
) {
return true;
}

let seeded_preview = self.maybe_seed_frozen_capture_preview_from_snapshot(
monitor,
cursor,
snapshot.clone(),
"live_stream_snapshot_preview_at_freeze_begin",
);
let arm_worker = window_target.is_some()
&& self.config.window_capture_alpha_mode != WindowCaptureAlphaMode::Background;

self.set_frozen_capture_worker_state(if arm_worker {
FrozenCaptureWorkerState::Armed
} else {
FrozenCaptureWorkerState::Idle
});
self.request_pending_frozen_capture_live_stream_refresh(monitor);
self.note_frozen_transition_preview_deferred(
monitor,
if seeded_preview {
"waiting_for_export_authority"
} else {
"waiting_for_live_stream_snapshot"
},
None,
);

if arm_worker {
self.note_frozen_transition_authoritative_handoff_armed(monitor);
}

false
}

#[cfg(not(target_os = "macos"))]
fn begin_frozen_capture_with_rect_non_macos(
&mut self,
Expand Down
11 changes: 1 addition & 10 deletions packages/rsnap-overlay/src/overlay/aux_window_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,10 @@ impl OverlaySession {
self.mark_progress(OverlayEventLoopPhase::AboutToWait);
self.maybe_clear_loupe_activation_after_focus_loss();
self.maybe_timeout_pending_click_hit_test(now);

#[cfg(target_os = "macos")]
{
if let Some(monitor) =
self.frozen_capture_monitor().filter(|_| self.frozen_capture_export_pending())
{
let _ = self.maybe_update_pending_frozen_capture_from_live_stream_snapshot(monitor);
let _ = self.maybe_drive_pending_display_first_freeze_preview(now);
}

self.maybe_dispatch_armed_freeze_capture();
self.maybe_drive_macos_display_first_frozen_capture_backend(now);
}

self.maybe_request_keepalive_redraw();
self.maybe_keep_selection_flow_repaint();
self.maybe_keep_frozen_text_caret_repaint();
Expand Down
Loading
Loading