diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-01-17 10:25:23 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-01-17 10:25:23 +0400 |
| commit | 768b32602839896012a9ee3c4ed6885360fa5395 (patch) | |
| tree | a4bc46e2aabcad8c6f1a01832d3bd7b99879210a /src/backend | |
| parent | f068157f557d1c7256278d41f1bd42a13867777f (diff) | |
| download | niri-768b32602839896012a9ee3c4ed6885360fa5395.tar.gz niri-768b32602839896012a9ee3c4ed6885360fa5395.tar.bz2 niri-768b32602839896012a9ee3c4ed6885360fa5395.zip | |
Rename connectors to enabled_outputs
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/mod.rs | 6 | ||||
| -rw-r--r-- | src/backend/tty.rs | 12 | ||||
| -rw-r--r-- | src/backend/winit.rs | 10 |
3 files changed, 14 insertions, 14 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<Mutex<HashMap<String, Output>>> { + pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> { 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<DmabufAllocator<GbmAllocator<DrmDeviceFd>>>, - connectors: Arc<Mutex<HashMap<String, Output>>>, + enabled_outputs: Arc<Mutex<HashMap<String, Output>>>, } 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<Mutex<HashMap<String, Output>>> { - self.connectors.clone() + pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> { + 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<GlesRenderer>, damage_tracker: OutputDamageTracker, - connectors: Arc<Mutex<HashMap<String, Output>>>, + enabled_outputs: Arc<Mutex<HashMap<String, Output>>>, } 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<Mutex<HashMap<String, Output>>> { - self.connectors.clone() + pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> { + self.enabled_outputs.clone() } } |
