Expose more info in DisplayConfig impl

Needed for the new xdp-gnome.

3 files changed, 44 insertions, 64 deletions

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index fe181714..786fdaaa 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -31,6 +31,8 @@ pub enum RenderResult {
     Skipped,
 }
 
+pub type IpcOutputMap = HashMap<String, (niri_ipc::Output, Option<Output>)>;
+
 impl Backend {
     pub fn init(&mut self, niri: &mut Niri) {
         match self {
@@ -110,21 +112,13 @@ impl Backend {
         }
     }
 
-    pub fn ipc_outputs(&self) -> Arc<Mutex<HashMap<String, niri_ipc::Output>>> {
+    pub fn ipc_outputs(&self) -> Arc<Mutex<IpcOutputMap>> {
         match self {
             Backend::Tty(tty) => tty.ipc_outputs(),
             Backend::Winit(winit) => winit.ipc_outputs(),
         }
     }
 
-    #[cfg_attr(not(feature = "dbus"), allow(unused))]
-    pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> {
-        match self {
-            Backend::Tty(tty) => tty.enabled_outputs(),
-            Backend::Winit(winit) => winit.enabled_outputs(),
-        }
-    }
-
     #[cfg(feature = "xdp-gnome-screencast")]
     pub fn gbm_device(
         &self,
diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index f9f4b19d..a90182a3 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -55,7 +55,7 @@ use smithay_drm_extras::edid::EdidInfo;
 use wayland_protocols::wp::linux_dmabuf::zv1::server::zwp_linux_dmabuf_feedback_v1::TrancheFlags;
 use wayland_protocols::wp::presentation_time::server::wp_presentation_feedback;
 
-use super::RenderResult;
+use super::{IpcOutputMap, RenderResult};
 use crate::frame_clock::FrameClock;
 use crate::niri::{Niri, RedrawState, State};
 use crate::render_helpers::renderer::AsGlesRenderer;
@@ -84,8 +84,7 @@ pub struct Tty {
     update_output_config_on_resume: bool,
     // Whether the debug tinting is enabled.
     debug_tint: bool,
-    ipc_outputs: Arc<Mutex<HashMap<String, niri_ipc::Output>>>,
-    enabled_outputs: Arc<Mutex<HashMap<String, Output>>>,
+    ipc_outputs: Arc<Mutex<IpcOutputMap>>,
 }
 
 pub type TtyRenderer<'render> = MultiRenderer<
@@ -293,7 +292,6 @@ impl Tty {
             update_output_config_on_resume: false,
             debug_tint: false,
             ipc_outputs: Arc::new(Mutex::new(HashMap::new())),
-            enabled_outputs: Arc::new(Mutex::new(HashMap::new())),
         })
     }
 
@@ -430,7 +428,7 @@ impl Tty {
                     self.on_output_config_changed(niri);
                 }
 
-                self.refresh_ipc_outputs();
+                self.refresh_ipc_outputs(niri);
 
                 niri.idle_notifier_state.notify_activity(&niri.seat);
                 niri.monitors_active = true;
@@ -580,7 +578,7 @@ impl Tty {
             }
         }
 
-        self.refresh_ipc_outputs();
+        self.refresh_ipc_outputs(niri);
     }
 
     fn device_removed(&mut self, device_id: dev_t, niri: &mut Niri) {
@@ -644,7 +642,7 @@ impl Tty {
         self.gpu_manager.as_mut().remove_node(&device.render_node);
         niri.event_loop.remove(device.token);
 
-        self.refresh_ipc_outputs();
+        self.refresh_ipc_outputs(niri);
     }
 
     fn connector_connected(
@@ -874,13 +872,6 @@ impl Tty {
 
         niri.add_output(output.clone(), Some(refresh_interval(mode)));
 
-        self.enabled_outputs
-            .lock()
-            .unwrap()
-            .insert(output_name, output.clone());
-        #[cfg(feature = "dbus")]
-        niri.on_enabled_outputs_changed();
-
         // Power on all monitors if necessary and queue a redraw on the new one.
         niri.event_loop.insert_idle(move |state| {
             state.niri.activate_monitors(&mut state.backend);
@@ -918,10 +909,6 @@ impl Tty {
         } else {
             error!("missing output for crtc {crtc:?}");
         };
-
-        self.enabled_outputs.lock().unwrap().remove(&surface.name);
-        #[cfg(feature = "dbus")]
-        niri.on_enabled_outputs_changed();
     }
 
     fn on_vblank(
@@ -1341,12 +1328,12 @@ impl Tty {
         }
     }
 
-    fn refresh_ipc_outputs(&self) {
+    fn refresh_ipc_outputs(&self, niri: &mut Niri) {
         let _span = tracy_client::span!("Tty::refresh_ipc_outputs");
 
         let mut ipc_outputs = HashMap::new();
 
-        for device in self.devices.values() {
+        for (node, device) in &self.devices {
             for (connector, crtc) in device.drm_scanner.crtcs() {
                 let connector_name = format!(
                     "{}-{}",
@@ -1397,7 +1384,16 @@ impl Tty {
                     }
                 }
 
-                let output = niri_ipc::Output {
+                let output = niri
+                    .global_space
+                    .outputs()
+                    .find(|output| {
+                        let tty_state: &TtyOutputState = output.user_data().get().unwrap();
+                        tty_state.node == *node && tty_state.crtc == crtc
+                    })
+                    .cloned();
+
+                let ipc_output = niri_ipc::Output {
                     name: connector_name.clone(),
                     make,
                     model,
@@ -1406,22 +1402,19 @@ impl Tty {
                     current_mode,
                 };
 
-                ipc_outputs.insert(connector_name, output);
+                ipc_outputs.insert(connector_name, (ipc_output, output));
             }
         }
 
         let mut guard = self.ipc_outputs.lock().unwrap();
         *guard = ipc_outputs;
+        niri.ipc_outputs_changed = true;
     }
 
-    pub fn ipc_outputs(&self) -> Arc<Mutex<HashMap<String, niri_ipc::Output>>> {
+    pub fn ipc_outputs(&self) -> Arc<Mutex<IpcOutputMap>> {
         self.ipc_outputs.clone()
     }
 
-    pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> {
-        self.enabled_outputs.clone()
-    }
-
     #[cfg(feature = "xdp-gnome-screencast")]
     pub fn primary_gbm_device(&self) -> Option<GbmDevice<DrmDeviceFd>> {
         self.devices.get(&self.primary_node).map(|d| d.gbm.clone())
@@ -1585,7 +1578,7 @@ impl Tty {
             }
         }
 
-        self.refresh_ipc_outputs();
+        self.refresh_ipc_outputs(niri);
     }
 
     pub fn get_device_from_node(&mut self, node: DrmNode) -> Option<&mut OutputDevice> {
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index b2ab8c33..96c0cdf8 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -17,7 +17,7 @@ use smithay::reexports::wayland_protocols::wp::presentation_time::server::wp_pre
 use smithay::reexports::winit::dpi::LogicalSize;
 use smithay::reexports::winit::window::WindowBuilder;
 
-use super::RenderResult;
+use super::{IpcOutputMap, RenderResult};
 use crate::niri::{Niri, RedrawState, State};
 use crate::render_helpers::{shaders, RenderTarget};
 use crate::utils::get_monotonic_time;
@@ -27,8 +27,7 @@ pub struct Winit {
     output: Output,
     backend: WinitGraphicsBackend<GlesRenderer>,
     damage_tracker: OutputDamageTracker,
-    ipc_outputs: Arc<Mutex<HashMap<String, niri_ipc::Output>>>,
-    enabled_outputs: Arc<Mutex<HashMap<String, Output>>>,
+    ipc_outputs: Arc<Mutex<IpcOutputMap>>,
 }
 
 impl Winit {
@@ -62,23 +61,21 @@ impl Winit {
         let physical_properties = output.physical_properties();
         let ipc_outputs = Arc::new(Mutex::new(HashMap::from([(
             "winit".to_owned(),
-            niri_ipc::Output {
-                name: output.name(),
-                make: physical_properties.make,
-                model: physical_properties.model,
-                physical_size: None,
-                modes: vec![niri_ipc::Mode {
-                    width: backend.window_size().w.clamp(0, u16::MAX as i32) as u16,
-                    height: backend.window_size().h.clamp(0, u16::MAX as i32) as u16,
-                    refresh_rate: 60_000,
-                }],
-                current_mode: Some(0),
-            },
-        )])));
-
-        let enabled_outputs = Arc::new(Mutex::new(HashMap::from([(
-            "winit".to_owned(),
-            output.clone(),
+            (
+                niri_ipc::Output {
+                    name: output.name(),
+                    make: physical_properties.make,
+                    model: physical_properties.model,
+                    physical_size: None,
+                    modes: vec![niri_ipc::Mode {
+                        width: backend.window_size().w.clamp(0, u16::MAX as i32) as u16,
+                        height: backend.window_size().h.clamp(0, u16::MAX as i32) as u16,
+                        refresh_rate: 60_000,
+                    }],
+                    current_mode: Some(0),
+                },
+                Some(output.clone()),
+            ),
         )])));
 
         let damage_tracker = OutputDamageTracker::from_output(&output);
@@ -99,9 +96,10 @@ impl Winit {
 
                     {
                         let mut ipc_outputs = winit.ipc_outputs.lock().unwrap();
-                        let mode = &mut ipc_outputs.get_mut("winit").unwrap().modes[0];
+                        let mode = &mut ipc_outputs.get_mut("winit").unwrap().0.modes[0];
                         mode.width = size.w.clamp(0, u16::MAX as i32) as u16;
                         mode.height = size.h.clamp(0, u16::MAX as i32) as u16;
+                        state.niri.ipc_outputs_changed = true;
                     }
 
                     state.niri.output_resized(&winit.output);
@@ -119,7 +117,6 @@ impl Winit {
             backend,
             damage_tracker,
             ipc_outputs,
-            enabled_outputs,
         })
     }
 
@@ -230,11 +227,7 @@ impl Winit {
         }
     }
 
-    pub fn ipc_outputs(&self) -> Arc<Mutex<HashMap<String, niri_ipc::Output>>> {
+    pub fn ipc_outputs(&self) -> Arc<Mutex<IpcOutputMap>> {
         self.ipc_outputs.clone()
     }
-
-    pub fn enabled_outputs(&self) -> Arc<Mutex<HashMap<String, Output>>> {
-        self.enabled_outputs.clone()
-    }
 }