Merge branch 'feat/x11/clipboard-file/init' into feat/osx/clipboard-file

Signed-off-by: ClSlaid <cailue@bupt.edu.cn>

src/client/io_loop.rs

@@ -317,6 +317,9 @@ impl<T: InvokeUiSession> Remote<T> {
                     if stop {
                         ContextSend::set_is_stopped();
                     } else {
+                        if let Err(e) = ContextSend::make_sure_enabled() {
+                            log::error!("failed to restart clipboard context: {}", e);
+                        };
                         log::debug!("Send system clipboard message to remote");
                         let msg = crate::clipboard_file::clip_2_msg(clip);
                         allow_err!(peer.send(&msg).await);
@@ -1704,7 +1707,13 @@ impl<T: InvokeUiSession> Remote<T> {
     }
 
     fn check_clipboard_file_context(&self) {
-        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+        #[cfg(any(
+            target_os = "windows",
+            all(
+                feature = "unix-file-copy-paste",
+                any(target_os = "linux", target_os = "macos")
+            )
+        ))]
         {
             let enabled = *self.handler.server_file_transfer_enabled.read().unwrap()
                 && self.handler.lc.read().unwrap().enable_file_transfer.v;
@@ -1736,6 +1745,9 @@ impl<T: InvokeUiSession> Remote<T> {
                 "Process clipboard message from server peer, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}",
                 stop, is_stopping_allowed, file_transfer_enabled);
         if !stop {
+            if let Err(e) = ContextSend::make_sure_enabled() {
+                log::error!("failed to restart clipboard context: {}", e);
+            };
             let _ = ContextSend::proc(|context| -> ResultType<()> {
                 context
                     .server_clip_file(self.client_conn_id, clip)

src/common.rs

@@ -14,22 +14,22 @@ pub enum GrabState {
 #[cfg(not(any(
     target_os = "android",
     target_os = "ios",
-    all(target_os = "linux", not(feature = "wayland"))
+    all(target_os = "linux", feature = "unix-file-copy-paste")
 )))]
 pub use arboard::Clipboard as ClipboardContext;
 
-#[cfg(all(target_os = "linux", not(feature = "wayland")))]
+#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))]
 static X11_CLIPBOARD: once_cell::sync::OnceCell<x11_clipboard::Clipboard> =
     once_cell::sync::OnceCell::new();
 
-#[cfg(all(target_os = "linux", not(feature = "wayland")))]
+#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))]
 fn get_clipboard() -> Result<&'static x11_clipboard::Clipboard, String> {
     X11_CLIPBOARD
         .get_or_try_init(|| x11_clipboard::Clipboard::new())
         .map_err(|e| e.to_string())
 }
 
