feat: 原生支持Wayland取词

pot-app · May 22, 2023 · 55c3bd1 · 55c3bd1
1 parent 64f4e27
commit 55c3bd1
Show file tree

Hide file tree

Showing 8 changed files with 284 additions and 88 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -39,7 +39,7 @@ arboard = "3.2.0"
 [target.'cfg(target_os = "linux")'.dependencies ]
 mouse_position = "0.1.3"
 x11-clipboard = "0.7.1"
-# wl-clipboard-rs = "0.7.0"
+wl-clipboard-rs = "0.7.0"
 
 [features]
 # by default Tauri runs in production mode

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -30,8 +30,6 @@ pub static APP: OnceCell<AppHandle> = OnceCell::new();
 pub struct StringWrapper(pub Mutex<String>);
 
 fn main() {
-    #[cfg(target_os = "linux")]
-    std::env::set_var("GDK_BACKEND", "x11");
     tauri::Builder::default()
         // 单例运行
         .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
@@ -172,7 +170,8 @@ fn main() {
             write_config,
             set_proxy,
             is_macos,
-            is_linux
+            is_linux,
+            is_wayland,
         ])
         //绑定托盘事件
         .on_system_tray_event(|app, event| match event {