Merge remote-tracking branch 'rd/master' into feat/x11/clipboard-file/init

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

src/client/io_loop.rs

@@ -1534,6 +1534,7 @@ impl<T: InvokeUiSession> Remote<T> {
                 }
                 Some(message::Union::PeerInfo(pi)) => {
                     self.handler.set_displays(&pi.displays);
+                    self.handler.set_platform_additions(&pi.platform_additions);
                 }
                 _ => {}
             }

src/flutter.rs

@@ -691,6 +691,13 @@ impl InvokeUiSession for FlutterHandler {
         );
     }
 
+    fn set_platform_additions(&self, data: &str) {
+        self.push_event(
+            "sync_platform_additions",
+            vec![("platform_additions", &data)],
+        )
+    }
+
     fn on_connected(&self, _conn_type: ConnType) {}
 
     fn msgbox(&self, msgtype: &str, title: &str, text: &str, link: &str, retry: bool) {

src/flutter_ffi.rs

@@ -1401,6 +1401,12 @@ pub fn session_on_waiting_for_image_dialog_show(session_id: SessionID) {
     super::flutter::session_on_waiting_for_image_dialog_show(session_id);
 }
 
+pub fn session_toggle_virtual_display(session_id: SessionID, index: i32, on: bool) {
+    if let Some(session) = sessions::get_session_by_session_id(&session_id) {
+        session.toggle_virtual_display(index, on);
+    }
+}
+
 pub fn main_set_home_dir(_home: String) {
     #[cfg(any(target_os = "android", target_os = "ios"))]
     {

src/lang/ar.rs

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

src/lang/ca.rs

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

src/lang/cn.rs

@@ -570,5 +570,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Big tiles", ""),
         ("Small tiles", ""),
         ("List", ""),
+        ("Virtual display", "虚拟显示器"),
+        ("Plug out all", "拔出所有"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -565,10 +565,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Open in new window", "Otevřít v novém okně"),
         ("Show displays as individual windows", "Zobrazit obrazovky jako jednotlivá okna"),
         ("Use all my displays for the remote session", "Použít všechny mé obrazovky pro vzdálenou relaci"),
-        ("selinux_tip", ""),
-        ("Change view", ""),
-        ("Big tiles", ""),
-        ("Small tiles", ""),
-        ("List", ""),
+        ("selinux_tip", "Na vašem zařízení je povolen SELinux, což může bránit správnému běhu RustDesku jako řízené strany."),
+        ("Change view", "Změnit pohled"),
+        ("Big tiles", "Velké dlaždice"),
+        ("Small tiles", "Malé dlaždice"),
+        ("List", "Seznam"),
+        ("Virtual display", "Virtuální obrazovka"),
+        ("Plug out all", "Odpojit všechny"),
     ].iter().cloned().collect();
 }

src/lang/da.rs

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

src/lang/de.rs

@@ -566,9 +566,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Show displays as individual windows", "Jeden Bildschirm in einem eigenen Fenster anzeigen"),
         ("Use all my displays for the remote session", "Alle meine Bildschirme für die Fernsitzung verwenden"),
         ("selinux_tip", "SELinux ist auf Ihrem Gerät aktiviert, was dazu führen kann, dass RustDesk als kontrollierte Seite nicht richtig läuft."),
-        ("Change view", ""),
-        ("Big tiles", ""),
-        ("Small tiles", ""),
-        ("List", ""),
+        ("Change view", "Ansicht ändern"),
+        ("Big tiles", "Große Kacheln"),
+        ("Small tiles", "Kleine Kacheln"),
+        ("List", "Liste"),
+        ("Virtual display", ""),
+        ("Plug out all", ""),
     ].iter().cloned().collect();
 }

src/lang/el.rs

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

src/lang/eo.rs

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

src/lang/es.rs

@@ -570,5 +570,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Big tiles", ""),
         ("Small tiles", ""),
         ("List", ""),
