hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable virtual display if only one dummy display

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-06-05 22:18:59 +08:00
parent 12fc280ca6
commit 42e8971793
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/video_service.rs
View File

@ -340,16 +340,6 @@ fn create_capturer(
}; };
} }
// to-do: do not close if in privacy mode.
#[cfg(all(windows, feature = "virtual_display_driver"))]
fn ensure_close_virtual_device() -> ResultType<()> {
let num_displays = Display::all()?.len();
if num_displays > 1 {
let _res = virtual_display_manager::plug_out_headless();
}
Ok(())
}
// This function works on privacy mode. Windows only for now. // This function works on privacy mode. Windows only for now.
pub fn test_create_capturer(privacy_mode_id: i32, timeout_millis: u64) -> bool { pub fn test_create_capturer(privacy_mode_id: i32, timeout_millis: u64) -> bool {
let test_begin = Instant::now(); let test_begin = Instant::now();
@ -509,7 +499,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
let _wake_lock = get_wake_lock(); let _wake_lock = get_wake_lock();
#[cfg(all(windows, feature = "virtual_display_driver"))] #[cfg(all(windows, feature = "virtual_display_driver"))]
ensure_close_virtual_device()?; let _res = virtual_display_manager::plug_out_headless();
// ensure_inited() is needed because release_resource() may be called. // ensure_inited() is needed because release_resource() may be called.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@ -993,18 +983,39 @@ fn try_get_displays() -> ResultType<Vec<Display>> {
Ok(Display::all()?) Ok(Display::all()?)
} }
#[inline]
#[cfg(windows)]
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;
display.width() < dummy_display_side_max_size
&& display.height() < dummy_display_side_max_size
} else {
false
}
}
#[inline]
#[cfg(not(windows))]
fn no_displays(displays: &Vec<Display>) -> bool {
displays.is_empty()
}
#[cfg(all(windows, feature = "virtual_display_driver"))] #[cfg(all(windows, feature = "virtual_display_driver"))]
fn try_get_displays() -> ResultType<Vec<Display>> { fn try_get_displays() -> ResultType<Vec<Display>> {
let mut displays = Display::all()?; let mut displays = Display::all()?;
if displays.len() == 0 { if no_displays(&displays) {
log::debug!("no displays, create virtual display"); log::debug!("no displays, create virtual display");
if let Err(e) = virtual_display_manager::plug_in_headless() { if let Err(e) = virtual_display_manager::plug_in_headless() {
log::error!("plug in headless failed {}", e); log::error!("plug in headless failed {}", e);
} else { } else {
displays = Display::all()?; displays = Display::all()?;
} }
} else if displays.len() > 1 { } else {
// If more than one displays exists, close RustDeskVirtualDisplay
if virtual_display_manager::plug_out_headless() { if virtual_display_manager::plug_out_headless() {
displays = Display::all()?; displays = Display::all()?;
} }