Merge branch 'feature/startup' into dev

JunaYa · Nov 24, 2024 · c95d3d8 · c95d3d8
2 parents 06e8c83 + 4d7a6f2
commit c95d3d8
Show file tree

Hide file tree

Showing 26 changed files with 297 additions and 94 deletions.
diff --git a/index.html → main.html b/index.html → main.html
@@ -9,6 +9,6 @@
 
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="./src/pages/main/main.ts"></script>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "@tauri-apps/plugin-dialog": "~2.0.1",
     "@tauri-apps/plugin-fs": "~2.0.2",
     "@tauri-apps/plugin-global-shortcut": "~2",
+    "@tauri-apps/plugin-os": "~2",
     "@tauri-apps/plugin-shell": "^2.0.1",
     "@tauri-apps/plugin-store": "~2",
     "@vueuse/core": "^11.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -40,6 +40,9 @@ tauri-plugin-store = "2"
 xcap = "0.0.14"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing = "0.1.40"
+tauri-plugin-os = "2"
+core-foundation = "0.10.0"
+libc = "0.2.164"
 
 [features]
 default = ["custom-protocol"]

diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
@@ -2,7 +2,7 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "default",
   "description": "Capability for the main window",
-  "windows": ["main", "setting", "preview"],
+  "windows": ["main", "setting", "preview", "startup"],
   "permissions": [
     "core:default",
     "shell:allow-open",

diff --git a/src-tauri/capabilities/os.json b/src-tauri/capabilities/os.json
@@ -0,0 +1,16 @@
+{
+  "identifier": "os-capability",
+  "description": "Allow access os to window",
+  "platforms": [
+    "macOS",
+    "windows",
+    "linux"
+  ],
+  "windows": [
+    "startup"
+  ],
+  "permissions": [
+    "os:default",
+    "os:allow-version"
+  ]
+}
diff --git a/src-tauri/src/cmd/screenshot.rs b/src-tauri/src/cmd/screenshot.rs
@@ -17,3 +17,13 @@ pub async fn capture_window(app_handle: tauri::AppHandle, path: String) -> Resul
     let filename = platform::capture_window(&app_handle, path).await?;
     Ok(filename)
 }
+
+#[tauri::command]
+pub fn open_screen_capture_preferences() {
+    platform::open_screen_capture_preferences();
+}
+
+#[tauri::command]
+pub fn check_accessibility_permissions() -> bool {
+    platform::check_accessibility_permissions()
+}
diff --git a/src-tauri/src/constants.rs b/src-tauri/src/constants.rs
@@ -3,3 +3,5 @@ pub const MAIN_WINDOW: &str = "main";
 pub const PREVIEW_WINDOW: &str = "preview";
 
 pub const SETTING_WINDOW: &str = "setting";
+
+pub const STARTUP_WINDOW: &str = "startup";
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -9,15 +9,17 @@ mod global_shortcut;
 mod menu;
 mod platform;
 mod window;
-mod xcap_utils;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_os::init())
         .setup(|app| {
             #[cfg(desktop)]
             configure_autostart(app);
 
+            window::show_startup_window(&app.handle());
+
             #[cfg(desktop)]
             let _ = global_shortcut::register_global_shortcut(app);
 
@@ -57,6 +59,8 @@ pub fn run() {
             cmd::hide_main_window,
             cmd::show_setting_window,
             cmd::hide_setting_window,
+            cmd::open_screen_capture_preferences,
+            cmd::check_accessibility_permissions,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

diff --git a/src-tauri/src/platform/mac/screenshot.rs b/src-tauri/src/platform/mac/screenshot.rs
@@ -5,6 +5,8 @@ use std::{
 };
 
 use chrono::Local;
+use core_foundation::{base::TCFType, boolean::CFBoolean, string::CFString};
+
 use tracing::info;
 
 use crate::common::get_images_dir;
@@ -89,3 +91,31 @@ pub async fn capture_window(app_handle: &tauri::AppHandle, path: String) -> Resu
 
     Ok(filename)
 }
+
+pub fn open_screen_capture_preferences() {
+    Command::new("open")
+        .arg("x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture")
+        .spawn()
+        .expect("failed to open system preferences");
+}
+
+pub fn check_accessibility_permissions() -> bool {
+    let options = {
+        let key = CFString::new("AXTrustedCheckOptionPrompt");
+        let value = CFBoolean::false_value();
+        let pairs = &[(key, value)];
+        core_foundation::dictionary::CFDictionary::from_CFType_pairs(pairs)
+    };
+
+    let trusted = unsafe {
+        let accessibility = CFString::new("AXIsProcessTrustedWithOptions");
+        let func: extern "C" fn(*const core_foundation::dictionary::CFDictionary) -> bool =
+            std::mem::transmute(libc::dlsym(
+                libc::RTLD_DEFAULT,
+                accessibility.to_string().as_ptr() as *const _,
+            ));
+        func(options.as_concrete_TypeRef() as *const _)
+    };
+
+    trusted
+}
diff --git a/src-tauri/src/platform/mac/window.rs b/src-tauri/src/platform/mac/window.rs
@@ -32,3 +32,14 @@ pub fn show_setting_window(window: &WebviewWindow) {
 pub fn hide_setting_window(window: &WebviewWindow) {
     let _ = window.minimize();
 }
+
+pub fn show_startup_window(window: &WebviewWindow) {
+    let _ = window.show();
+    window::center_position(window);
+    let _ = window.set_focus();
+    let _ = window.unminimize();
+}
+
+pub fn hide_startup_window(window: &WebviewWindow) {
+    let _ = window.minimize();
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,5 @@ pub const MAIN_WINDOW: &str = "main";
		pub const PREVIEW_WINDOW: &str = "preview";

		pub const SETTING_WINDOW: &str = "setting";

		pub const STARTUP_WINDOW: &str = "startup";