From 768b32602839896012a9ee3c4ed6885360fa5395 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Wed, 17 Jan 2024 10:25:23 +0400 Subject: Rename connectors to enabled_outputs --- src/backend/mod.rs | 6 +++--- src/backend/tty.rs | 12 ++++++------ src/backend/winit.rs | 10 +++++----- src/dbus/mod.rs | 4 ++-- src/dbus/mutter_display_config.rs | 8 ++++---- src/dbus/mutter_screen_cast.rs | 20 ++++++++++++-------- 6 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/backend/mod.rs b/src/backend/mod.rs index 9ee64f82..a273f769 100644 --- a/src/backend/mod.rs +++ b/src/backend/mod.rs @@ -111,10 +111,10 @@ impl Backend { } #[cfg_attr(not(feature = "dbus"), allow(unused))] - pub fn connectors(&self) -> Arc>> { + pub fn enabled_outputs(&self) -> Arc>> { match self { - Backend::Tty(tty) => tty.connectors(), - Backend::Winit(winit) => winit.connectors(), + Backend::Tty(tty) => tty.enabled_outputs(), + Backend::Winit(winit) => winit.enabled_outputs(), } } diff --git a/src/backend/tty.rs b/src/backend/tty.rs index 637545ba..0dacf9b7 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -74,7 +74,7 @@ pub struct Tty { // The allocator for the primary GPU. It is only `Some()` if we have a device corresponding to // the primary GPU. primary_allocator: Option>>, - connectors: Arc>>, + enabled_outputs: Arc>>, } pub type TtyRenderer<'render, 'alloc> = MultiRenderer< @@ -221,7 +221,7 @@ impl Tty { devices: HashMap::new(), dmabuf_global: None, primary_allocator: None, - connectors: Arc::new(Mutex::new(HashMap::new())), + enabled_outputs: Arc::new(Mutex::new(HashMap::new())), } } @@ -736,7 +736,7 @@ impl Tty { let sequence_delta_plot_name = tracy_client::PlotName::new_leak(format!("{output_name} sequence delta")); - self.connectors + self.enabled_outputs .lock() .unwrap() .insert(output_name.clone(), output.clone()); @@ -794,7 +794,7 @@ impl Tty { error!("missing output for crtc {crtc:?}"); }; - self.connectors.lock().unwrap().remove(&surface.name); + self.enabled_outputs.lock().unwrap().remove(&surface.name); } fn on_vblank( @@ -1157,8 +1157,8 @@ impl Tty { } } - pub fn connectors(&self) -> Arc>> { - self.connectors.clone() + pub fn enabled_outputs(&self) -> Arc>> { + self.enabled_outputs.clone() } #[cfg(feature = "xdp-gnome-screencast")] diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 56ea0d43..9b31d2c5 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -28,7 +28,7 @@ pub struct Winit { output: Output, backend: WinitGraphicsBackend, damage_tracker: OutputDamageTracker, - connectors: Arc>>, + enabled_outputs: Arc>>, } impl Winit { @@ -56,7 +56,7 @@ impl Winit { output.change_current_state(Some(mode), Some(Transform::Flipped180), None, None); output.set_preferred(mode); - let connectors = Arc::new(Mutex::new(HashMap::from([( + let enabled_outputs = Arc::new(Mutex::new(HashMap::from([( "winit".to_owned(), output.clone(), )]))); @@ -95,7 +95,7 @@ impl Winit { output, backend, damage_tracker, - connectors, + enabled_outputs, } } @@ -198,7 +198,7 @@ impl Winit { } } - pub fn connectors(&self) -> Arc>> { - self.connectors.clone() + pub fn enabled_outputs(&self) -> Arc>> { + self.enabled_outputs.clone() } } diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs index b4b2cdb0..8dc51386 100644 --- a/src/dbus/mod.rs +++ b/src/dbus/mod.rs @@ -45,7 +45,7 @@ impl DBusServers { } if is_session_instance || config.debug.dbus_interfaces_in_non_session_instances { - let display_config = DisplayConfig::new(backend.connectors()); + let display_config = DisplayConfig::new(backend.enabled_outputs()); dbus.conn_display_config = try_start(display_config); let (to_niri, from_screenshot) = calloop::channel::channel(); @@ -75,7 +75,7 @@ impl DBusServers { } }) .unwrap(); - let screen_cast = ScreenCast::new(backend.connectors(), to_niri); + let screen_cast = ScreenCast::new(backend.enabled_outputs(), to_niri); dbus.conn_screen_cast = try_start(screen_cast); } } diff --git a/src/dbus/mutter_display_config.rs b/src/dbus/mutter_display_config.rs index 663d3f8e..361abea0 100644 --- a/src/dbus/mutter_display_config.rs +++ b/src/dbus/mutter_display_config.rs @@ -10,7 +10,7 @@ use zbus::{dbus_interface, fdo}; use super::Start; pub struct DisplayConfig { - connectors: Arc>>, + enabled_outputs: Arc>>, } #[derive(Serialize, Type)] @@ -54,7 +54,7 @@ impl DisplayConfig { )> { // Construct the DBus response. let monitors: Vec = self - .connectors + .enabled_outputs .lock() .unwrap() .keys() @@ -85,8 +85,8 @@ impl DisplayConfig { } impl DisplayConfig { - pub fn new(connectors: Arc>>) -> Self { - Self { connectors } + pub fn new(enabled_outputs: Arc>>) -> Self { + Self { enabled_outputs } } } diff --git a/src/dbus/mutter_screen_cast.rs b/src/dbus/mutter_screen_cast.rs index cf22f8a0..68c53e5d 100644 --- a/src/dbus/mutter_screen_cast.rs +++ b/src/dbus/mutter_screen_cast.rs @@ -14,7 +14,7 @@ use super::Start; #[derive(Clone)] pub struct ScreenCast { - connectors: Arc>>, + enabled_outputs: Arc>>, to_niri: calloop::channel::Sender, #[allow(clippy::type_complexity)] sessions: Arc)>>>, @@ -23,7 +23,7 @@ pub struct ScreenCast { #[derive(Clone)] pub struct Session { id: usize, - connectors: Arc>>, + enabled_outputs: Arc>>, to_niri: calloop::channel::Sender, #[allow(clippy::type_complexity)] streams: Arc)>>>, @@ -84,7 +84,11 @@ impl ScreenCast { let path = format!("/org/gnome/Mutter/ScreenCast/Session/u{}", session_id); let path = OwnedObjectPath::try_from(path).unwrap(); - let session = Session::new(session_id, self.connectors.clone(), self.to_niri.clone()); + let session = Session::new( + session_id, + self.enabled_outputs.clone(), + self.to_niri.clone(), + ); match server.at(&path, session.clone()).await { Ok(true) => { let iface = server.interface(&path).await.unwrap(); @@ -151,7 +155,7 @@ impl Session { ) -> fdo::Result { debug!(connector, ?properties, "record_monitor"); - let Some(output) = self.connectors.lock().unwrap().get(connector).cloned() else { + let Some(output) = self.enabled_outputs.lock().unwrap().get(connector).cloned() else { return Err(fdo::Error::Failed("no such monitor".to_owned())); }; @@ -194,11 +198,11 @@ impl Stream { impl ScreenCast { pub fn new( - connectors: Arc>>, + enabled_outputs: Arc>>, to_niri: calloop::channel::Sender, ) -> Self { Self { - connectors, + enabled_outputs, to_niri, sessions: Arc::new(Mutex::new(vec![])), } @@ -223,12 +227,12 @@ impl Start for ScreenCast { impl Session { pub fn new( id: usize, - connectors: Arc>>, + enabled_outputs: Arc>>, to_niri: calloop::channel::Sender, ) -> Self { Self { id, - connectors, + enabled_outputs, streams: Arc::new(Mutex::new(vec![])), to_niri, } -- cgit