new recording picker hotkeys

Brendonovich · Brendonovich · commit b54ddcc55fad · 2025-09-18T10:35:52.000+08:00
diff --git a/apps/desktop/src-tauri/capabilities/default.json b/apps/desktop/src-tauri/capabilities/default.json
@@ -41,6 +41,7 @@
 		"core:window:allow-set-theme",
 		"core:window:allow-set-progress-bar",
 		"core:window:allow-set-effects",
+		"core:window:allow-set-ignore-cursor-events",
 		"core:webview:default",
 		"core:webview:allow-create-webview-window",
 		"core:app:allow-version",
diff --git a/apps/desktop/src-tauri/src/hotkeys.rs b/apps/desktop/src-tauri/src/hotkeys.rs
@@ -1,4 +1,7 @@
-use crate::{RequestStartRecording, recording, windows::ShowCapWindow};
+use crate::{
+    RequestOpenRecordingPicker, RequestStartRecording, recording,
+    recording_settings::RecordingTargetMode, windows::ShowCapWindow,
+};
 use global_hotkey::HotKeyState;
 use serde::{Deserialize, Serialize};
 use specta::Type;
@@ -49,6 +52,13 @@ pub enum HotkeyAction {
     StopRecording,
     RestartRecording,
     // TakeScreenshot,
+    OpenRecordingPicker,
+    OpenRecordingPickerDisplay,
+    OpenRecordingPickerWindow,
+    OpenRecordingPickerArea,
+    // Needed for deserialization of deprecated actions
+    #[serde(other)]
+    Other,
 }
 
 #[derive(Serialize, Deserialize, Type, Default)]
@@ -139,6 +149,32 @@ async fn handle_hotkey(app: AppHandle, action: HotkeyAction) -> Result<(), Strin
         HotkeyAction::RestartRecording => {
             recording::restart_recording(app.clone(), app.state()).await
         }
+        HotkeyAction::OpenRecordingPicker => {
+            let _ = RequestOpenRecordingPicker { target_mode: None }.emit(&app);
+            Ok(())
+        }
+        HotkeyAction::OpenRecordingPickerDisplay => {
+            let _ = RequestOpenRecordingPicker {
+                target_mode: Some(RecordingTargetMode::Display),
+            }
+            .emit(&app);
+            Ok(())
+        }
+        HotkeyAction::OpenRecordingPickerWindow => {
+            let _ = RequestOpenRecordingPicker {
+                target_mode: Some(RecordingTargetMode::Window),
+            }
+            .emit(&app);
+            Ok(())
+        }
+        HotkeyAction::OpenRecordingPickerArea => {
+            let _ = RequestOpenRecordingPicker {
+                target_mode: Some(RecordingTargetMode::Area),
+            }
+            .emit(&app);
+            Ok(())
+        }
+        HotkeyAction::Other => Ok(()),
     }
 }
 
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
@@ -85,7 +85,10 @@ use upload::{S3UploadMeta, create_or_get_video, upload_image, upload_video};
 use web_api::ManagerExt as WebManagerExt;
 use windows::{CapWindowId, EditorWindowIds, ShowCapWindow, set_window_transparent};
 
-use crate::{camera::CameraPreviewManager, recording_settings::RecordingSettingsStore};
+use crate::{
+    camera::CameraPreviewManager,
+    recording_settings::{RecordingSettingsStore, RecordingTargetMode},
+};
 use crate::{recording::start_recording, upload::build_video_meta};
 
 #[allow(clippy::large_enum_variant)]
