feat(desktop): spawn app where cursor is

apps/desktop/messages/en.json

@@ -34,6 +34,7 @@
 	"settings_general_hotkey": "Hotkey",
 	"settings_general_menu_bar_icon": "Menu Bar Icon",
 	"settings_general_hide_on_blur": "Hide On Blur",
+	"settings_general_show_on_cursor_position": "Show On Cursor Position",
 	"settings_general_extension_auto_upgrade": "Extension Auto Upgrade",
 	"settings_general_dev_extension_hmr": "Dev Extension HMR",
 	"settings_general_join_beta_updates": "Join Beta Updates",

apps/desktop/messages/pt.json

@@ -34,6 +34,7 @@
 	"settings_general_hotkey": "Tecla de Atalho",
 	"settings_general_menu_bar_icon": "Ícone na Barra de Menu",
 	"settings_general_hide_on_blur": "Ocultar ao Perder Foco",
+	"settings_general_show_on_cursor_position": "Mostrar na Posição do Cursor",
 	"settings_general_extension_auto_upgrade": "Atualização Automática de Extensões",
 	"settings_general_dev_extension_hmr": "HMR de Extensão de Desenvolvedor",
 	"settings_general_join_beta_updates": "Participar das Atualizações Beta",

apps/desktop/messages/ru.json

@@ -34,6 +34,7 @@
 	"settings_general_hotkey": "Сочетание клавиш",
 	"settings_general_menu_bar_icon": "Иконка в строке меню",
 	"settings_general_hide_on_blur": "Скрыть окно при потере фокуса",
+	"settings_general_show_on_cursor_position": "Показывать окно в позиции курсора",
 	"settings_general_extension_auto_upgrade": "Автообновление расширений",
 	"settings_general_dev_extension_hmr": "Горячая замена модуля (HMR) у dev-расширений",
 	"settings_general_join_beta_updates": "Получать бета-обновления",

apps/desktop/messages/vi.json

@@ -34,6 +34,7 @@
 	"settings_general_hotkey": "Phím tắt",
 	"settings_general_menu_bar_icon": "Biểu tượng thanh menu",
 	"settings_general_hide_on_blur": "Ẩn khi chuyển sang ứng dụng khác",
+	"settings_general_show_on_cursor_position": "Hiển thị ở vị trí con trỏ",
 	"settings_general_extension_auto_upgrade": "Tự động nâng cấp tiện ích mở rộng",
 	"settings_general_dev_extension_hmr": "HMR cho tiện ích mở rộng đang phát triển",
 	"settings_general_join_beta_updates": "Cài đặt cập nhật thử nghiệm (beta)",

apps/desktop/messages/zh.json

@@ -34,6 +34,7 @@
 	"settings_general_hotkey": "快捷键",
 	"settings_general_menu_bar_icon": "菜单栏图标",
 	"settings_general_hide_on_blur": "隐藏在后台",
+	"settings_general_show_on_cursor_position": "显示在鼠标位置",
 	"settings_general_extension_auto_upgrade": "自动更新插件",
 	"settings_general_dev_extension_hmr": "开发模式",
 	"settings_general_join_beta_updates": "加入 Beta 更新",

apps/desktop/src-tauri/src/lib.rs

