Retrieve new toplevels from cosmic-comp

Author: joshuamegnauth54

src/background.rs

@@ -1,37 +1,51 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::{Arc, Condvar, Mutex}};
 
+use ashpd::enumflags2::BitFlags;
 use cosmic::{iced::window, widget};
 use futures::{FutureExt, TryFutureExt};
 use tokio::sync::mpsc::Sender;
 use zbus::{fdo, object_server::SignalContext, zvariant};
 
-use crate::{app::CosmicPortal, fl, subscription, PortalResponse};
-
-const POP_SHELL_DEST: &str = "com.System76.PopShell";
-const POP_SHELL_PATH: &str = "/com.System76.PopShell";
+use crate::{app::CosmicPortal, fl, subscription, wayland::WaylandHelper, PortalResponse};
 
 /// Background portal backend
 ///
 /// https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.impl.portal.Background.html
 pub struct Background {
+    wayland_helper: WaylandHelper,
     tx: Sender<subscription::Event>,
 }
 
 impl Background {
-    pub const fn new(tx: Sender<subscription::Event>) -> Self {
-        Self { tx }
+    pub fn new(wayland_helper: WaylandHelper, tx: Sender<subscription::Event>) -> Self {
+        let toplevel_signal = wayland_helper.toplevel_signal();
+        let toplevel_handle = std::thread::Builder::new()
+            .name("background-toplevel-updates".into())
+            .spawn(move || Background::toplevel_signal(toplevel_signal))
+            .expect("Spawning toplevels update thread should succeed");
+
+        Self {
+            wayland_helper,
+            tx,
+            toplevel_handle,
+        }
+    }
+
+    fn toplevel_signal(signal: Arc<(Mutex<bool>, Condvar)>) {
+        let connection = zbus::blocking::Connection::session().unwrap();
+
+        loop {
+
+        }
     }
 }
 
 #[zbus::interface(name = "org.freedesktop.impl.portal.Background")]
 impl Background {
     /// Current status on running apps
-    async fn get_app_state(
-        &self,
-        // #[zbus(connection)] connection: &zbus::Connection,
-    ) -> fdo::Result<HashMap<String, AppStatus>> {
+    async fn get_app_state(&self) -> fdo::Result<HashMap<String, AppStatus>> {
         // TODO: Subscribe to Wayland window open events for running apps
         log::warn!("[background] GetAppState is currently unimplemented");
         Ok(HashMap::default())
@@ -147,7 +161,7 @@ impl Background {
 // }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, zvariant::Type)]
-#[zvariant(signature = "u")]
+#[zvariant(signature = "v")]
 pub enum AppStatus {
     /// No open windows
     Background = 0,

src/subscription.rs

@@ -144,7 +144,10 @@ pub(crate) async fn process_changes(
             let connection = zbus::ConnectionBuilder::session()?
                 .name(DBUS_NAME)?
                 .serve_at(DBUS_PATH, Access::new(wayland_helper.clone(), tx.clone()))?
-                .serve_at(DBUS_PATH, Background::new(tx.clone()))?
+                .serve_at(
+                    DBUS_PATH,
+                    Background::new(wayland_helper.clone(), tx.clone()),
+                )?
                 .serve_at(DBUS_PATH, FileChooser::new(tx.clone()))?
                 .serve_at(
                     DBUS_PATH,

src/wayland/mod.rs

@@ -87,6 +87,7 @@ struct WaylandHelperInner {
     output_infos: Mutex<HashMap<wl_output::WlOutput, OutputInfo>>,
     output_toplevels: Mutex<HashMap<wl_output::WlOutput, Vec<ZcosmicToplevelHandleV1>>>,
     toplevels: Mutex<Vec<(ZcosmicToplevelHandleV1, ToplevelInfo)>>,
+    toplevel_update: Arc<(Mutex<bool>, Condvar)>,
     qh: QueueHandle<AppData>,
     screencopy_manager: zcosmic_screencopy_manager_v2::ZcosmicScreencopyManagerV2,
     output_source_manager: ZcosmicOutputImageSourceManagerV1,
@@ -167,6 +168,7 @@ impl AppData {
             .toplevels()
             .filter_map(|(handle, info)| Some((handle.clone(), info?.clone())))
             .collect();
+        self.wayland_helper.toplevel_notify();
     }
 }
 
@@ -250,13 +252,15 @@ impl WaylandHelper {
         let screencopy_state = ScreencopyState::new(&globals, &qh);
         let shm_state = Shm::bind(&globals, &qh).unwrap();
         let zwp_dmabuf = globals.bind(&qh, 4..=4, sctk::globals::GlobalData).unwrap();
+        let toplevel_update = Arc::new((Mutex::new(false), Condvar::new()));
         let wayland_helper = WaylandHelper {
             inner: Arc::new(WaylandHelperInner {
                 conn,
                 outputs: Mutex::new(Vec::new()),
                 output_infos: Mutex::new(HashMap::new()),
                 output_toplevels: Mutex::new(HashMap::new()),
                 toplevels: Mutex::new(Vec::new()),
+                toplevel_update,
                 qh: qh.clone(),
                 screencopy_manager: screencopy_state.screencopy_manager.clone(),
                 output_source_manager: screencopy_state.output_source_manager.clone().unwrap(),
@@ -304,6 +308,10 @@ impl WaylandHelper {
         self.inner.toplevels.lock().unwrap().clone()
     }
 
+    pub fn toplevel_signal(&self) -> Arc<(Mutex<bool>, Condvar)> {
+        Arc::clone(&self.inner.toplevel_update)
+    }
+
     pub fn output_info(&self, output: &wl_output::WlOutput) -> Option<OutputInfo> {
         self.inner.output_infos.lock().unwrap().get(output).cloned()
     }