+        ("selinux_tip", ""),
+        ("Virtual display", ""),
+        ("Plug out all", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

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

src/lang/fr.rs

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

src/lang/hu.rs

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

src/lang/id.rs

@@ -566,9 +566,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Show displays as individual windows", "Tampilkan dengan jendela terpisah"),
         ("Use all my displays for the remote session", "Gunakan semua layar untuk sesi remote"),
         ("selinux_tip", ""),
-        ("Change view", ""),
+        ("Change view", "Sesuaikan tampilan"),
         ("Big tiles", ""),
         ("Small tiles", ""),
         ("List", ""),
+        ("Virtual display", "Tampilan virtual"),
+        ("Plug out all", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -565,11 +565,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Open in new window", "Apri in una nuova finestra"),
         ("Show displays as individual windows", "Visualizza schermi come finestre individuali"),
         ("Use all my displays for the remote session", "Usa tutti gli schermi per la sessione remota"),
-        ("selinux_tip", ""),
         ("selinux_tip", "In questo dispositivo è abilitato SELinux, che potrebbe impedire il corretto funzionamento di RustDesk come lato controllato."),
-        ("Change view", ""),
-        ("Big tiles", ""),
-        ("Small tiles", ""),
-        ("List", ""),
+        ("Change view", "Modifica vista"),
+        ("Big tiles", "Icone grandi"),
+        ("Small tiles", "Icone piccole"),
+        ("List", "Elenco"),
+        ("Virtual display", ""),
+        ("Plug out all", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

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

src/lang/ko.rs

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

src/lang/kz.rs

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

src/lang/lt.rs

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

src/lang/lv.rs

@@ -566,9 +566,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Show displays as individual windows", "Rādīt displejus kā atsevišķus logus"),
         ("Use all my displays for the remote session", "Izmantot visus manus displejus attālajai sesijai"),
         ("selinux_tip", "Jūsu ierīcē ir iespējots SELinux, kas var neļaut RustDesk pareizi darboties kā kontrolētajai pusei."),
-        ("Change view", ""),
-        ("Big tiles", ""),
-        ("Small tiles", ""),
-        ("List", ""),
+        ("Change view", "Mainīt skatu"),
+        ("Big tiles", "Lielas flīzes"),
+        ("Small tiles", "Mazas flīzes"),
+        ("List", "Saraksts"),
+        ("Virtual display", "Virtuālais displejs"),
+        ("Plug out all", "Atvienot visu"),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

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

src/lang/pl.rs

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

src/lang/pt_PT.rs

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

src/lang/ptbr.rs

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

src/lang/ro.rs

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

src/lang/ru.rs

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

src/lang/sk.rs

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

src/lang/sl.rs

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

src/lang/sq.rs

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

src/lang/sr.rs

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

src/lang/sv.rs

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

src/lang/template.rs

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

src/lang/th.rs

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

src/lang/tr.rs

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

src/lang/tw.rs

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

src/lang/ua.rs

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

src/lang/vn.rs

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

src/platform/windows.rs

@@ -1838,7 +1838,7 @@ pub fn uninstall_cert() -> ResultType<()> {
 }
 
 mod cert {
-    use hbb_common::{allow_err, bail, log, ResultType};
+    use hbb_common::{bail, log, ResultType};
     use std::{ffi::OsStr, io::Error, os::windows::ffi::OsStrExt, path::Path, str::from_utf8};
     use winapi::{
         shared::{

src/server/connection.rs

@@ -53,9 +53,10 @@ use std::{
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 use system_shutdown;
 
+#[cfg(all(windows, feature = "virtual_display_driver"))]
+use crate::virtual_display_manager;
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 use std::collections::HashSet;
-
 pub type Sender = mpsc::UnboundedSender<(Instant, Arc<Message>)>;
 
 lazy_static::lazy_static! {
@@ -1031,9 +1032,10 @@ impl Connection {
             pi.hostname = DEVICE_NAME.lock().unwrap().clone();
             pi.platform = "Android".into();
         }
+        #[cfg(any(target_os = "linux", target_os = "windows"))]
+        let mut platform_additions = serde_json::Map::new();
         #[cfg(target_os = "linux")]
         {
-            let mut platform_additions = serde_json::Map::new();
             if crate::platform::current_is_wayland() {
                 platform_additions.insert("is_wayland".into(), json!(true));
             }
@@ -1044,12 +1046,27 @@ impl Connection {
                     platform_additions.insert("headless".into(), json!(true));
                 }
             }
-            if !platform_additions.is_empty() {
-                pi.platform_additions =
-                    serde_json::to_string(&platform_additions).unwrap_or("".into());
+        }
+        #[cfg(target_os = "windows")]
+        {
+            platform_additions.insert(
+                "is_installed".into(),
+                json!(crate::platform::is_installed()),
+            );
+            #[cfg(feature = "virtual_display_driver")]
+            if crate::platform::is_installed() {
+                let virtual_displays = virtual_display_manager::get_virtual_displays();
+                if !virtual_displays.is_empty() {
+                    platform_additions.insert("virtual_displays".into(), json!(&virtual_displays));
+                }
             }
         }
 
+        #[cfg(any(target_os = "linux", target_os = "windows"))]
+        if !platform_additions.is_empty() {
+            pi.platform_additions = serde_json::to_string(&platform_additions).unwrap_or("".into());
+        }
+
         pi.encoding = Some(scrap::codec::Encoder::supported_encoding()).into();
 
         if self.port_forward_socket.is_some() {
@@ -1963,6 +1980,10 @@ impl Connection {
                         let set = displays.set.iter().map(|d| *d as usize).collect::<Vec<_>>();
                         self.capture_displays(&add, &sub, &set).await;
                     }
+                    #[cfg(all(windows, feature = "virtual_display_driver"))]
+                    Some(misc::Union::ToggleVirtualDisplay(t)) => {
+                        self.toggle_virtual_display(t).await;
+                    }
                     Some(misc::Union::ChatMessage(c)) => {
                         self.send_to_cm(ipc::Data::ChatMessage { text: c.text });
                         self.chat_unanswered = true;
@@ -2215,6 +2236,25 @@ impl Connection {
         }
     }
 
+    #[cfg(all(windows, feature = "virtual_display_driver"))]
+    async fn toggle_virtual_display(&mut self, t: ToggleVirtualDisplay) {
+        if t.on {
+            if let Err(e) = virtual_display_manager::plug_in_index_modes(t.display as _, Vec::new())
+            {
+                log::error!("Failed to plug in virtual display: {}", e);
+            }
+        } else {
+            let indices = if t.display == -1 {
+                virtual_display_manager::get_virtual_displays()
+            } else {
+                vec![t.display as _]
+            };
+            if let Err(e) = virtual_display_manager::plug_out_peer_request(&indices) {
+                log::error!("Failed to plug out virtual display {:?}: {}", &indices, e);
+            }
+        }
+    }
+
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     fn change_resolution(&mut self, r: &Resolution) {
         if self.keyboard {
@@ -2223,7 +2263,7 @@ impl Connection {
                     let name = display.name();
                     #[cfg(all(windows, feature = "virtual_display_driver"))]
                     if let Some(_ok) =
-                        crate::virtual_display_manager::change_resolution_if_is_virtual_display(
+                        virtual_display_manager::change_resolution_if_is_virtual_display(
                             &name,
                             r.width as _,
                             r.height as _,
@@ -2919,7 +2959,7 @@ mod raii {
             }
             #[cfg(all(windows, feature = "virtual_display_driver"))]
             if active_conns_lock.is_empty() {
-                display_service::try_plug_out_virtual_display();
+                let _ = virtual_display_manager::reset_all();
             }
             #[cfg(all(windows))]
             if active_conns_lock.is_empty() {

src/server/display_service.rs

@@ -12,6 +12,8 @@ use scrap::Display;
 
 pub const NAME: &'static str = "display";
 
+const DUMMY_DISPLAY_SIDE_MAX_SIZE: usize = 1024;
+
 struct ChangedResolution {
     original: (i32, i32),
     changed: (i32, i32),
@@ -154,6 +156,20 @@ fn displays_to_msg(displays: Vec<DisplayInfo>) -> Message {
         ..Default::default()
     };
     pi.displays = displays.clone();
+
+    #[cfg(all(windows, feature = "virtual_display_driver"))]
+    if crate::platform::is_installed() {
+        let virtual_displays = crate::virtual_display_manager::get_virtual_displays();
+        if !virtual_displays.is_empty() {
+            let mut platform_additions = serde_json::Map::new();
+            platform_additions.insert(
+                "virtual_displays".into(),
+                serde_json::json!(&virtual_displays),
+            );
+            pi.platform_additions = serde_json::to_string(&platform_additions).unwrap_or("".into());
+        }
+    }
+
     // current_display should not be used in server.
     // It is set to 0 for compatibility with old clients.
     pi.current_display = 0;
@@ -168,11 +184,6 @@ fn check_get_displays_changed_msg() -> Option<Message> {
     Some(displays_to_msg(displays))
 }
 
-#[cfg(all(windows, feature = "virtual_display_driver"))]
-pub fn try_plug_out_virtual_display() {
-    let _res = virtual_display_manager::plug_out_headless();
-}
-
 fn run(sp: EmptyExtraFieldService) -> ResultType<()> {
     while sp.ok() {
         sp.snapshot(|sps| {
@@ -312,9 +323,18 @@ fn no_displays(displays: &Vec<Display>) -> bool {
         true
     } else if display_len == 1 {
         let display = &displays[0];
-        let dummy_display_side_max_size = 800;
-        display.width() <= dummy_display_side_max_size
-            && display.height() <= dummy_display_side_max_size
+        if display.width() > DUMMY_DISPLAY_SIDE_MAX_SIZE
+            || display.height() > DUMMY_DISPLAY_SIDE_MAX_SIZE
+        {
+            return false;
+        }
+        let any_real = crate::platform::resolutions(&display.name())
+            .iter()
+            .any(|r| {
+                (r.height as usize) > DUMMY_DISPLAY_SIDE_MAX_SIZE
+                    || (r.width as usize) > DUMMY_DISPLAY_SIDE_MAX_SIZE
+            });
+        !any_real
     } else {
         false
     }

src/server/video_service.rs

@@ -255,7 +255,7 @@ pub fn test_create_capturer(
 ) -> String {
     let test_begin = Instant::now();
     loop {
-        let err = match try_get_displays() {
+        let err = match Display::all() {
             Ok(mut displays) => {
                 if displays.len() <= display_idx {
                     anyhow!(
@@ -271,7 +271,7 @@ pub fn test_create_capturer(
                     }
                 }
             }
-            Err(e) => e,
+            Err(e) => e.into(),
         };
         if test_begin.elapsed().as_millis() >= timeout_millis as _ {
             return err.to_string();
@@ -332,7 +332,7 @@ fn get_capturer(
         }
     }
 
-    let mut displays = try_get_displays()?;
+    let mut displays = Display::all()?;
     let ndisplay = displays.len();
     if ndisplay <= current {
         bail!(
@@ -761,52 +761,6 @@ pub fn refresh() {
     Display::refresh_size();
 }
 
-#[inline]
-#[cfg(not(all(windows, feature = "virtual_display_driver")))]
-fn try_get_displays() -> ResultType<Vec<Display>> {
-    Ok(Display::all()?)
-}
-
-#[inline]
-#[cfg(all(windows, feature = "virtual_display_driver"))]
-fn no_displays(displays: &Vec<Display>) -> bool {
-    let display_len = displays.len();
-    if display_len == 0 {
-        true
-    } else if display_len == 1 {
-        let display = &displays[0];
-        let dummy_display_side_max_size = 800;
-        if display.width() > dummy_display_side_max_size
-            || display.height() > dummy_display_side_max_size
-        {
-            return false;
-        }
-        let any_real = crate::platform::resolutions(&display.name())
-            .iter()
-            .any(|r| {
-                (r.height as usize) > dummy_display_side_max_size
-                    || (r.width as usize) > dummy_display_side_max_size
-            });
-        !any_real
-    } else {
-        false
-    }
-}
-
-#[cfg(all(windows, feature = "virtual_display_driver"))]
-fn try_get_displays() -> ResultType<Vec<Display>> {
-    // let mut displays = Display::all()?;
-    // if no_displays(&displays) {
-    //     log::debug!("no displays, create virtual display");
-    //     if let Err(e) = virtual_display_manager::plug_in_headless() {
-    //         log::error!("plug in headless failed {}", e);
-    //     } else {
-    //         displays = Display::all()?;
-    //     }
-    // }
-    Ok(Display::all()?)
-}
-
 #[cfg(windows)]
 fn start_uac_elevation_check() {
     static START: Once = Once::new();

src/ui/remote.rs

@@ -254,6 +254,10 @@ impl InvokeUiSession for SciterHandler {
         );
     }
 
+    fn set_platform_additions(&self, _data: &str) {
+        // Ignore for sciter version.
+    }
+
     fn on_connected(&self, conn_type: ConnType) {
         match conn_type {
             ConnType::RDP => {}

src/ui_session_interface.rs

@@ -237,11 +237,19 @@ impl<T: InvokeUiSession> Session<T> {
     }
 
     pub fn get_displays_as_individual_windows(&self) -> String {
-        self.lc.read().unwrap().displays_as_individual_windows.clone()
+        self.lc
+            .read()
+            .unwrap()
+            .displays_as_individual_windows
+            .clone()
     }
 
     pub fn get_use_all_my_displays_for_the_remote_session(&self) -> String {
-        self.lc.read().unwrap().use_all_my_displays_for_the_remote_session.clone()
+        self.lc
+            .read()
+            .unwrap()
+            .use_all_my_displays_for_the_remote_session
+            .clone()
     }
 
     pub fn save_reverse_mouse_wheel(&self, value: String) {
@@ -249,11 +257,17 @@ impl<T: InvokeUiSession> Session<T> {
     }
 
     pub fn save_displays_as_individual_windows(&self, value: String) {
-        self.lc.write().unwrap().save_displays_as_individual_windows(value);
+        self.lc
+            .write()
+            .unwrap()
+            .save_displays_as_individual_windows(value);
     }
 
     pub fn save_use_all_my_displays_for_the_remote_session(&self, value: String) {
-        self.lc.write().unwrap().save_use_all_my_displays_for_the_remote_session(value);
+        self.lc
+            .write()
+            .unwrap()
+            .save_use_all_my_displays_for_the_remote_session(value);
     }
 
     pub fn save_view_style(&self, value: String) {
@@ -310,6 +324,18 @@ impl<T: InvokeUiSession> Session<T> {
         }
     }
 
+    pub fn toggle_virtual_display(&self, index: i32, on: bool) {
+        let mut misc = Misc::new();
+        misc.set_toggle_virtual_display(ToggleVirtualDisplay {
+            display: index,
+            on,
+            ..Default::default()
+        });
+        let mut msg_out = Message::new();
+        msg_out.set_misc(misc);
+        self.send(Data::Message(msg_out));
+    }
+
     #[cfg(not(feature = "flutter"))]
     pub fn refresh_video(&self, _display: i32) {
         self.send(Data::Message(LoginConfigHandler::refresh()));
@@ -1175,6 +1201,7 @@ pub trait InvokeUiSession: Send + Sync + Clone + 'static + Sized + Default {
     fn switch_display(&self, display: &SwitchDisplay);
     fn set_peer_info(&self, peer_info: &PeerInfo); // flutter
     fn set_displays(&self, displays: &Vec<DisplayInfo>);
+    fn set_platform_additions(&self, data: &str);
     fn on_connected(&self, conn_type: ConnType);
     fn update_privacy_mode(&self);
     fn set_permission(&self, name: &str, value: bool);

src/virtual_display_manager.rs

@@ -18,10 +18,18 @@ lazy_static::lazy_static! {
 struct VirtualDisplayManager {
     headless_index_name: Option<(u32, String)>,
     peer_index_name: HashMap<u32, String>,
+    is_driver_installed: bool,
 }
 
 impl VirtualDisplayManager {
-    fn prepare_driver() -> ResultType<()> {
+    fn prepare_driver(&mut self) -> ResultType<()> {
+        if !self.is_driver_installed {
+            self.install_update_driver()?;
+        }
+        Ok(())
+    }
+
+    fn install_update_driver(&mut self) -> ResultType<()> {
         if let Err(e) = virtual_display::create_device() {
             if !e.to_string().contains("Device is already created") {
                 bail!("Create device failed {}", e);
@@ -29,9 +37,8 @@ impl VirtualDisplayManager {
         }
         // Reboot is not required for this case.
         let mut _reboot_required = false;
-        allow_err!(virtual_display::install_update_driver(
-            &mut _reboot_required
-        ));
+        virtual_display::install_update_driver(&mut _reboot_required)?;
+        self.is_driver_installed = true;
         Ok(())
     }
 
@@ -48,7 +55,7 @@ impl VirtualDisplayManager {
 
 pub fn plug_in_headless() -> ResultType<()> {
     let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
-    VirtualDisplayManager::prepare_driver()?;
+    manager.prepare_driver()?;
     let modes = [virtual_display::MonitorMode {
         width: 1920,
         height: 1080,
@@ -93,9 +100,55 @@ fn get_new_device_name(device_names: &HashSet<String>) -> String {
     "".to_string()
 }
 
+pub fn get_virtual_displays() -> Vec<u32> {
+    VIRTUAL_DISPLAY_MANAGER
+        .lock()
+        .unwrap()
+        .peer_index_name
+        .keys()
+        .cloned()
+        .collect()
+}
+
+pub fn plug_in_index_modes(
+    idx: u32,
+    mut modes: Vec<virtual_display::MonitorMode>,
+) -> ResultType<()> {
+    let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
+    manager.prepare_driver()?;
+    if !manager.peer_index_name.contains_key(&idx) {
+        let device_names = windows::get_device_names();
+        if modes.is_empty() {
+            modes.push(virtual_display::MonitorMode {
+                width: 1920,
+                height: 1080,
+                sync: 60,
+            });
+        }
+        match VirtualDisplayManager::plug_in_monitor(idx, modes.as_slice()) {
+            Ok(_) => {
+                let device_name = get_new_device_name(&device_names);
+                manager.peer_index_name.insert(idx, device_name);
+            }
+            Err(e) => {
+                log::error!("Plug in monitor failed {}", e);
+            }
+        }
+    }
+    Ok(())
+}
+
+pub fn reset_all() -> ResultType<()> {
+    let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
+    if !manager.peer_index_name.is_empty() || manager.headless_index_name.is_some() {
+        manager.install_update_driver()?;
+    }
+    Ok(())
+}
+
 pub fn plug_in_peer_request(modes: Vec<Vec<virtual_display::MonitorMode>>) -> ResultType<Vec<u32>> {
     let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
-    VirtualDisplayManager::prepare_driver()?;
+    manager.prepare_driver()?;
 
     let mut indices: Vec<u32> = Vec::new();
     for m in modes.iter() {
@@ -119,9 +172,9 @@ pub fn plug_in_peer_request(modes: Vec<Vec<virtual_display::MonitorMode>>) -> Re
     Ok(indices)
 }
 
-pub fn plug_out_peer_request(modes: &[u32]) -> ResultType<()> {
+pub fn plug_out_peer_request(indices: &[u32]) -> ResultType<()> {
     let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
-    for idx in modes.iter() {
+    for idx in indices.iter() {
         if manager.peer_index_name.contains_key(idx) {
             allow_err!(virtual_display::plug_out_monitor(*idx));
             manager.peer_index_name.remove(idx);