feat: custom hotkey with global shortcut

app.vue

@@ -11,12 +11,14 @@ import { onMounted } from 'vue'
 
 onMounted(async () => {
   await listen('change_keybind', async () => {
+    console.log("change_keybind");
     await navigateTo('/keybind')
     await app.show();
     await window.getCurrentWindow().show();
   })
 
   await listen('main_route', async () => {
+    console.log("main_route");
     await navigateTo('/')
   })
 })

pages/keybind.vue

@@ -1,32 +1,45 @@
 <template>
   <div class="bg">
     <div class="back">
-      <img @click="router.push('/')" src="../public/back_arrow.svg">
+      <img @click="router.push('/')" src="../public/back_arrow.svg" />
       <p>Back</p>
     </div>
     <div class="bottom-bar">
       <div class="left">
-        <img alt="" class="logo" src="../public/logo.png" width="18px">
+        <img alt="" class="logo" src="../public/logo.png" width="18px" />
         <p>Qopy</p>
       </div>
       <div class="right">
         <div @click="saveKeybind" class="actions">
           <p>Save</p>
           <div>
-            <img alt="" src="../public/ctrl.svg" v-if="os === 'windows' || os === 'linux'">
-            <img alt="" src="../public/cmd.svg" v-if="os === 'macos'">
-            <img alt="" src="../public/enter.svg">
+            <img alt="" src="../public/cmd.svg" v-if="os === 'macos'" />
+            <img alt="" src="../public/ctrl.svg" v-if="os === 'linux' || os === 'windows'" />
+            <img alt="" src="../public/enter.svg" />
           </div>
         </div>
       </div>
     </div>
     <div class="keybind-container">
       <h2 class="title">Record a new Hotkey</h2>
-      <div @blur="onBlur" @focus="onFocus" @keydown="onKeyDown" @keyup="onKeyUp" class="keybind-input"
-        ref="keybindInput" tabindex="0">
-        <span class="key" v-if="currentKeybind.length === 0">Click here</span>
+      <div
+        @blur="onBlur"
+        @focus="onFocus"
+        @keydown="onKeyDown"
+        class="keybind-input"
+        ref="keybindInput"
+        tabindex="0"
+      >
+        <span class="key" v-if="keybind.length === 0">Click here</span>
         <template v-else>
-          <span :key="index" class="key" v-for="(key, index) in currentKeybind">{{ keyToDisplay(key) }}</span>
+          <span
+            :key="index"
+            class="key"
+            :class="{ modifier: isModifier(key) }"
+            v-for="(key, index) in keybind"
+          >
+            {{ keyToDisplay(key) }}
+          </span>
         </template>
       </div>
     </div>
@@ -35,42 +48,59 @@
 
 <script setup lang="ts">
 import { invoke } from '@tauri-apps/api/core';
