refactor: use calloop channel

Cargo.lock

@@ -428,7 +428,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c"
+source = "git+https://github.com/pop-os/cosmic-panel/#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c"
 dependencies = [
  "anyhow",
  "gtk4",

applets/cosmic-applet-workspaces/src/main.rs

@@ -13,6 +13,7 @@ use tokio::sync::mpsc;
 use utils::{Activate, WorkspaceEvent};
 use wayland::State;
 use window::CosmicWorkspacesWindow;
+use calloop::channel::SyncSender;
 
 mod localize;
 mod utils;
@@ -24,7 +25,7 @@ mod workspace_list;
 mod workspace_object;
 
 const ID: &str = "com.system76.CosmicAppletWorkspaces";
-static TX: OnceCell<mpsc::Sender<WorkspaceEvent>> = OnceCell::new();
+static TX: OnceCell<SyncSender<WorkspaceEvent>> = OnceCell::new();
 
 pub fn localize() {
     let localizer = crate::localize::localizer();

applets/cosmic-applet-workspaces/src/wayland.rs

@@ -49,9 +49,10 @@ use self::generated::client::{
     zext_workspace_group_handle_v1::{self, ZextWorkspaceGroupHandleV1},
     zext_workspace_handle_v1::{self, ZextWorkspaceHandleV1},
 };
+use calloop::channel::*;
 
-pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent> {
+pub fn spawn_workspaces(tx: glib::Sender<State>) -> SyncSender<WorkspaceEvent> {
-    let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100);
+    let (workspaces_tx, mut workspaces_rx) = calloop::channel::sync_channel(100);
 
     if let Ok(Ok(conn)) = std::env::var("HOST_WAYLAND_DISPLAY")
         .map_err(anyhow::Error::msg)
@@ -90,22 +91,20 @@ pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent>
                 tx,
                 running: true,
             };
-
+            let loop_handle = event_loop.handle();
-            while state.running {
+            loop_handle.insert_source(workspaces_rx, |e, _, state| {
-                let mut changed = false;
+                match e {
-                while let Ok(request) = workspaces_rx.try_recv() {
+                    Event::Msg(WorkspaceEvent::Activate(id)) => {
-                    match request {
-                        WorkspaceEvent::Activate(id) => {
                         if let Some(w) = state
                             .workspace_groups
                             .iter()
                             .find_map(|g| g.workspaces.iter().find(|w| w.name == id))
                         {
                             w.workspace_handle.activate();
-                                changed = true;
+                            state.workspace_manager.as_ref().unwrap().commit();
                         }
                     }
-                        WorkspaceEvent::Scroll(v) => {
+                    Event::Msg(WorkspaceEvent::Scroll(v)) => {
                         dbg!(v);
                         if let Some((w_g, w_i)) = state
                             .workspace_groups
@@ -134,15 +133,20 @@ pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent>
                             };
                             if let Some(w) = w_g.workspaces.get(d_i) {
                                 w.workspace_handle.activate();
-                                    changed = true;
-                                }
-                            }
-                        }
-                    }
-                }
-                if changed {
                                 state.workspace_manager.as_ref().unwrap().commit();
                             }
+                        }
+                    }
+                    Event::Closed => if let Some(workspace_manager) = &mut state.workspace_manager {
+                        for g in &mut state.workspace_groups {
+                            g.workspace_group_handle.destroy();
+                        }
+                        workspace_manager.stop();
+                    },
+                }
+
+            }).unwrap();
+            while state.running {
                 event_loop
                     .dispatch(Duration::from_millis(16), &mut state)
                     .unwrap();

applets/cosmic-applet-workspaces/src/workspace_button/mod.rs

@@ -43,13 +43,9 @@ impl WorkspaceButton {
         new_button.connect_clicked(move |_| {
             let id_clone = id.clone();
             if !is_active {
-                glib::MainContext::default().spawn_local(async move {
+                let _ = TX.get()
-                    TX.get()
                     .unwrap()
-                        .send(WorkspaceEvent::Activate(id_clone))
+                    .send(WorkspaceEvent::Activate(id_clone));
-                        .await
-                        .unwrap();
-                });
             }
         });
 

applets/cosmic-applet-workspaces/src/workspace_list/mod.rs

@@ -61,13 +61,9 @@ impl WorkspaceList {
             .build();
 
         scroll_controller.connect_scroll(|_, dx, dy| {
-            glib::MainContext::default().spawn_local(async move {
+                let _ = TX.get()
-                TX.get()
                     .unwrap()
-                    .send(WorkspaceEvent::Scroll(dx + dy))
+                    .send(WorkspaceEvent::Scroll(dx + dy));
-                    .await
-                    .unwrap();
-            });
             Inhibit::default()
         });