dbus: Add methods to show or hide

Author: ids1024

Cargo.lock

@@ -36,6 +36,7 @@ calloop-wayland-source = "0.4.1"
 aliasable = "0.1.3"
 futures-executor = { version = "0.3.31", features = ["thread-pool"] }
 zbus = "5.9.0"
+tokio-stream = { version = "0.1.17", features = ["sync"] }
 
 [dependencies.i18n-embed]
 version = "0.16"

Cargo.toml

@@ -1,37 +1,73 @@
-struct CosmicWorkspaces;
+use cosmic::iced::{self, futures::StreamExt};
+use tokio::sync::broadcast;
+use tokio_stream::wrappers::BroadcastStream;
+
+#[derive(Clone, Debug)]
+pub enum Event {
+    Show,
+    Hide,
+}
+
+struct CosmicWorkspaces {
+    event_sender: broadcast::Sender<Event>,
+}
 
 #[zbus::interface(name = "com.system76.CosmicWorkspaces")]
 impl CosmicWorkspaces {
+    fn show(&self) {
+        let _ = self.event_sender.send(Event::Show);
+    }
+
+    fn hide(&self) {
+        let _ = self.event_sender.send(Event::Hide);
+    }
+
     #[zbus(signal)]
     async fn shown(&self, _emitter: &zbus::object_server::SignalEmitter<'_>) -> zbus::Result<()>;
+
     #[zbus(signal)]
     async fn hidden(&self, _emitter: &zbus::object_server::SignalEmitter<'_>) -> zbus::Result<()>;
 }
 
 #[derive(Clone, Debug)]
 pub struct Interface {
     emitter: zbus::object_server::SignalEmitter<'static>,
+    event_sender: broadcast::Sender<Event>,
 }
 
 impl Interface {
     pub async fn new(conn: zbus::Connection) -> zbus::Result<Self> {
+        let event_sender = broadcast::Sender::new(8);
         conn.object_server()
-            .at("/com/system76/CosmicWorkspaces", CosmicWorkspaces)
+            .at(
+                "/com/system76/CosmicWorkspaces",
+                CosmicWorkspaces {
+                    event_sender: event_sender.clone(),
+                },
+            )
             .await?;
         Ok(Interface {
             emitter: zbus::object_server::SignalEmitter::new(
                 &conn,
                 "/com/system76/CosmicWorkspaces",
             )
             .unwrap(),
+            event_sender,
         })
     }
 
     pub async fn shown(&self) -> zbus::Result<()> {
-        CosmicWorkspaces.shown(&self.emitter).await
+        self.emitter.shown(&self.emitter).await
     }
 
     pub async fn hidden(&self) -> zbus::Result<()> {
-        CosmicWorkspaces.hidden(&self.emitter).await
+        self.emitter.hidden(&self.emitter).await
+    }
+
+    pub fn subscription(&self) -> iced::Subscription<Event> {
+        iced::Subscription::run_with_id(
+            "workspaces-dbus-sun",
+            BroadcastStream::new(self.event_sender.subscribe()).filter_map(|x| async { x.ok() }),
+        )
     }
 }

src/dbus.rs

@@ -116,6 +116,7 @@ enum Msg {
     TogglePinned(ExtWorkspaceHandleV1),
     EnteredWorkspaceSidebarEntry(ExtWorkspaceHandleV1, bool),
     DbusInterface(zbus::Result<dbus::Interface>),
+    DBus(dbus::Event),
     Ignore,
 }
 
@@ -728,6 +729,12 @@ impl Application for App {
                     self.dbus_interface = Some(interface);
                 }
             }
+            Msg::DBus(evt) => {
+                return match evt {
+                    dbus::Event::Show => self.show(),
+                    dbus::Event::Hide => self.hide(),
+                };
+            }
             Msg::Ignore => {}
         }
 
@@ -812,6 +819,9 @@ impl Application for App {
         if let Some(conn) = self.conn.clone() {
             subscriptions.push(backend::subscription(conn).map(Msg::Wayland));
         }
+        if let Some(interface) = &self.dbus_interface {
+            subscriptions.push(interface.subscription().map(Msg::DBus));
+        }
         iced::Subscription::batch(subscriptions)
     }