-#[cfg(all(target_os = "linux", not(feature = "wayland")))]
+#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))]
 pub struct ClipboardContext {
     string_setter: x11rb::protocol::xproto::Atom,
     string_getter: x11rb::protocol::xproto::Atom,
@@ -39,7 +39,7 @@ pub struct ClipboardContext {
     prop: x11rb::protocol::xproto::Atom,
 }
 
-#[cfg(all(target_os = "linux", not(feature = "wayland")))]
+#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))]
 fn parse_plain_uri_list(v: Vec<u8>) -> Result<String, String> {
     let text = String::from_utf8(v).map_err(|_| "ConversionFailure".to_owned())?;
     let mut list = String::new();
@@ -56,7 +56,7 @@ fn parse_plain_uri_list(v: Vec<u8>) -> Result<String, String> {
     Ok(list)
 }
 
-#[cfg(all(target_os = "linux", not(feature = "wayland")))]
+#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))]
 impl ClipboardContext {
     pub fn new() -> Result<Self, String> {
         let clipboard = get_clipboard()?;
@@ -87,7 +87,7 @@ impl ClipboardContext {
         let clip = self.clip;
         let prop = self.prop;
 
-        const TIMEOUT: std::time::Duration = std::time::Duration::from_millis(100);
+        const TIMEOUT: std::time::Duration = std::time::Duration::from_millis(120);
 
         let text_content = get_clipboard()?
             .load(clip, self.string_getter, prop, TIMEOUT)

src/flutter_ffi.rs

@@ -1725,6 +1725,17 @@ pub fn main_use_texture_render() -> SyncReturn<bool> {
     }
 }
 
+pub fn main_has_file_clipboard() -> SyncReturn<bool> {
+    let ret = cfg!(any(
+        target_os = "windows",
+        all(
+            feature = "unix-file-copy-paste",
+            any(target_os = "linux", target_os = "macos")
+        )
+    ));
+    SyncReturn(ret)
+}
+
 pub fn cm_init() {
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     crate::flutter::connection_manager::cm_init();

src/lang/de.rs

@@ -570,7 +570,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Big tiles", "Große Kacheln"),
         ("Small tiles", "Kleine Kacheln"),
         ("List", "Liste"),
-        ("Virtual display", ""),
-        ("Plug out all", ""),
+        ("Virtual display", "Virtueller Bildschirm"),
+        ("Plug out all", "Alle ausschalten"),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -570,7 +570,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Big tiles", "Icone grandi"),
         ("Small tiles", "Icone piccole"),
         ("List", "Elenco"),
-        ("Virtual display", ""),
-        ("Plug out all", ""),
+        ("Virtual display", "Scehrmo virtuale"),
+        ("Plug out all", "Scollega tutto"),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -274,7 +274,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Chat", "Czat"),
         ("Total", "Łącznie"),
         ("items", "elementów"),
-        ("Selected", "Zaznaczonych"),
+        ("Selected", "zaznaczonych"),
         ("Screen Capture", "Przechwytywanie ekranu"),
         ("Input Control", "Kontrola wejścia"),
         ("Audio Capture", "Przechwytywanie dźwięku"),
@@ -564,13 +564,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("elevated_switch_display_msg", "Przełącz się na ekran główny, ponieważ wyświetlanie kilku ekranów nie jest obsługiwane przy podniesionych uprawnieniach."),
         ("Open in new window", "Otwórz w nowym oknie"),
         ("Show displays as individual windows", "Pokaż ekrany w osobnych oknach"),
-        ("Use all my displays for the remote session", ""),
-        ("selinux_tip", ""),
-        ("Change view", ""),
-        ("Big tiles", ""),
-        ("Small tiles", ""),
-        ("List", ""),
-        ("Virtual display", ""),
-        ("Plug out all", ""),
+        ("Use all my displays for the remote session", "Użyj wszystkich moich ekranów do zdalnej sesji"),
+        ("selinux_tip", "SELinux jest włączony na Twoim urządzeniu, co może przeszkodzić w uruchomieniu RustDesk po stronie kontrolowanej."),
+        ("Change view", "Zmień widok"),
+        ("Big tiles", "Duże kafelki"),
+        ("Small tiles", "Małe kafelki"),
+        ("List", "Lista"),
+        ("Virtual display", "Witualne ekrany"),
+        ("Plug out all", "Odłącz wszystko"),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -570,7 +570,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Big tiles", "Большие значки"),
         ("Small tiles", "Маленькие значки"),
         ("List", "Список"),
-        ("Virtual display", ""),
-        ("Plug out all", ""),
+        ("Virtual display", "Виртуальный дисплей"),
+        ("Plug out all", "Отключить все"),
     ].iter().cloned().collect();
 }

src/server/connection.rs

@@ -1032,7 +1032,7 @@ impl Connection {
             pi.hostname = DEVICE_NAME.lock().unwrap().clone();
             pi.platform = "Android".into();
         }
-        #[cfg(any(target_os = "linux", target_os = "windows"))]
+        #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
         let mut platform_additions = serde_json::Map::new();
         #[cfg(target_os = "linux")]
         {
@@ -1062,7 +1062,18 @@ impl Connection {
             }
         }
 
-        #[cfg(any(target_os = "linux", target_os = "windows"))]
+        #[cfg(any(
+            target_os = "windows",
+            all(
+                any(target_os = "linux", target_os = "macos"),
+                feature = "unix-file-copy-paste"
+            )
+        ))]
+        {
+            platform_additions.insert("has_file_clipboard".into(), json!(true));
+        }
+
+        #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
         if !platform_additions.is_empty() {
             pi.platform_additions = serde_json::to_string(&platform_additions).unwrap_or("".into());
         }

