andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Search for connector duplicates across all devices

Browse Source
This commit is contained in:
Ivan Molodetskikh
2025-01-04 23:24:09 +03:00
parent befbdc3ae5
commit 098c826095
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/tty.rs
+34 -23
View File
@@ -641,6 +641,7 @@ impl Tty {
} }
}; };
let mut added = Vec::new();
let mut removed = Vec::new(); let mut removed = Vec::new();
for event in scan_result { for event in scan_result {
match event { match event {
@@ -649,37 +650,16 @@ impl Tty {
crtc: Some(crtc), crtc: Some(crtc),
} => { } => {
let connector_name = format_connector_name(&connector); let connector_name = format_connector_name(&connector);
let mut name = let name = make_output_name(&device.drm, connector.handle(), connector_name);
make_output_name(&device.drm, connector.handle(), connector_name);
debug!( debug!(
"new connector: {} \"{}\"", "new connector: {} \"{}\"",
&name.connector, &name.connector,
name.format_make_model_serial(), name.format_make_model_serial(),
); );
// Make/model/serial can match exactly between different physical monitors. This
// doesn't happen often, but our Layout does not support such duplicates and
// will panic.
//
// As a workaround, search for duplicates, and unname the current connector if
// one is found. Connector names are always unique.
let formatted = name.format_make_model_serial_or_connector();
for info in device.known_crtcs.values() {
if info.name.matches(&formatted) {
warn!("connector make/model/serial duplicates existing, unnaming");
name = OutputName {
connector: name.connector,
make: None,
model: None,
serial: None,
};
break;
}
}
// Assign an id to this crtc. // Assign an id to this crtc.
let id = OutputId::next(); let id = OutputId::next();
device.known_crtcs.insert(crtc, CrtcInfo { id, name }); added.push((crtc, CrtcInfo { id, name }));
} }
DrmScanEvent::Disconnected { DrmScanEvent::Disconnected {
crtc: Some(crtc), .. crtc: Some(crtc), ..
@@ -705,6 +685,37 @@ impl Tty {
} }
} }
for (crtc, mut info) in added {
// Make/model/serial can match exactly between different physical monitors. This doesn't
// happen often, but our Layout does not support such duplicates and will panic.
//
// As a workaround, search for duplicates, and unname the new connectors if one is
// found. Connector names are always unique.
let name = &mut info.name;
let formatted = name.format_make_model_serial_or_connector();
for info in self.devices.values().flat_map(|d| d.known_crtcs.values()) {
if info.name.matches(&formatted) {
let connector = mem::take(&mut name.connector);
warn!(
"new connector {connector} duplicates make/model/serial \
of existing connector {}, unnaming",
info.name.connector,
);
*name = OutputName {
connector,
make: None,
model: None,
serial: None,
};
break;
}
}
// Insert it right away so next added connector will check against this one too.
let device = self.devices.get_mut(&node).unwrap();
device.known_crtcs.insert(crtc, info);
}
// This will connect any new connectors if needed, and apply other changes, such as // This will connect any new connectors if needed, and apply other changes, such as
// connecting back the internal laptop monitor once it becomes the only monitor left. // connecting back the internal laptop monitor once it becomes the only monitor left.
// //