1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00

feat: new sway-mode module (#671)

* feat: add sway-mode module

* refactor: Avoid making multiple connections to SwayIPC

Now `sway::Client` is store in `ironbar.clients`, and allow dynamically
registering event listeners, instead of hardcoding events for Workspace
updates.

Remove the use of `swayipc::Connection` from `sway-mode` module, and
replace it with the new event listener system.

#671
This commit is contained in:
Rodrigo Batista de Moraes 2024-08-05 09:22:01 -03:00 committed by GitHub
parent 4f2f890c93
commit e307e15dc4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 411 additions and 72 deletions

View file

@ -41,6 +41,8 @@ pub mod networkmanager;
#[cfg(feature = "notifications")]
pub mod notifications;
pub mod script;
#[cfg(feature = "sway")]
pub mod sway;
#[cfg(feature = "sys_info")]
pub mod sysinfo;
#[cfg(feature = "tray")]

1
src/modules/sway/mod.rs Normal file
View file

@ -0,0 +1 @@
pub mod mode;

88
src/modules/sway/mode.rs Normal file
View file

@ -0,0 +1,88 @@
use crate::config::{CommonConfig, TruncateMode};
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
use crate::{await_sync, glib_recv, module_impl, try_send};
use color_eyre::{Report, Result};
use gtk::prelude::*;
use gtk::Label;
use serde::Deserialize;
use swayipc_async::ModeEvent;
use tokio::sync::mpsc;
use tracing::{info, trace};
#[derive(Debug, Deserialize, Clone)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
pub struct SwayModeModule {
// -- Common --
/// See [truncate options](module-level-options#truncate-mode).
///
/// **Default**: `null`
pub truncate: Option<TruncateMode>,
/// See [common options](module-level-options#common-options).
#[serde(flatten)]
pub common: Option<CommonConfig>,
}
impl Module<Label> for SwayModeModule {
type SendMessage = ModeEvent;
type ReceiveMessage = ();
module_impl!("sway_mode");
fn spawn_controller(
&self,
_info: &ModuleInfo,
context: &WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
_rx: mpsc::Receiver<Self::ReceiveMessage>,
) -> Result<()> {
info!("Sway Mode module started");
let tx = context.tx.clone();
await_sync(async move {
let client = context.ironbar.clients.borrow_mut().sway()?;
client
.add_listener::<swayipc_async::ModeEvent>(move |mode| {
trace!("mode: {:?}", mode);
try_send!(tx, ModuleUpdateEvent::Update(mode.clone()));
})
.await?;
Ok::<(), Report>(())
})?;
Ok(())
}
fn into_widget(
self,
context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
_info: &ModuleInfo,
) -> Result<ModuleParts<Label>> {
let label = Label::new(None);
{
let label = label.clone();
if let Some(truncate) = self.truncate {
truncate.truncate_label(&label);
}
let on_mode = move |mode: ModeEvent| {
trace!("mode: {:?}", mode);
label.set_use_markup(mode.pango_markup);
if mode.change != "default" {
label.set_markup(&mode.change)
} else {
label.set_markup("");
}
};
glib_recv!(context.subscribe(), mode => on_mode(mode));
}
Ok(ModuleParts {
widget: label,
popup: None,
})
}
}