zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-16 14:21:03 +02:00
Code Activity

fix(keyboard): panic when layout update channel lags behind (#869)

Browse source 
Fixes #866
This commit is contained in:
quietvoid 2025-02-16 18:01:21 -05:00 • committed by GitHub
parent 452e85f5f6
commit 551e1ce691
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/clients/compositor/hyprland.rs
View file

@ -25,7 +25,7 @@ pub struct Client {
impl Client {
pub(crate) fn new() -> Self {
let (workspace_tx, workspace_rx) = channel(16);
let (keyboard_layout_tx, keyboard_layout_rx) = channel(4);
let (keyboard_layout_tx, keyboard_layout_rx) = channel(16);
let instance = Self {
workspace_tx,

2
src/clients/compositor/sway.rs
View file

@ -166,7 +166,7 @@ impl KeyboardLayoutClient for Client {
}
fn subscribe(&self) -> Receiver<KeyboardLayoutUpdate> {
let (tx, rx) = channel(4);
let (tx, rx) = channel(16);
let client = self.connection().clone();

17
src/modules/keyboard.rs
View file

@ -210,9 +210,20 @@ impl Module<gtk::Box> for KeyboardModule {
trace!("Set up keyboard_layout subscription");
while let Ok(payload) = srx.recv().await {
debug!("Received update: {payload:?}");
module_update!(tx, KeyboardUpdate::Layout(payload));
loop {
match srx.recv().await {
Ok(payload) => {
debug!("Received update: {payload:?}");
module_update!(tx, KeyboardUpdate::Layout(payload));
}
Err(tokio::sync::broadcast::error::RecvError::Lagged(count)) => {
tracing::warn!("Channel lagged behind by {count}, this may result in unexpected or broken behaviour");
}
Err(err) => {
tracing::error!("{err:?}");
break;
}
};
}
});
}