@@ -307,6 +310,11 @@ pub struct RequestStartRecording {
 #[derive(Deserialize, specta::Type, Serialize, tauri_specta::Event, Debug, Clone)]
 pub struct RequestNewScreenshot;
 
+#[derive(Deserialize, specta::Type, Serialize, tauri_specta::Event, Debug, Clone)]
+pub struct RequestOpenRecordingPicker {
+    pub target_mode: Option<RecordingTargetMode>,
+}
+
 #[derive(Deserialize, specta::Type, Serialize, tauri_specta::Event, Debug, Clone)]
 pub struct RequestOpenSettings {
     page: String,
@@ -1902,6 +1910,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             RecordingStarted,
             RecordingStopped,
             RequestStartRecording,
+            RequestOpenRecordingPicker,
             RequestNewScreenshot,
             RequestOpenSettings,
             NewNotification,
@@ -1912,7 +1921,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             recording::RecordingEvent,
             RecordingDeleted,
             target_select_overlay::TargetUnderCursor,
-            hotkeys::OnEscapePress
+            hotkeys::OnEscapePress,
         ])
         .error_handling(tauri_specta::ErrorHandlingMode::Throw)
         .typ::<ProjectConfiguration>()
@@ -1973,7 +1982,13 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                 .map(PathBuf::from)
             else {
                 let app = app.clone();
-                tokio::spawn(async move { ShowCapWindow::Main.show(&app).await });
+                tokio::spawn(async move {
+                    ShowCapWindow::Main {
+                        init_target_mode: None,
+                    }
+                    .show(&app)
+                    .await
+                });
                 return;
             };
 
@@ -2112,7 +2127,11 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                     } else {
                         println!("Permissions granted, showing main window");
 
-                        let _ = ShowCapWindow::Main.show(&app).await;
+                        let _ = ShowCapWindow::Main {
+                            init_target_mode: None,
+                        }
+                        .show(&app)
+                        .await;
                     }
                 }
             });
@@ -2121,7 +2140,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
 
             tray::create_tray(&app).unwrap();
 
