720ba7bfb0
* refactor: major module restructuring Modules now implement a "controller", which allows for separation of logic from UI code and enforces a tighter structure around how modules should be written. The introduction of this change required major refactoring or even rewriting of all modules. This also better integrates the popup into modules, making it easier for data to be passed around without fetching the same thing twice The refactor also improves some client code, switching from `ksway` to the much more stable `swayipc-async`. Partial multi-monitor for the tray module has been added. BREAKING CHANGE: The `mpd` module config has changed, moving the icons to their own object.
95 lines
2.7 KiB
Rust
95 lines
2.7 KiB
Rust
use async_once::AsyncOnce;
|
|
use color_eyre::Report;
|
|
use futures_util::StreamExt;
|
|
use lazy_static::lazy_static;
|
|
use std::sync::Arc;
|
|
use swayipc_async::{Connection, Event, EventType, WindowEvent, WorkspaceEvent};
|
|
use tokio::spawn;
|
|
use tokio::sync::broadcast::{channel, Receiver, Sender};
|
|
use tokio::sync::Mutex;
|
|
use tracing::{info, trace};
|
|
|
|
pub mod node;
|
|
|
|
pub struct SwayEventClient {
|
|
workspace_tx: Sender<Box<WorkspaceEvent>>,
|
|
_workspace_rx: Receiver<Box<WorkspaceEvent>>,
|
|
window_tx: Sender<Box<WindowEvent>>,
|
|
_window_rx: Receiver<Box<WindowEvent>>,
|
|
}
|
|
|
|
impl SwayEventClient {
|
|
fn new() -> Self {
|
|
let (workspace_tx, workspace_rx) = channel(16);
|
|
let (window_tx, window_rx) = channel(16);
|
|
|
|
let workspace_tx2 = workspace_tx.clone();
|
|
let window_tx2 = window_tx.clone();
|
|
|
|
spawn(async move {
|
|
let workspace_tx = workspace_tx2;
|
|
let window_tx = window_tx2;
|
|
|
|
let client = Connection::new().await?;
|
|
info!("Sway IPC subscription client connected");
|
|
|
|
let event_types = [EventType::Window, EventType::Workspace];
|
|
|
|
let mut events = client.subscribe(event_types).await?;
|
|
|
|
while let Some(event) = events.next().await {
|
|
trace!("event: {:?}", event);
|
|
match event? {
|
|
Event::Workspace(ev) => {
|
|
workspace_tx.send(ev)?;
|
|
}
|
|
Event::Window(ev) => {
|
|
window_tx.send(ev)?;
|
|
}
|
|
_ => {}
|
|
};
|
|
}
|
|
|
|
Ok::<(), Report>(())
|
|
});
|
|
|
|
Self {
|
|
workspace_tx,
|
|
_workspace_rx: workspace_rx,
|
|
window_tx,
|
|
_window_rx: window_rx,
|
|
}
|
|
}
|
|
|
|
/// Gets an event receiver for workspace events
|
|
pub fn subscribe_workspace(&self) -> Receiver<Box<WorkspaceEvent>> {
|
|
self.workspace_tx.subscribe()
|
|
}
|
|
|
|
/// Gets an event receiver for window events
|
|
pub fn subscribe_window(&self) -> Receiver<Box<WindowEvent>> {
|
|
self.window_tx.subscribe()
|
|
}
|
|
}
|
|
|
|
lazy_static! {
|
|
static ref CLIENT: AsyncOnce<Arc<Mutex<Connection>>> = AsyncOnce::new(async {
|
|
let client = Connection::new()
|
|
.await
|
|
.expect("Failed to connect to Sway socket");
|
|
Arc::new(Mutex::new(client))
|
|
});
|
|
static ref SUB_CLIENT: SwayEventClient = SwayEventClient::new();
|
|
}
|
|
|
|
/// Gets the sway IPC client
|
|
pub async fn get_client() -> Arc<Mutex<Connection>> {
|
|
let client = CLIENT.get().await;
|
|
Arc::clone(client)
|
|
}
|
|
|
|
/// Gets the sway IPC event subscription client
|
|
pub fn get_sub_client() -> &'static SwayEventClient {
|
|
&SUB_CLIENT
|
|
}
|