@@ -210,6 +210,10 @@ pub fn run() {
                 .unwrap();
         })
         .setup(move |app| {
+            #[cfg(target_os = "macos")]
+            {
+                app.set_activation_policy(ActivationPolicy::Accessory);
+            }
             setup::window::setup_window(app.handle());
             setup::tray::create_tray(app.handle())?;
             setup::stronghold::setup_stronghold(app.handle())?;

apps/desktop/src-tauri/tauri.conf.json

@@ -22,7 +22,10 @@
 				"width": 800,
 				"visible": false,
 				"height": 600,
-				"decorations": true
+				"decorations": true,
+				"maximizable": false,
+				"resizable": false,
+				"visibleOnAllWorkspaces": true
 			},
 			{
 				"url": "/splashscreen",

apps/desktop/src/lib/components/standalone/general-settings.svelte

@@ -60,6 +60,10 @@
 		<span>{m.settings_general_hide_on_blur()}</span>
 		<Switch bind:checked={$appConfig.hideOnBlur} />
 	</li>
+	<li>
+		<span>{m.settings_general_show_on_cursor_position()}</span>
+		<Switch bind:checked={$appConfig.showOnCursorPosition} />
+	</li>
 	<li>
 		<span>{m.settings_general_extension_auto_upgrade()}</span>
 		<Switch bind:checked={$appConfig.extensionAutoUpgrade} />

apps/desktop/src/lib/stores/appConfig.ts

@@ -27,7 +27,8 @@ export const defaultAppConfig: AppConfig = {
 	extensionAutoUpgrade: true,
 	joinBetaProgram: false,
 	onBoarded: false,
-	developerMode: false
+	developerMode: false,
+	showOnCursorPosition: true
 }
 
 export const appConfigLoaded = writable(false)

apps/desktop/src/lib/utils/hotkey.ts

@@ -1,6 +1,8 @@
+import { appConfig } from "@/stores"
+import { showWindow } from "@kunkunapi/src/commands"
 import { getAllWindows } from "@tauri-apps/api/window"
 import { isRegistered, register, unregister } from "@tauri-apps/plugin-global-shortcut"
-import { debug, info, warn } from "@tauri-apps/plugin-log"
+import { info, warn } from "@tauri-apps/plugin-log"
 import { sendNotificationWithPermission } from "./notification"
 
 /**
@@ -39,7 +41,7 @@ export async function registerAppHotkey(hotkeyStr: string) {
 					mainWin.setFocus()
 				}
 			} else {
-				mainWin.show()
+				await showWindow(appConfig.get().showOnCursorPosition, "main")
 				mainWin.setFocus()
 			}
 		}

packages/api/src/commands/window.ts

@@ -11,3 +11,20 @@ export async function setTransparentTitlebar(windowLabel?: string): Promise<void
 		windowLabel
 	})
 }
+
+/**
+ * Given a window label, show it. It is a fancier version of bult-in
+ * wry's `show` function which respects current mouse position.
+ * If no window label is provided, the current window will be used.
+ * @param showOnCursorPosition
+ * @param windowLabel
+ */
+export async function showWindow(
+	showOnCursorPosition: boolean,
+	windowLabel?: string
+): Promise<void> {
+	await invoke<void>(generateJarvisPluginCommand("show_window"), {
+		showOnCursorPosition,
+		windowLabel
+	})
+}

packages/tauri-plugins/jarvis/Cargo.toml

@@ -56,6 +56,7 @@ grpc = { workspace = true }
 futures-util = "0.3.31"
 rayon = { workspace = true }
 local-ip-address = "0.6.3"
+mouse_position = "0.1.4"
 
 
 [target.'cfg(target_os = "macos")'.dependencies]

packages/tauri-plugins/jarvis/build.rs

@@ -126,6 +126,7 @@ const COMMANDS: &[&str] = &[
     /*                                   Window                                   */
     /* -------------------------------------------------------------------------- */
     "set_transparent_titlebar",
+    "show_window"
 ];
 
 fn main() {

packages/tauri-plugins/jarvis/permissions/all.toml

@@ -98,4 +98,5 @@ commands.allow = [
     "file_transfer_preview_bucket",
     # Windows
     "set_transparent_titlebar",
+    "show_window",
 ]

packages/tauri-plugins/jarvis/permissions/autogenerated/commands/show_window.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-show-window"
+description = "Enables the show_window command without any pre-configured scope."
+commands.allow = ["show_window"]
+
+[[permission]]
+identifier = "deny-show-window"
+description = "Denies the show_window command without any pre-configured scope."
+commands.deny = ["show_window"]

packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md

@@ -1740,6 +1740,32 @@ Denies the show_desktop command without any pre-configured scope.
 <tr>
 <td>
 
+`jarvis:allow-show-window`
+
+</td>
+<td>
+
+Enables the show_window command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`jarvis:deny-show-window`
+
+</td>
+<td>
+
+Denies the show_window command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `jarvis:allow-shutdown`
 
 </td>

packages/tauri-plugins/jarvis/permissions/schemas/schema.json

@@ -959,6 +959,16 @@
           "type": "string",
           "const": "deny-show-desktop"
         },
+        {
+          "description": "Enables the show_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-show-window"
+        },
+        {
+          "description": "Denies the show_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-show-window"
+        },
         {
           "description": "Enables the shutdown command without any pre-configured scope.",
           "type": "string",

packages/tauri-plugins/jarvis/src/commands/window.rs

@@ -1,5 +1,6 @@
-use crate::setup::window::WindowExt;
-use tauri::{Manager, Runtime};
+use crate::{setup::window::WindowExt, utils::window::get_current_monitor};
+use log::warn;
+use tauri::{LogicalPosition, Manager, Runtime};
 
 #[tauri::command]
 pub async fn set_transparent_titlebar<R: Runtime>(
@@ -17,3 +18,45 @@ pub async fn set_transparent_titlebar<R: Runtime>(
     }
     Ok(())
 }
+
+#[tauri::command]
+pub async fn show_window<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    window: tauri::Window<R>,
+    show_on_cursor_position: bool,
+    window_label: Option<String>,
+) -> Result<(), String> {
+    let win_label = window_label.unwrap_or(window.label().to_string());
+    let window = match app.get_webview_window(win_label.as_str()) {
+        Some(webview_win) => webview_win,
+        None => {
+            warn!("Window not found");
+            return Err("Window not found".to_string());
+        }
+    };
+    if show_on_cursor_position {
+        let screen = get_current_monitor(&window);
+        let dpi = screen.scale_factor();
+        let screen_position = screen.position().to_logical::<i32>(dpi);
+        let screen_size = screen.size().to_logical::<i32>(dpi);
+
+        let window_dpi = window.scale_factor().unwrap();
+        let window_size = window.outer_size().unwrap().to_logical::<i32>(window_dpi);
+
+        let final_pos = LogicalPosition {
+            x: screen_position.x + ((screen_size.width / 2) - (window_size.width / 2)),
+            y: screen_position.y + ((screen_size.height / 2) - (window_size.height / 2)),
+        };
+
+        if let Err(e) = window.set_position(final_pos) {
+            warn!("Failed to set window position: {}", e);
+        };
+    }
+    match window.show() {
+        Ok(_) => Ok(()),
+        Err(_) => {
+            warn!("Failed to show window");
+            Err("Failed to show window".to_string())
+        }
+    }
+}

packages/tauri-plugins/jarvis/src/lib.rs

@@ -180,6 +180,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             /*                                   Window                                   */
             /* -------------------------------------------------------------------------- */
             commands::window::set_transparent_titlebar,
+            commands::window::show_window,
         ])
         .setup(move |app, api| {
             utils::setup::setup_app_path(app);

packages/tauri-plugins/jarvis/src/utils/mod.rs

@@ -10,3 +10,4 @@ pub mod settings;
 pub mod setup;
 pub mod time;
 pub mod transfer_stats;
+pub mod window;

packages/tauri-plugins/jarvis/src/utils/settings.rs

@@ -23,6 +23,7 @@ pub struct AppSettings {
     pub dev_ext_load_url: bool,
     pub hide_on_blur: bool,
     pub trigger_hotkey: Option<Vec<String>>,
+    pub show_on_cursor_position: bool,
 }
 
 impl Default for AppSettings {
@@ -37,6 +38,7 @@ impl Default for AppSettings {
             dev_ext_load_url: false,
             hide_on_blur: true,
             trigger_hotkey: None,
+            show_on_cursor_position: false,
         }
     }
 }

packages/tauri-plugins/jarvis/src/utils/window.rs

@@ -0,0 +1,35 @@
+use log::{info, warn};
+use tauri::{Monitor, Runtime, WebviewWindow};
+
+pub fn get_current_monitor<R: Runtime>(window: &WebviewWindow<R>) -> Monitor {
+    use mouse_position::mouse_position::{Mouse, Position};
+
+    let mouse_position = match Mouse::get_mouse_position() {
+        Mouse::Position { x, y } => Position { x, y },
+        Mouse::Error => {
+            warn!("Mouse position not found, using primary monitor");
+            return window.primary_monitor().unwrap().unwrap();
+        }
+    };
+
+    info!("Mouse position: {} {}", mouse_position.x, mouse_position.y);
+
+    let monitors = window.available_monitors().unwrap();
+
+    for m in monitors {
+        let dpi = m.scale_factor();
+        let size = m.size().to_logical::<f64>(dpi);
+        let position = m.position().to_logical(dpi);
+
+        if mouse_position.x >= position.x
+            && mouse_position.x <= (position.x + size.width as i32)
+            && mouse_position.y >= position.y
+            && mouse_position.y <= (position.y + size.height as i32)
+        {
+            info!("Current monitor found: {:?}", m);
+            return m;
+        }
+    }
+    warn!("Current monitor not found, using primary monitor");
+    window.primary_monitor().unwrap().unwrap()
+}

packages/types/src/appConfig.ts

@@ -17,7 +17,8 @@ export const PersistedAppConfig = v.object({
 	extensionAutoUpgrade: v.boolean(),
 	joinBetaProgram: v.boolean(),
 	onBoarded: v.boolean(),
-	developerMode: v.boolean()
+	developerMode: v.boolean(),
+	showOnCursorPosition: v.optional(v.boolean(), true)
 })
 
 export type PersistedAppConfig = v.InferOutput<typeof PersistedAppConfig>