Extract dbus server startup

5 files changed, 157 insertions, 2 deletions

diff --git a/src/dbus/gnome_shell_screenshot.rs b/src/dbus/gnome_shell_screenshot.rs
index fad3649b..fbf3bc1f 100644
--- a/src/dbus/gnome_shell_screenshot.rs
+++ b/src/dbus/gnome_shell_screenshot.rs
@@ -1,7 +1,10 @@
 use std::path::PathBuf;
 
 use smithay::reexports::calloop;
-use zbus::{dbus_interface, fdo};
+use zbus::dbus_interface;
+use zbus::fdo::{self, RequestNameFlags};
+
+use super::Start;
 
 pub struct Screenshot {
     to_niri: calloop::channel::Sender<ScreenshotToNiri>,
@@ -55,3 +58,18 @@ impl Screenshot {
         Self { to_niri, from_niri }
     }
 }
+
+impl Start for Screenshot {
+    fn start(self) -> anyhow::Result<zbus::blocking::Connection> {
+        let conn = zbus::blocking::Connection::session()?;
+        let flags = RequestNameFlags::AllowReplacement
+            | RequestNameFlags::ReplaceExisting
+            | RequestNameFlags::DoNotQueue;
+
+        conn.object_server()
+            .at("/org/gnome/Shell/Screenshot", self)?;
+        conn.request_name_with_flags("org.gnome.Shell.Screenshot", flags)?;
+
+        Ok(conn)
+    }
+}
diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs
index ca0dfacd..b4b2cdb0 100644
--- a/src/dbus/mod.rs
+++ b/src/dbus/mod.rs
@@ -1,5 +1,95 @@
+use smithay::reexports::calloop;
+use zbus::blocking::Connection;
+use zbus::Interface;
+
+use crate::niri::State;
+
 pub mod gnome_shell_screenshot;
 pub mod mutter_display_config;
+pub mod mutter_service_channel;
+
 #[cfg(feature = "xdp-gnome-screencast")]
 pub mod mutter_screen_cast;
-pub mod mutter_service_channel;
+#[cfg(feature = "xdp-gnome-screencast")]
+use mutter_screen_cast::ScreenCast;
+
+use self::mutter_display_config::DisplayConfig;
+use self::mutter_service_channel::ServiceChannel;
+
+trait Start: Interface {
+    fn start(self) -> anyhow::Result<zbus::blocking::Connection>;
+}
+
+#[derive(Default)]
+pub struct DBusServers {
+    pub conn_service_channel: Option<Connection>,
+    pub conn_display_config: Option<Connection>,
+    pub conn_screen_shot: Option<Connection>,
+    #[cfg(feature = "xdp-gnome-screencast")]
+    pub conn_screen_cast: Option<Connection>,
+}
+
+impl DBusServers {
+    pub fn start(state: &mut State, is_session_instance: bool) {
+        let _span = tracy_client::span!("DBusServers::start");
+
+        let backend = &state.backend;
+        let niri = &mut state.niri;
+        let config = niri.config.borrow();
+
+        let mut dbus = Self::default();
+
+        if is_session_instance {
+            let service_channel = ServiceChannel::new(niri.display_handle.clone());
+            dbus.conn_service_channel = try_start(service_channel);
+        }
+
+        if is_session_instance || config.debug.dbus_interfaces_in_non_session_instances {
+            let display_config = DisplayConfig::new(backend.connectors());
+            dbus.conn_display_config = try_start(display_config);
+
+            let (to_niri, from_screenshot) = calloop::channel::channel();
+            let (to_screenshot, from_niri) = async_channel::unbounded();
+            niri.event_loop
+                .insert_source(from_screenshot, move |event, _, state| match event {
+                    calloop::channel::Event::Msg(msg) => {
+                        state.on_screen_shot_msg(&to_screenshot, msg)
+                    }
+                    calloop::channel::Event::Closed => (),
+                })
+                .unwrap();
+            let screenshot = gnome_shell_screenshot::Screenshot::new(to_niri, from_niri);
+            dbus.conn_screen_shot = try_start(screenshot);
+
+            #[cfg(feature = "xdp-gnome-screencast")]
+            {
+                let (to_niri, from_screen_cast) = calloop::channel::channel();
+                niri.event_loop
+                    .insert_source(from_screen_cast, {
+                        let to_niri = to_niri.clone();
+                        move |event, _, state| match event {
+                            calloop::channel::Event::Msg(msg) => {
+                                state.on_screen_cast_msg(&to_niri, msg)
+                            }
+                            calloop::channel::Event::Closed => (),
+                        }
+                    })
+                    .unwrap();
+                let screen_cast = ScreenCast::new(backend.connectors(), to_niri);
+                dbus.conn_screen_cast = try_start(screen_cast);
+            }
+        }
+
+        niri.dbus = Some(dbus);
+    }
+}
+
+fn try_start<I: Start>(iface: I) -> Option<Connection> {
+    match iface.start() {
+        Ok(conn) => Some(conn),
+        Err(err) => {
+            warn!("error starting {}: {err:?}", I::name());
+            None
+        }
+    }
+}
diff --git a/src/dbus/mutter_display_config.rs b/src/dbus/mutter_display_config.rs
index 1807f01d..663d3f8e 100644
--- a/src/dbus/mutter_display_config.rs
+++ b/src/dbus/mutter_display_config.rs
@@ -3,9 +3,12 @@ use std::sync::{Arc, Mutex};
 
 use serde::Serialize;
 use smithay::output::Output;