-            RequestStartRecording::listen_any_spawn(&app, |event, app| async move {
+            RequestStartRecording::listen_any_spawn(&app, async |event, app| {
                 if CapWindowId::Main.get(&app).is_some() {
                     return;
                 };
@@ -2150,13 +2169,15 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                 .await;
             });
 
-            RequestNewScreenshot::listen_any_spawn(&app, |_, app| async move {
-                if let Err(e) = take_screenshot(app.clone(), app.state()).await {
-                    eprintln!("Failed to take screenshot: {e}");
+            RequestOpenRecordingPicker::listen_any_spawn(&app, async |event, app| {
+                let _ = ShowCapWindow::Main {
+                    init_target_mode: event.target_mode,
                 }
+                .show(&app)
+                .await;
             });
 
-            RequestOpenSettings::listen_any_spawn(&app, |payload, app| async move {
+            RequestOpenSettings::listen_any_spawn(&app, async |payload, app| {
                 let _ = ShowCapWindow::Settings {
                     page: Some(payload.page),
                 }
@@ -2181,6 +2202,15 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                         match window_id {
                             CapWindowId::Main => {
                                 let app = app.clone();
+
+                                for (id, window) in app.webview_windows() {
+                                    if let Ok(CapWindowId::TargetSelectOverlay { .. }) =
+                                        CapWindowId::from_str(&id)
+                                    {
+                                        let _ = window.close();
+                                    }
+                                }
+
                                 tokio::spawn(async move {
                                     let state = app.state::<ArcLock<App>>();
                                     let app_state = &mut *state.write().await;
@@ -2306,7 +2336,11 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                 } else {
                     let handle = _handle.clone();
                     tokio::spawn(async move {
-                        let _ = ShowCapWindow::Main.show(&handle).await;
+                        let _ = ShowCapWindow::Main {
+                            init_target_mode: None,
+                        }
+                        .show(&handle)
+                        .await;
                     });
                 }
             }
diff --git a/apps/desktop/src-tauri/src/recording.rs b/apps/desktop/src-tauri/src/recording.rs
@@ -634,7 +634,11 @@ pub async fn delete_recording(app: AppHandle, state: MutableState<'_, App>) -> R
         match settings.post_deletion_behaviour {
             PostDeletionBehaviour::DoNothing => {}
             PostDeletionBehaviour::ReopenRecordingWindow => {
-                let _ = ShowCapWindow::Main.show(&app).await;
+                let _ = ShowCapWindow::Main {
+                    init_target_mode: None,
+                }
+                .show(&app)
+                .await;
             }
         }
     }
diff --git a/apps/desktop/src-tauri/src/recording_settings.rs b/apps/desktop/src-tauri/src/recording_settings.rs
@@ -3,7 +3,8 @@ use serde_json::json;
 use tauri::{AppHandle, Wry};
 use tauri_plugin_store::StoreExt;
 
-#[derive(serde::Serialize, serde::Deserialize, specta::Type, Debug, Clone)]
+#[derive(serde::Serialize, serde::Deserialize, specta::Type, Debug, Clone, Copy)]
+#[serde(rename_all = "camelCase")]
 pub enum RecordingTargetMode {
     Display,
     Window,
diff --git a/apps/desktop/src-tauri/src/tray.rs b/apps/desktop/src-tauri/src/tray.rs
@@ -102,7 +102,11 @@ pub fn create_tray(app: &AppHandle) -> tauri::Result<()> {
                 Ok(TrayItem::OpenCap) => {
                     let app = app.clone();
                     tokio::spawn(async move {
-                        let _ = ShowCapWindow::Main.show(&app).await;
+                        let _ = ShowCapWindow::Main {
+                            init_target_mode: None,
+                        }
+                        .show(&app)
+                        .await;
                     });
                 }
                 Ok(TrayItem::TakeScreenshot) => {
diff --git a/apps/desktop/src-tauri/src/windows.rs b/apps/desktop/src-tauri/src/windows.rs
@@ -23,6 +23,7 @@ use crate::{
     App, ArcLock, fake_window,
     general_settings::{AppTheme, GeneralSettingsStore},
     permissions,
+    recording_settings::RecordingTargetMode,
     target_select_overlay::WindowFocusManager,
 };
 
@@ -177,15 +178,29 @@ impl CapWindowId {
 #[derive(Clone, Type, Deserialize)]
 pub enum ShowCapWindow {
     Setup,
-    Main,
-    Settings { page: Option<String> },
-    Editor { project_path: PathBuf },
+    Main {
+        init_target_mode: Option<RecordingTargetMode>,
+    },
+    Settings {
+        page: Option<String>,
+    },
+    Editor {
+        project_path: PathBuf,
+    },
     RecordingsOverlay,
-    WindowCaptureOccluder { screen_id: DisplayId },
-    TargetSelectOverlay { display_id: DisplayId },
-    CaptureArea { screen_id: DisplayId },
+    WindowCaptureOccluder {
+        screen_id: DisplayId,
+    },
+    TargetSelectOverlay {
+        display_id: DisplayId,
+    },
+    CaptureArea {
+        screen_id: DisplayId,
+    },
     Camera,
-    InProgressRecording { countdown: Option<u32> },
+    InProgressRecording {
+        countdown: Option<u32>,
+    },
     Upgrade,
     ModeSelect,
 }
@@ -223,35 +238,43 @@ impl ShowCapWindow {
                 .maximizable(false)
                 .shadow(true)
                 .build()?,
-            Self::Main => {
-                if permissions::do_permissions_check(false).necessary_granted() {
-                    let new_recording_flow = GeneralSettingsStore::get(app)
-                        .ok()
-                        .flatten()
-                        .map(|s| s.enable_new_recording_flow)
-                        .unwrap_or_default();
-
-                    let window = self
-                        .window_builder(app, if new_recording_flow { "/new-main" } else { "/" })
-                        .resizable(false)
-                        .maximized(false)
-                        .maximizable(false)
-                        .minimizable(false)
-                        .always_on_top(true)
-                        .visible_on_all_workspaces(true)
-                        .content_protected(true)
-                        .center()
-                        .build()?;
+            Self::Main { init_target_mode } => {
+                if !permissions::do_permissions_check(false).necessary_granted() {
+                    return Box::pin(Self::Setup.show(app)).await;
+                }
 
-                    if new_recording_flow {
-                        #[cfg(target_os = "macos")]
-                        crate::platform::set_window_level(window.as_ref().window(), 50);
-                    }
+                let new_recording_flow = GeneralSettingsStore::get(app)
+                    .ok()
+                    .flatten()
+                    .map(|s| s.enable_new_recording_flow)
+                    .unwrap_or_default();
 
-                    window
-                } else {
-                    Box::pin(Self::Setup.show(app)).await?
+                let window = self
+                    .window_builder(app, if new_recording_flow { "/new-main" } else { "/" })
+                    .resizable(false)
+                    .maximized(false)
+                    .maximizable(false)
+                    .minimizable(false)
+                    .always_on_top(true)
+                    .visible_on_all_workspaces(true)
+                    .content_protected(true)
+                    .center()
+                    .initialization_script(format!(
+                        "
+                        window.__CAP__ = window.__CAP__ ?? {{}};
+                        window.__CAP__.initialTargetMode = {}
+                    ",
+                        serde_json::to_string(init_target_mode)
+                            .expect("Failed to serialize initial target mode")
+                    ))
+                    .build()?;
+
+                if new_recording_flow {
+                    #[cfg(target_os = "macos")]
+                    crate::platform::set_window_level(window.as_ref().window(), 50);
                 }
+
+                window
             }
             Self::TargetSelectOverlay { display_id } => {
                 let Some(display) = scap_targets::Display::from_id(display_id) else {
@@ -271,7 +294,8 @@ impl ShowCapWindow {
                     .always_on_top(true)
                     .visible_on_all_workspaces(true)
                     .skip_taskbar(true)
-                    .transparent(true);
+                    .transparent(true)
+                    .visible(false);
 
                 #[cfg(target_os = "macos")]
                 {
@@ -700,7 +724,7 @@ impl ShowCapWindow {
     pub fn id(&self, app: &AppHandle) -> CapWindowId {
         match self {
             ShowCapWindow::Setup => CapWindowId::Setup,
-            ShowCapWindow::Main => CapWindowId::Main,
+            ShowCapWindow::Main { .. } => CapWindowId::Main,
             ShowCapWindow::Settings { .. } => CapWindowId::Settings,
             ShowCapWindow::Editor { project_path } => {
                 let state = app.state::<EditorWindowIds>();
diff --git a/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx b/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx
@@ -120,7 +120,7 @@ function Page() {
 
 	onMount(async () => {
 		// We don't want the target select overlay on launch
-		setOptions({ targetMode: null });
+		setOptions({ targetMode: window.__CAP__.initialTargetMode });
 
 		// Enforce window size with multiple safeguards
 		const currentWindow = getCurrentWindow();
diff --git a/apps/desktop/src/routes/(window-chrome)/settings/hotkeys.tsx b/apps/desktop/src/routes/(window-chrome)/settings/hotkeys.tsx
diff --git a/apps/desktop/src/utils/queries.ts b/apps/desktop/src/utils/queries.ts
diff --git a/apps/desktop/src/utils/tauri.ts b/apps/desktop/src/utils/tauri.ts

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,11 @@ pub async fn delete_recording(app: AppHandle, state: MutableState<'_, App>) -> R`
`634`	`634`	`match settings.post_deletion_behaviour {`
`635`	`635`	`PostDeletionBehaviour::DoNothing => {}`
`636`	`636`	`PostDeletionBehaviour::ReopenRecordingWindow => {`
`637`		`- let _ = ShowCapWindow::Main.show(&app).await;`
	`637`	`+ let _ = ShowCapWindow::Main {`
	`638`	`+ init_target_mode: None,`
	`639`	`+ }`
	`640`	`+ .show(&app)`
	`641`	`+ .await;`
`638`	`642`	`}`
`639`	`643`	`}`
`640`	`644`	`}`