TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-15 00:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Filter detached DXGI outputs for Win+P single-display modes (#15814)

Browse Source 
When Windows is set to "Show only on 1/2", DXGI still enumerates
detached outputs. Preferring that unfiltered list could select a
zero-size display as primary and hang clients waiting for video.
This commit is contained in:
Xinglin Qiang
2026-09-03 16:04:09 +08:00
committed by GitHub
parent e4539fc304
commit 23a147b0dc
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/scrap/src/common/dxgi.rs
View File

@@ -132,7 +132,15 @@ impl Display {
.map(Display) .map(Display)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let displays_dxgi = Self::all_().unwrap_or(Default::default()); let mut displays_dxgi = match Self::all_() {
Ok(displays) => displays,
Err(e) => {
hbb_common::log::error!("DXGI display enumeration failed: {e}");
Vec::new()
}
};
// Win+P "Show only on 1/2" still enumerates detached DXGI outputs.
displays_dxgi.retain(|d| d.is_online() && d.width() > 0 && d.height() > 0);
// Return gdi displays if dxgi is not supported // Return gdi displays if dxgi is not supported
if displays_dxgi.is_empty() { if displays_dxgi.is_empty() {
@@ -155,7 +163,6 @@ impl Display {
} }
// Reorder displays from dxgi // Reorder displays from dxgi
let mut displays_dxgi = displays_dxgi;
let mut displays_dxgi_ordered = Vec::new(); let mut displays_dxgi_ordered = Vec::new();
for name in names_gdi.iter() { for name in names_gdi.iter() {
let pos = match displays_dxgi.iter().position(|d| d.name() == *name) { let pos = match displays_dxgi.iter().position(|d| d.name() == *name) {
@@ -176,11 +183,11 @@ impl Display {
} }
pub fn width(&self) -> usize { pub fn width(&self) -> usize {
self.0.width() as usize self.0.width().max(0) as usize
} }
pub fn height(&self) -> usize { pub fn height(&self) -> usize {
self.0.height() as usize self.0.height().max(0) as usize
} }
pub fn name(&self) -> String { pub fn name(&self) -> String {
@@ -201,7 +208,8 @@ impl Display {
pub fn is_primary(&self) -> bool { pub fn is_primary(&self) -> bool {
// https://docs.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-devmodea // https://docs.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-devmodea
self.origin() == (0, 0) // Detached outputs can still report origin (0,0) with a zero size.
self.origin() == (0, 0) && self.width() > 0 && self.height() > 0
} }
#[cfg(feature = "vram")] #[cfg(feature = "vram")]