+use zbus::fdo::RequestNameFlags;
 use zbus::zvariant::{OwnedValue, Type};
 use zbus::{dbus_interface, fdo};
 
+use super::Start;
+
 pub struct DisplayConfig {
     connectors: Arc<Mutex<HashMap<String, Output>>>,
 }
@@ -86,3 +89,18 @@ impl DisplayConfig {
         Self { connectors }
     }
 }
+
+impl Start for DisplayConfig {
+    fn start(self) -> anyhow::Result<zbus::blocking::Connection> {
+        let conn = zbus::blocking::Connection::session()?;
+        let flags = RequestNameFlags::AllowReplacement
+            | RequestNameFlags::ReplaceExisting
+            | RequestNameFlags::DoNotQueue;
+
+        conn.object_server()
+            .at("/org/gnome/Mutter/DisplayConfig", self)?;
+        conn.request_name_with_flags("org.gnome.Mutter.DisplayConfig", flags)?;
+
+        Ok(conn)
+    }
+}
diff --git a/src/dbus/mutter_screen_cast.rs b/src/dbus/mutter_screen_cast.rs
index d64fa734..020d06a3 100644
--- a/src/dbus/mutter_screen_cast.rs
+++ b/src/dbus/mutter_screen_cast.rs
@@ -6,9 +6,12 @@ use std::sync::{Arc, Mutex};
 use serde::Deserialize;
 use smithay::output::Output;
 use smithay::reexports::calloop;
+use zbus::fdo::RequestNameFlags;
 use zbus::zvariant::{DeserializeDict, OwnedObjectPath, Type, Value};
 use zbus::{dbus_interface, fdo, InterfaceRef, ObjectServer, SignalContext};
 
+use super::Start;
+
 #[derive(Clone)]
 pub struct ScreenCast {
     connectors: Arc<Mutex<HashMap<String, Output>>>,
@@ -200,6 +203,21 @@ impl ScreenCast {
     }
 }
 
+impl Start for ScreenCast {
+    fn start(self) -> anyhow::Result<zbus::blocking::Connection> {
+        let conn = zbus::blocking::Connection::session()?;
+        let flags = RequestNameFlags::AllowReplacement
+            | RequestNameFlags::ReplaceExisting
+            | RequestNameFlags::DoNotQueue;
+
+        conn.object_server()
+            .at("/org/gnome/Mutter/ScreenCast", self)?;
+        conn.request_name_with_flags("org.gnome.Mutter.ScreenCast", flags)?;
+
+        Ok(conn)
+    }
+}
+
 impl Session {
     pub fn new(
         id: usize,
diff --git a/src/dbus/mutter_service_channel.rs b/src/dbus/mutter_service_channel.rs
index 29af6529..646bc4c5 100644
--- a/src/dbus/mutter_service_channel.rs
+++ b/src/dbus/mutter_service_channel.rs
@@ -5,6 +5,7 @@ use std::sync::Arc;
 use smithay::reexports::wayland_server::DisplayHandle;
 use zbus::dbus_interface;
 
+use super::Start;
 use crate::niri::ClientState;
 
 pub struct ServiceChannel {
@@ -36,3 +37,13 @@ impl ServiceChannel {
         Self { display }
     }
 }
+
+impl Start for ServiceChannel {
+    fn start(self) -> anyhow::Result<zbus::blocking::Connection> {
+        let conn = zbus::blocking::ConnectionBuilder::session()?
+            .name("org.gnome.Mutter.ServiceChannel")?
+            .serve_at("/org/gnome/Mutter/ServiceChannel", self)?
+            .build()?;
+        Ok(conn)
+    }
+}