From a0bd2d8573a804664c7bffd42c77fd4b14d1152e Mon Sep 17 00:00:00 2001 From: Huakun Date: Sat, 22 Feb 2025 00:41:35 -0500 Subject: [PATCH] Feature: enable clipboard paste for windows and linux (#185) * feat(shell): add hidden window style to PowerShell script execution Modify PowerShell script execution to run with hidden window style in both TypeScript API and Rust plugin to prevent visible command windows * feat(desktop): implement cross-platform paste functionality in clipboard extension * feat(desktop): enhance hotkey functionality with registration and update methods * fix(desktop): remove unnecessary border from command root styling * feat(desktop): add cross-platform paste support for clipboard extension - Import Tauri OS plugin to detect platform - Implement platform-specific paste methods for macOS, Windows, and Linux - Add error handling for unsupported platforms - Center windows in Tauri configuration * feat(desktop): extend global key handler to support Linux control key for settings navigation --- apps/desktop/src-tauri/tauri.conf.json | 6 ++- apps/desktop/src/lib/utils/hotkey.ts | 38 +++++++++++++++++++ apps/desktop/src/lib/utils/key.ts | 5 ++- apps/desktop/src/routes/app/+page.svelte | 2 +- .../app/extension/clipboard/+page.svelte | 15 +------- packages/api/src/api/server/shell.ts | 2 +- .../tauri-plugins/jarvis/src/utils/script.rs | 2 + 7 files changed, 52 insertions(+), 18 deletions(-) diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index a617fcc..0fc2bc4 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -22,12 +22,14 @@ "width": 800, "visible": false, "height": 600, - "decorations": true + "decorations": true, + "center": true }, { "url": "/splashscreen", "visible": true, - "label": "splashscreen" + "label": "splashscreen", + "center": true } ] }, diff --git a/apps/desktop/src/lib/utils/hotkey.ts b/apps/desktop/src/lib/utils/hotkey.ts index 11a97ae..dcebd2f 100644 --- a/apps/desktop/src/lib/utils/hotkey.ts +++ b/apps/desktop/src/lib/utils/hotkey.ts @@ -1,7 +1,10 @@ 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 * as os from "@tauri-apps/plugin-os" +import * as userInput from "tauri-plugin-user-input-api" import { sendNotificationWithPermission } from "./notification" +import { sleep } from "./time" /** * Tauri global shortcut doesn't accept 'Meta' Key. This function maps browser detected keys to Tauri-accepted keys. @@ -14,6 +17,11 @@ export function mapKeyToTauriKey(key: string): string { return key } +/** + * Registers a global hotkey for the application. If the hotkey is already registered, it will be unregistered first. + * When the hotkey is pressed, it toggles the visibility and focus of the main window. + * @param hotkeyStr - The hotkey string to register. + */ export async function registerAppHotkey(hotkeyStr: string) { if (await isRegistered(hotkeyStr)) { warn(`Hotkey (${hotkeyStr}) already registered`) @@ -46,6 +54,11 @@ export async function registerAppHotkey(hotkeyStr: string) { }) } +/** + * Updates the application's global hotkey. If an old hotkey is provided, it will be unregistered first. + * @param newHotkey - The new hotkey combination to register. + * @param oldHotkey - The old hotkey combination to unregister, if any. + */ export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[] | null) { if (oldHotkey) { const hotkeyStr = oldHotkey.map(mapKeyToTauriKey).join("+") @@ -56,3 +69,28 @@ export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[] const hotkeyStr = newHotkey.map(mapKeyToTauriKey).join("+") return registerAppHotkey(hotkeyStr) } + +/** + * Simulates a key combination press and release. + * @param keys - The array of keys to press and release. + */ +export async function applyKeyComb(keys: userInput.Key[]) { + await Promise.all(keys.map((key) => userInput.key("KeyPress", key))) + await sleep(50) + await Promise.all(keys.map((key) => userInput.key("KeyRelease", key))) +} + +/** + * Simulates a paste operation based on the operating system. + * On macOS, it uses Command+V. On Windows and Linux, it uses Shift+Insert. + */ +export function paste() { + const _platform = os.platform() + if (_platform === "macos") { + return applyKeyComb(["MetaLeft", "KeyV"]) + } else if (_platform === "windows" || _platform === "linux") { + return applyKeyComb(["ShiftLeft", "Insert"]) + } else { + console.error("Unsupported platform: " + _platform) + } +} diff --git a/apps/desktop/src/lib/utils/key.ts b/apps/desktop/src/lib/utils/key.ts index 423fbc3..3c27522 100644 --- a/apps/desktop/src/lib/utils/key.ts +++ b/apps/desktop/src/lib/utils/key.ts @@ -76,7 +76,10 @@ export function goHomeOrCloseOnEscapeWithInput(e: KeyboardEvent) { export async function globalKeyDownHandler(e: KeyboardEvent) { keys.keydown(e.key) const _platform = platform() - if ((_platform === "macos" && e.metaKey) || (_platform === "windows" && e.ctrlKey)) { + if ( + (_platform === "macos" && e.metaKey) || + ((_platform === "windows" || _platform === "linux") && e.ctrlKey) + ) { if (e.key === ",") { e.preventDefault() goto(i18n.resolveRoute("/app/settings")) diff --git a/apps/desktop/src/routes/app/+page.svelte b/apps/desktop/src/routes/app/+page.svelte index bd9718c..93da636 100644 --- a/apps/desktop/src/routes/app/+page.svelte +++ b/apps/desktop/src/routes/app/+page.svelte @@ -95,7 +95,7 @@ }} /> + import { paste } from "@/utils/hotkey" import { goBack, goHome } from "@/utils/route" import { listenToNewClipboardItem } from "@/utils/tauri-events" + import { sleep } from "@/utils/time" import Icon from "@iconify/svelte" import { ClipboardContentType, db } from "@kksh/api/commands" import { SearchModeEnum, SQLSortOrderEnum, type ExtData } from "@kksh/api/models" @@ -15,7 +17,6 @@ import { onDestroy, onMount, type Snippet } from "svelte" import { toast } from "svelte-sonner" import clipboard from "tauri-plugin-clipboard-api" - import * as userInput from "tauri-plugin-user-input-api" import ContentPreview from "./content-preview.svelte" const _platform = platform() @@ -161,18 +162,6 @@ } } - const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) - - async function paste() { - await userInput.key("KeyPress", "MetaLeft") - await sleep(20) - await userInput.key("KeyPress", "KeyV") - await sleep(100) - await userInput.key("KeyRelease", "MetaLeft") - await sleep(20) - await userInput.key("KeyRelease", "KeyV") - } - function writeToClipboard(data: ExtData) { if (!data.data) { toast.warning("No data found") diff --git a/packages/api/src/api/server/shell.ts b/packages/api/src/api/server/shell.ts index d994f2d..676c3e1 100644 --- a/packages/api/src/api/server/shell.ts +++ b/packages/api/src/api/server/shell.ts @@ -168,7 +168,7 @@ export function constructShellApi( ShellPermissionMap.executePowershellScript, objectPermissions, "powershell", - ["-Command", script] + ["-WindowStyle", "Hidden", "-Command", script] ) return executePowershellScript(script) } diff --git a/packages/tauri-plugins/jarvis/src/utils/script.rs b/packages/tauri-plugins/jarvis/src/utils/script.rs index 03dfac0..1ea6ff9 100644 --- a/packages/tauri-plugins/jarvis/src/utils/script.rs +++ b/packages/tauri-plugins/jarvis/src/utils/script.rs @@ -17,6 +17,8 @@ pub fn run_apple_script(script: &str) -> anyhow::Result { pub fn run_powershell(script: &str) -> anyhow::Result { let output = Command::new("powershell") + .arg("-WindowStyle") + .arg("Hidden") .arg("-Command") .arg(script) .output()