From 52b91654cac4c9448c771748d58bd3fb7e6e90c4 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Tue, 17 Mar 2026 21:14:51 +0100 Subject: [PATCH] backend: take connector name from connector --- src/backend.rs | 3 +++ src/control_center/cc_gpus.rs | 4 ++-- src/tasks/connector.rs | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/backend.rs b/src/backend.rs index 8e0a2bc0..44cf6fe6 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -170,6 +170,9 @@ pub trait Connector: Any { fn gamma_lut_size(&self) -> Option { None } + fn name(&self) -> String { + self.kernel_id().to_string() + } } #[derive(Debug)] diff --git a/src/control_center/cc_gpus.rs b/src/control_center/cc_gpus.rs index 8d68a4ff..38beffe6 100644 --- a/src/control_center/cc_gpus.rs +++ b/src/control_center/cc_gpus.rs @@ -134,11 +134,11 @@ impl GpusPane { .connectors .lock() .values() - .map(|v| v.connector.kernel_id().to_string()) + .map(|v| v.name.clone()) .collect::>(); cs.sort(); for c in cs { - ui.label(c); + ui.label(&**c); } }); }); diff --git a/src/tasks/connector.rs b/src/tasks/connector.rs index a46a7ed1..2b6af537 100644 --- a/src/tasks/connector.rs +++ b/src/tasks/connector.rs @@ -33,7 +33,7 @@ pub fn handle(state: &Rc, connector: &Rc) { } let backend_state = connector.state(); let id = connector.id(); - let name = Rc::new(connector.kernel_id().to_string()); + let name = Rc::new(connector.name()); let head_state = HeadState { name: RcEq(name.clone()), position: (0, 0), @@ -137,7 +137,11 @@ impl ConnectorHandler { } async fn handle_connected(&self, info: MonitorInfo) { - log::info!("Connector {} connected", self.data.connector.kernel_id()); + log::info!( + "Connector {} connected ({})", + self.data.name, + self.data.connector.kernel_id(), + ); self.data.connected.set(true); self.data.set_state(&self.state, info.state.clone()); *self.data.description.borrow_mut() = create_description(&info); @@ -153,7 +157,7 @@ impl ConnectorHandler { for head in self.data.wlr_output_heads.lock().drain_values() { head.handle_disconnected(); } - log::info!("Connector {} disconnected", self.data.connector.kernel_id()); + log::info!("Connector {} disconnected", self.data.name); } async fn handle_desktop_connected(&self, info: MonitorInfo, name: GlobalName) {