TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-24 05:31:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: win, virtual display (#9023)

Browse Source 
1. Default resolution 1920x1080.
2. Restore on conn & disconn.

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2024-08-11 19:26:41 +08:00
committed by GitHub
parent ce56be6507
commit 6625aca994
8 changed files with 229 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/virtual_display_manager.rs
View File

@@ -1,5 +1,4 @@
use hbb_common::{bail, platform::windows::is_windows_version_or_greater, ResultType};
use std::sync::atomic;
// This string is defined here.
// https://github.com/rustdesk-org/RustDeskIddDriver/blob/b370aad3f50028b039aad211df60c8051c4a64d6/RustDeskIddDriver/RustDeskIddDriver.inf#LL73C1-L73C40
@@ -10,29 +9,6 @@ const IDD_IMPL: &str = IDD_IMPL_AMYUNI;
const IDD_IMPL_RUSTDESK: &str = "rustdesk_idd";
const IDD_IMPL_AMYUNI: &str = "amyuni_idd";
const IS_CAN_PLUG_OUT_ALL_NOT_SET: i8 = 0;
const IS_CAN_PLUG_OUT_ALL_YES: i8 = 1;
const IS_CAN_PLUG_OUT_ALL_NO: i8 = 2;
static IS_CAN_PLUG_OUT_ALL: atomic::AtomicI8 = atomic::AtomicI8::new(IS_CAN_PLUG_OUT_ALL_NOT_SET);
pub fn is_can_plug_out_all() -> bool {
IS_CAN_PLUG_OUT_ALL.load(atomic::Ordering::Relaxed) != IS_CAN_PLUG_OUT_ALL_NO
}
// No need to consider concurrency here.
pub fn set_can_plug_out_all(v: bool) {
if IS_CAN_PLUG_OUT_ALL.load(atomic::Ordering::Relaxed) == IS_CAN_PLUG_OUT_ALL_NOT_SET {
IS_CAN_PLUG_OUT_ALL.store(
if v {
IS_CAN_PLUG_OUT_ALL_YES
} else {
IS_CAN_PLUG_OUT_ALL_NO
},
atomic::Ordering::Relaxed,
);
}
}
pub fn is_amyuni_idd() -> bool {
IDD_IMPL == IDD_IMPL_AMYUNI
}
@@ -100,7 +76,7 @@ pub fn plug_in_monitor(idx: u32, modes: Vec<virtual_display::MonitorMode>) -> Re
}
}
pub fn plug_out_monitor(index: i32) -> ResultType<()> {
pub fn plug_out_monitor(index: i32, force_all: bool) -> ResultType<()> {
match IDD_IMPL {
IDD_IMPL_RUSTDESK => {
let indices = if index == -1 {
@@ -110,7 +86,7 @@ pub fn plug_out_monitor(index: i32) -> ResultType<()> {
};
rustdesk_idd::plug_out_peer_request(&indices)
}
IDD_IMPL_AMYUNI => amyuni_idd::plug_out_monitor(index),
IDD_IMPL_AMYUNI => amyuni_idd::plug_out_monitor(index, force_all),
_ => bail!("Unsupported virtual display implementation."),
}
}
@@ -126,12 +102,12 @@ pub fn plug_in_peer_request(modes: Vec<Vec<virtual_display::MonitorMode>>) -> Re
}
}
pub fn plug_out_monitor_indices(indices: &[u32]) -> ResultType<()> {
pub fn plug_out_monitor_indices(indices: &[u32], force_all: bool) -> ResultType<()> {
match IDD_IMPL {
IDD_IMPL_RUSTDESK => rustdesk_idd::plug_out_peer_request(indices),
IDD_IMPL_AMYUNI => {
for _idx in indices.iter() {
amyuni_idd::plug_out_monitor(0)?;
amyuni_idd::plug_out_monitor(0, force_all)?;
}
Ok(())
}
@@ -142,7 +118,7 @@ pub fn plug_out_monitor_indices(indices: &[u32]) -> ResultType<()> {
pub fn reset_all() -> ResultType<()> {
match IDD_IMPL {
IDD_IMPL_RUSTDESK => rustdesk_idd::reset_all(),
IDD_IMPL_AMYUNI => crate::privacy_mode::turn_off_privacy(0, None).unwrap_or(Ok(())),
IDD_IMPL_AMYUNI => amyuni_idd::reset_all(),
_ => bail!("Unsupported virtual display implementation."),
}
}
@@ -402,7 +378,7 @@ pub mod rustdesk_idd {
pub mod amyuni_idd {
use super::windows;
use crate::platform::win_device;
use crate::platform::{reg_display_settings, win_device};
use hbb_common::{bail, lazy_static, log, tokio::time::Instant, ResultType};
use std::{
ptr::null_mut,
@@ -532,6 +508,13 @@ pub mod amyuni_idd {
Ok(())
}
pub fn reset_all() -> ResultType<()> {
let _ = crate::privacy_mode::turn_off_privacy(0, None);
let _ = plug_out_monitor(-1, true);
*LAST_PLUG_IN_HEADLESS_TIME.lock().unwrap() = None;
Ok(())
}
#[inline]
fn plug_monitor_(add: bool) -> Result<(), win_device::DeviceError> {
let cmd = if add { 0x10 } else { 0x00 };
@@ -547,6 +530,7 @@ pub mod amyuni_idd {
fn plug_in_monitor_(add: bool, is_driver_async_installed: bool) -> ResultType<()> {
let timeout = Duration::from_secs(3);
let now = Instant::now();
let reg_connectivity_old = reg_display_settings::read_reg_connectivity();
loop {
match plug_monitor_(add) {
Ok(_) => {
@@ -567,9 +551,36 @@ pub mod amyuni_idd {
}
}
}
// Workaround for the issue that we can't set the default the resolution.
if let Ok(old_connectivity_old) = reg_connectivity_old {
std::thread::spawn(move || {
try_reset_resolution_on_first_plug_in(old_connectivity_old.len(), 1920, 1080);
});
}
Ok(())
}
fn try_reset_resolution_on_first_plug_in(
old_connectivity_len: usize,
width: usize,
height: usize,
) {
for _ in 0..10 {
std::thread::sleep(Duration::from_millis(300));
if let Ok(reg_connectivity_new) = reg_display_settings::read_reg_connectivity() {
if reg_connectivity_new.len() != old_connectivity_len {
for name in
windows::get_device_names(Some(super::AMYUNI_IDD_DEVICE_STRING)).iter()
{
crate::platform::change_resolution(&name, width, height).ok();
}
break;
}
}
}
}
pub fn plug_in_headless() -> ResultType<()> {
let mut tm = LAST_PLUG_IN_HEADLESS_TIME.lock().unwrap();
if let Some(tm) = &mut *tm {
@@ -603,7 +614,7 @@ pub mod amyuni_idd {
plug_in_monitor_(true, is_async)
}
pub fn plug_out_monitor(index: i32) -> ResultType<()> {
pub fn plug_out_monitor(index: i32, force_all: bool) -> ResultType<()> {
let all_count = windows::get_device_names(None).len();
let amyuni_count = get_monitor_count();
let mut to_plug_out_count = match all_count {
@@ -612,7 +623,7 @@ pub mod amyuni_idd {
if amyuni_count == 0 {
bail!("No virtual displays to plug out.")
} else {
if super::is_can_plug_out_all() {
if force_all {
1
} else {
bail!("This only virtual display cannot be pulled out.")
@@ -621,7 +632,7 @@ pub mod amyuni_idd {
}
_ => {
if all_count == amyuni_count {
if super::is_can_plug_out_all() {
if force_all {
all_count
} else {
all_count - 1