src/ui/header.tis

@@ -196,7 +196,7 @@ class Header: Reactor.Component {
                 {!cursor_embedded && <li #show-remote-cursor .toggle-option><span>{svg_checkmark}</span>{translate('Show remote cursor')}</li>}
                 <li #show-quality-monitor .toggle-option><span>{svg_checkmark}</span>{translate('Show quality monitor')}</li> 
                 {audio_enabled ? <li #disable-audio .toggle-option><span>{svg_checkmark}</span>{translate('Mute')}</li> : ""}
-                {((is_win && pi.platform == "Windows")||(is_linux && pi.platform == "Linux"))||(is_osx && pi.platform == "Mac OS") && file_enabled ? <li #enable-file-transfer .toggle-option><span>{svg_checkmark}</span>{translate('Allow file copy and paste')}</li> : ""}
+                {(is_win && pi.platform == "Windows") && file_enabled ? <li #enable-file-transfer .toggle-option><span>{svg_checkmark}</span>{translate('Allow file copy and paste')}</li> : ""}
                 {keyboard_enabled && clipboard_enabled ? <li #disable-clipboard .toggle-option><span>{svg_checkmark}</span>{translate('Disable clipboard')}</li> : ""} 
                 {keyboard_enabled ? <li #lock-after-session-end .toggle-option><span>{svg_checkmark}</span>{translate('Lock after session end')}</li> : ""} 
                 {keyboard_enabled && pi.platform == "Windows" ? <li #privacy-mode><span>{svg_checkmark}</span>{translate('Privacy mode')}</li> : ""}

src/ui_cm_interface.rs

@@ -575,12 +575,13 @@ pub async fn start_ipc<T: InvokeUiCM>(cm: ConnectionManager<T>) {
         }
     });
 
-    log::debug!(
-        "start_ipc enable context_send: {}",
-        Config::get_option("enable-file-transfer").is_empty()
-    );
-
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "windows",
+        all(
+            any(target_os = "linux", target_os = "macos"),
+            feature = "unix-file-copy-paste"
+        ),
+    ))]
     ContextSend::enable(Config::get_option("enable-file-transfer").is_empty());
 
     match ipc::new_listener("_cm").await {

src/ui_interface.rs

@@ -1008,6 +1008,7 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
     #[cfg(not(feature = "flutter"))]
     let mut id = "".to_owned();
     #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    #[allow(unused_mut, dead_code)]
     let mut enable_file_transfer = "".to_owned();
 
     loop {
@@ -1030,7 +1031,13 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
                                 *OPTIONS.lock().unwrap() = v;
                                 *OPTION_SYNCED.lock().unwrap() = true;
 
-                                #[cfg(any(target_os="windows", target_os="linux", target_os = "macos"))]
+                                #[cfg(any(
+                                        target_os = "windows",
+                                        all(
+                                            any(target_os="linux", target_os = "macos"),
+                                            feature = "unix-file-copy-paste"
+                                            )
+                                        ))]
                                 {
                                     let b = OPTIONS.lock().unwrap().get("enable-file-transfer").map(|x| x.to_string()).unwrap_or_default();
                                     if b != enable_file_transfer {

src/ui_session_interface.rs

@@ -1420,7 +1420,13 @@ impl<T: InvokeUiSession> Session<T> {
 #[tokio::main(flavor = "current_thread")]
 pub async fn io_loop<T: InvokeUiSession>(handler: Session<T>, round: u32) {
     // It is ok to call this function multiple times.
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "windows",
+        all(
+            any(target_os = "linux", target_os = "macos"),
+            feature = "unix-file-copy-paste"
+        )
+    ))]
     if !handler.is_file_transfer() && !handler.is_port_forward() {
         clipboard::ContextSend::enable(true);
     }