leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improv(minimize): simplify wayland subscription

Browse source 
Removes the redundant unbounded channel and forwards the subscription's
sender directly to the wayland handler.
This commit is contained in:
Michael Aaron Murphy 2025-01-21 09:55:55 +01:00
parent 2c79ca44e2
commit 0ce07ffac3
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
3 changed files with 46 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

68
cosmic-applet-minimize/src/wayland_subscription.rs
View file

@ -13,73 +13,33 @@ use cosmic::{
iced_futures::{futures, stream},
};
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;
use futures::{
channel::mpsc::{unbounded, UnboundedReceiver},
SinkExt, StreamExt,
};
use futures::SinkExt;
use image::EncodableLayout;
use once_cell::sync::Lazy;
use std::fmt::Debug;
use tokio::sync::Mutex;
use crate::wayland_handler::wayland_handler;
pub static WAYLAND_RX: Lazy<Mutex<Option<UnboundedReceiver<WaylandUpdate>>>> =
Lazy::new(|| Mutex::new(None));
pub fn wayland_subscription() -> iced::Subscription<WaylandUpdate> {
Subscription::run_with_id(
std::any::TypeId::of::<WaylandUpdate>(),
stream::channel(50, move |mut output| async move {
let mut state = State::Waiting;
stream::channel(1, move |mut output| async move {
let (calloop_tx, calloop_rx) = calloop::channel::channel();
let runtime = tokio::runtime::Handle::current();
loop {
state = start_listening(state, &mut output).await;
}
let _ = std::thread::spawn(move || {
runtime.block_on(async move {
_ = output.send(WaylandUpdate::Init(calloop_tx)).await;
wayland_handler(output.clone(), calloop_rx);
tracing::error!("Wayland handler thread died");
_ = output.send(WaylandUpdate::Finished).await;
});
});
futures::future::pending().await
}),
)
}
pub enum State {
Waiting,
Finished,
}
async fn start_listening(
state: State,
output: &mut futures::channel::mpsc::Sender<WaylandUpdate>,
) -> State {
match state {
State::Waiting => {
let mut guard = WAYLAND_RX.lock().await;
let rx = {
if guard.is_none() {
let (calloop_tx, calloop_rx) = calloop::channel::channel();
let (toplevel_tx, toplevel_rx) = unbounded();
let _ = std::thread::spawn(move || {
wayland_handler(toplevel_tx, calloop_rx);
});
*guard = Some(toplevel_rx);
_ = output.send(WaylandUpdate::Init(calloop_tx)).await;
}
guard.as_mut().unwrap()
};
match rx.next().await {
Some(u) => {
_ = output.send(u).await;
State::Waiting
}
None => {
_ = output.send(WaylandUpdate::Finished).await;
tracing::error!("Wayland handler thread died");
State::Finished
}
}
}
State::Finished => iced::futures::future::pending().await,
}
}
#[derive(Clone, Debug)]
pub enum WaylandUpdate {
Init(calloop::channel::Sender<WaylandRequest>),