+import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { platform } from '@tauri-apps/plugin-os';
-import { onMounted, onUnmounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-const activeModifiers = ref<Set<string>>(new Set());
-const currentKeybind = ref<string[]>([]);
+const activeModifiers = reactive<Set<string>>(new Set());
 const isKeybindInputFocused = ref(false);
+const keybind = ref<string[]>([]);
 const keybindInput = ref<HTMLElement | null>(null);
-const lastNonModifier = ref('');
+const lastBlurTime = ref(0);
 const os = ref('');
 const router = useRouter();
-const lastBlurTime = ref(0);
 
 const keyToDisplayMap: Record<string, string> = {
-  " ": "Space",
-  Alt: "Alt",
-  ArrowDown: "↓",
-  ArrowLeft: "←",
-  ArrowRight: "→",
-  ArrowUp: "↑",
-  Control: "Ctrl",
-  Enter: "↵",
-  Meta: "Meta",
-  Shift: "⇧",
+  ' ': 'Space',
+  Alt: 'Alt',
+  AltLeft: 'Alt L',
+  AltRight: 'Alt R',
+  ArrowDown: '↓',
+  ArrowLeft: '←',
+  ArrowRight: '→',
+  ArrowUp: '↑',
+  Control: 'Ctrl',
+  ControlLeft: 'Ctrl L',
+  ControlRight: 'Ctrl R',
+  Enter: '↵',
+  Meta: 'Meta',
+  MetaLeft: 'Meta L',
+  MetaRight: 'Meta R',
+  Shift: '⇧',
+  ShiftLeft: '⇧ L',
+  ShiftRight: '⇧ R',
 };
 
-const modifierKeySet = new Set(["Alt", "Control", "Meta", "Shift"]);
+const modifierKeySet = new Set([
+  'Alt', 'AltLeft', 'AltRight',
+  'Control', 'ControlLeft', 'ControlRight',
+  'Meta', 'MetaLeft', 'MetaRight',
+  'Shift', 'ShiftLeft', 'ShiftRight'
+]);
 
-function keyToDisplay(key: string): string {
-  return keyToDisplayMap[key] || key.toUpperCase();
-}
+const isModifier = (key: string): boolean => {
+  return modifierKeySet.has(key);
+};
 
-function updateCurrentKeybind() {
-  const modifiers = Array.from(activeModifiers.value);
-  currentKeybind.value = lastNonModifier.value ? [...modifiers, lastNonModifier.value] : modifiers;
-}
+const keyToDisplay = (key: string): string => {
+  return keyToDisplayMap[key] || key;
+};
+
+const updateKeybind = () => {
+  const modifiers = Array.from(activeModifiers).sort();
+  const nonModifiers = keybind.value.filter(key => !isModifier(key));
+  keybind.value = [...modifiers, ...nonModifiers];
+};
 
 const onBlur = () => {
   isKeybindInputFocused.value = false;
@@ -79,46 +109,53 @@ const onBlur = () => {
 
 const onFocus = () => {
   isKeybindInputFocused.value = true;
-  activeModifiers.value.clear();
-  lastNonModifier.value = '';
-  updateCurrentKeybind();
+  activeModifiers.clear();
+  keybind.value = [];
 };
 
 const onKeyDown = (event: KeyboardEvent) => {
   event.preventDefault();
-  const key = event.key;
+  const key = event.code;
 
-  if (key === "Escape") {
+  if (key === 'Escape') {
     if (keybindInput.value) {
       keybindInput.value.blur();
     }
     return;
   }
 
-  if (modifierKeySet.has(key)) {
-    activeModifiers.value.add(key);
-  } else {
-    lastNonModifier.value = key;
+  if (isModifier(key)) {
+    activeModifiers.add(key);
+  } else if (!keybind.value.includes(key)) {
+    keybind.value = keybind.value.filter(k => isModifier(k));
+    keybind.value.push(key);
   }
-  updateCurrentKeybind();
-};
   
-const onKeyUp = (event: KeyboardEvent) => {
-  event.preventDefault();
+  updateKeybind();
 };
 
 const saveKeybind = async () => {
-  console.log("New:", currentKeybind.value);
-  console.log("Old: " + new Array(await invoke("get_keybind")));
-  await invoke("save_keybind", { keybind: currentKeybind.value})
+  console.log('New:', keybind.value);
+  const oldKeybind = await invoke<string[]>('get_keybind');
+  console.log('Old:', oldKeybind);
+  await invoke('save_keybind', { keybind: keybind.value });
 };
 
 const handleGlobalKeyDown = (event: KeyboardEvent) => {
   const now = Date.now();
-  if ((os.value === 'macos' ? event.metaKey : event.ctrlKey) && event.key === 'Enter' && !isKeybindInputFocused.value) {
+  if (
+    (os.value === 'macos'
+      ? (event.code === 'MetaLeft' || event.code === 'MetaRight') && event.key === 'Enter'
+      : (event.code === 'ControlLeft' || event.code === 'ControlRight') && event.key === 'Enter') &&
+    !isKeybindInputFocused.value
+  ) {
     event.preventDefault();
     saveKeybind();
-  } else if (event.key === 'Escape' && !isKeybindInputFocused.value && now - lastBlurTime.value > 100) {
+  } else if (
+    event.key === 'Escape' &&
+    !isKeybindInputFocused.value &&
+    now - lastBlurTime.value > 100
+  ) {
     event.preventDefault();
     router.push('/');
   }

src-tauri/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "qopy"
-version = "0.1.1"
+version = "0.2.0"
 description = "Qopy"
 authors = ["pandadev"]
 edition = "2021"
 rust-version = "1.70"
 
 [build-dependencies]
-tauri-build = { version = "2.0.1", features = [] }
+tauri-build = { version = "2.0.3", features = [] }
 
 [dependencies]
 tauri = { version = "2.0.1", features = [
@@ -15,29 +15,30 @@ tauri = { version = "2.0.1", features = [
   "tray-icon",
   "image-png",
 ] }
-tauri-plugin-sql = { version = "2.0.1", features = ["sqlite"] }
+tauri-plugin-sql = { version = "2.0.2", features = ["sqlite"] }
 tauri-plugin-autostart = "2.0.1"
 tauri-plugin-os = "2.0.1"
 tauri-plugin-updater = "2.0.2"
-tauri-plugin-dialog = "2.0.1"
-tauri-plugin-fs = "2.0.1"
-tauri-plugin-clipboard = "2.1.9"
-tauri-plugin-prevent-default = "0.6.1"
+tauri-plugin-dialog = "2.0.3"
+tauri-plugin-fs = "2.0.3"
+tauri-plugin-clipboard = "2.1.11"
+tauri-plugin-prevent-default = "0.7.5"
 tauri-plugin-global-shortcut = "2.0.1"
 sqlx = { version = "0.8.2", features = ["runtime-tokio-native-tls", "sqlite"] }
-serde = { version = "1.0.210", features = ["derive"] }
-tokio = { version = "1.40.0", features = ["full"] }
-serde_json = "1.0.128"
+serde = { version = "1.0.215", features = ["derive"] }
+tokio = { version = "1.41.1", features = ["full"] }
+serde_json = "1.0.132"
 rdev = "0.5.3"
 rand = "0.8"
 base64 = "0.22.1"
-image = "0.25.2"
-reqwest = { version = "0.12.8", features = ["blocking"] }
-url = "2.5.2"
-regex = "1.11.0"
+image = "0.25.5"
+reqwest = { version = "0.12.9", features = ["blocking"] }
+url = "2.5.3"
+regex = "1.11.1"
 sha2 = "0.10.6"
 lazy_static = "1.4.0"
 time = "0.3"
+global-hotkey = "0.6.3"
 
 [features]
 custom-protocol = ["tauri/custom-protocol"]

src-tauri/src/api/database.rs

@@ -1,10 +1,10 @@
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 use serde::{Deserialize, Serialize};
+use serde_json;
 use sqlx::sqlite::{SqlitePool, SqlitePoolOptions};
 use std::fs;
-use tauri::Manager;
-use tauri::State;
+use tauri::{Manager, Emitter};
 use tokio::runtime::Runtime;
 
 #[derive(Deserialize, Serialize)]
@@ -118,18 +118,22 @@ pub fn setup(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
 
 #[tauri::command]
 pub async fn save_keybind(
+    app_handle: tauri::AppHandle,
     keybind: Vec<String>,
-    pool: State<'_, SqlitePool>,
+    pool: tauri::State<'_, SqlitePool>,
 ) -> Result<(), String> {
     let json = serde_json::to_string(&keybind).map_err(|e| e.to_string())?;
 
-    sqlx::query(
-        "INSERT OR REPLACE INTO settings (key, value) VALUES ('keybind', ?)"
-    )
-    .bind(json)
-    .execute(&*pool)
-    .await
-    .map_err(|e| e.to_string())?;
+    sqlx::query("INSERT OR REPLACE INTO settings (key, value) VALUES ('keybind', ?)")
+        .bind(json)
+        .execute(&*pool)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    let keybind_str = keybind.join("+");
+    app_handle
+        .emit("update-shortcut", keybind_str)
+        .map_err(|e| e.to_string())?;
 
     Ok(())
 }
@@ -138,18 +142,20 @@ pub async fn save_keybind(
 pub async fn get_keybind(app_handle: tauri::AppHandle) -> Result<Vec<String>, String> {
     let pool = app_handle.state::<SqlitePool>();
 
-    let result = sqlx::query_scalar::<_, String>(
-        "SELECT value FROM settings WHERE key = 'keybind'"
-    )
-    .fetch_optional(&*pool)
-    .await
-    .map_err(|e| e.to_string())?;
+    let result =
+        sqlx::query_scalar::<_, String>("SELECT value FROM settings WHERE key = 'keybind'")
+            .fetch_optional(&*pool)
+            .await
+            .map_err(|e| e.to_string())?;
 
     match result {
         Some(json) => {
-            let setting: KeybindSetting = serde_json::from_str(&json).map_err(|e| e.to_string())?;
-            Ok(setting.keybind)
-        },
-        None => Ok(vec!["Meta".to_string(), "V".to_string()]),
+            let keybind: Vec<String> = serde_json::from_str(&json).map_err(|e| e.to_string())?;
+            Ok(keybind)
+        }
+        None => {
+            let default_keybind = vec!["Meta".to_string(), "V".to_string()];
+            Ok(default_keybind)
+        }
     }
 }

src-tauri/src/api/hotkeys.rs

@@ -1,44 +1,104 @@
 use crate::api::database::get_keybind;
 use crate::utils::commands::center_window_on_current_monitor;
-use rdev::{listen, EventType, Key};
-use tauri::Manager;
+use global_hotkey::{
+    hotkey::{Code, HotKey, Modifiers},
+    GlobalHotKeyEvent, GlobalHotKeyManager,
+};
+use std::str::FromStr;
+use tauri::{AppHandle, Listener, Manager};
 
-fn key_to_string(key: &Key) -> String {
-    format!("{:?}", key)
-}
-
-#[warn(dead_code)]
 pub fn setup(app_handle: tauri::AppHandle) {
-    std::thread::spawn(move || {
-        let keybind = tauri::async_runtime::block_on(async { get_keybind(app_handle.clone()).await.unwrap_or_default() });
+    let app_handle_clone = app_handle.clone();
 
-        println!("Listening for keybind: {:?}", keybind);
-
-        let mut pressed_keys = vec![false; keybind.len()];
-
-        listen(move |event| {
-            match event.event_type {
-                EventType::KeyPress(key) => {
-                    if let Some(index) = keybind.iter().position(|k| k == &key_to_string(&key)) {
-                        pressed_keys[index] = true;
+    tauri::async_runtime::spawn(async move {
+        match get_keybind(app_handle_clone.clone()).await {
+            Ok(keybind) => {
+                if !keybind.is_empty() {
+                    let keybind_str = keybind.join("+");
+                    println!("Keybind: {:?}", keybind_str);
+                    if let Err(e) = register_shortcut(&app_handle_clone, &keybind_str) {
+                        eprintln!("Error registering shortcut: {:?}", e);
                     }
                 }
-                EventType::KeyRelease(key) => {
-                    if let Some(index) = keybind.iter().position(|k| k == &key_to_string(&key)) {
-                        pressed_keys[index] = false;
-                    }
-                }
-                _ => {}
             }
+            Err(e) => {
+                eprintln!("Error getting keybind: {:?}", e);
+            }
+        }
+    });
 
-            if pressed_keys.iter().all(|&k| k) {
-                pressed_keys.iter_mut().for_each(|k| *k = false);
-                let window = app_handle.get_webview_window("main").unwrap();
-                window.show().unwrap();
-                window.set_focus().unwrap();
-                center_window_on_current_monitor(&window);
+    let app_handle_for_listener = app_handle.clone();
+    app_handle.listen("update-shortcut", move |event| {
+        let payload_str = event.payload().to_string();
+        if let Err(e) = register_shortcut(&app_handle_for_listener, &payload_str) {
+            eprintln!("Error re-registering shortcut: {:?}", e);
+        }
+    });
+
+    let app_handle_for_hotkey = app_handle.clone();
+    tauri::async_runtime::spawn(async move {
+        loop {
+            if let Ok(_) = GlobalHotKeyEvent::receiver().recv() {
+                handle_hotkey_event(&app_handle_for_hotkey);
             }
-        })
-        .unwrap();
+        }
     });
 }
+
+fn register_shortcut(
+    _app_handle: &tauri::AppHandle,
+    shortcut: &str,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let manager = GlobalHotKeyManager::new()?;
+    let hotkey = parse_hotkey(shortcut)?;
+    manager.register(hotkey)?;
+
+    println!("Listening for keybind: {}", shortcut);
+    Ok(())
+}
+
+fn parse_hotkey(shortcut: &str) -> Result<HotKey, Box<dyn std::error::Error>> {
+    let mut modifiers = Modifiers::empty();
+    let mut code = None;
+
+    for part in shortcut.split('+') {
+        let part = part;
+        if part.to_lowercase().starts_with("ctrl") || part.to_lowercase().starts_with("control") {
+            modifiers |= Modifiers::CONTROL;
+        } else if part.to_lowercase().starts_with("alt") {
+            modifiers |= Modifiers::ALT;
+        } else if part.to_lowercase().starts_with("shift") {
+            modifiers |= Modifiers::SHIFT;
+        } else if part.to_lowercase().starts_with("super") || part.to_lowercase().starts_with("meta") || part.to_lowercase().starts_with("cmd") {
+            
+            modifiers |= Modifiers::META;
+        } else {
+            let pascal_case_key = part
+                .split(|c: char| !c.is_alphanumeric())
+                .map(|word| {
+                    let mut chars = word.chars();
+                    let first_char = chars.next().unwrap().to_uppercase().collect::<String>();
+                    let rest = chars.as_str();
+                    first_char + rest
+                })
+                .collect::<String>();
+            code = Some(
+                Code::from_str(&pascal_case_key)
+                    .map_err(|_| format!("Invalid key: {}", pascal_case_key))?,
+            );
+        }
+    }
+
+    Ok(HotKey::new(Some(modifiers), code.unwrap()))
+}
+
+fn handle_hotkey_event(app_handle: &AppHandle) {
+    let window = app_handle.get_webview_window("main").unwrap();
+    if window.is_visible().unwrap() {
+        window.hide().unwrap();
+    } else {
+        window.show().unwrap();
+        window.set_focus().unwrap();
+        center_window_on_current_monitor(&window);
+    }
+}

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "Qopy",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "identifier": "net.pandadev.qopy",
   "build": {
     "frontendDist": "../dist",