From 126ca37d96b03a015a6481b37073060d9861d8f6 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 25 May 2025 08:41:33 +0300 Subject: Rename Un/Set/ToggleUrgent to Un/Set/ToggleWindowUrgent Overlooked this when reviewing. This change is not cfg-breaking (since you can't bind these directly), but it does break calling these actions through IPC. I don't imagine they are widely used though, and the original PR author who also implemented urgency for bars said he didn't use these actions either. --- niri-config/src/lib.rs | 12 ++++++------ niri-ipc/src/lib.rs | 6 +++--- src/input/mod.rs | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index f23e2b9d..44aeffe9 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -1888,11 +1888,11 @@ pub enum Action { OpenOverview, CloseOverview, #[knuffel(skip)] - ToggleUrgent(u64), + ToggleWindowUrgent(u64), #[knuffel(skip)] - SetUrgent(u64), + SetWindowUrgent(u64), #[knuffel(skip)] - UnsetUrgent(u64), + UnsetWindowUrgent(u64), } impl From for Action { @@ -2165,9 +2165,9 @@ impl From for Action { niri_ipc::Action::ToggleOverview {} => Self::ToggleOverview, niri_ipc::Action::OpenOverview {} => Self::OpenOverview, niri_ipc::Action::CloseOverview {} => Self::CloseOverview, - niri_ipc::Action::ToggleUrgent { id } => Self::ToggleUrgent(id), - niri_ipc::Action::SetUrgent { id } => Self::SetUrgent(id), - niri_ipc::Action::UnsetUrgent { id } => Self::UnsetUrgent(id), + niri_ipc::Action::ToggleWindowUrgent { id } => Self::ToggleWindowUrgent(id), + niri_ipc::Action::SetWindowUrgent { id } => Self::SetWindowUrgent(id), + niri_ipc::Action::UnsetWindowUrgent { id } => Self::UnsetWindowUrgent(id), } } } diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs index 95c847ae..44ad52b2 100644 --- a/niri-ipc/src/lib.rs +++ b/niri-ipc/src/lib.rs @@ -823,19 +823,19 @@ pub enum Action { /// Close the Overview. CloseOverview {}, /// Toggle urgent status of a window. - ToggleUrgent { + ToggleWindowUrgent { /// Id of the window to toggle urgent. #[cfg_attr(feature = "clap", arg(long))] id: u64, }, /// Set urgent status of a window. - SetUrgent { + SetWindowUrgent { /// Id of the window to set urgent. #[cfg_attr(feature = "clap", arg(long))] id: u64, }, /// Unset urgent status of a window. - UnsetUrgent { + UnsetWindowUrgent { /// Id of the window to unset urgent. #[cfg_attr(feature = "clap", arg(long))] id: u64, diff --git a/src/input/mod.rs b/src/input/mod.rs index 0c6cf8f3..5f31d7ee 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -1982,7 +1982,7 @@ impl State { self.niri.queue_redraw_all(); } } - Action::ToggleUrgent(id) => { + Action::ToggleWindowUrgent(id) => { let window = self .niri .layout @@ -1994,7 +1994,7 @@ impl State { } self.niri.queue_redraw_all(); } - Action::SetUrgent(id) => { + Action::SetWindowUrgent(id) => { let window = self .niri .layout @@ -2005,7 +2005,7 @@ impl State { } self.niri.queue_redraw_all(); } - Action::UnsetUrgent(id) => { + Action::UnsetWindowUrgent(id) => { let window = self .niri .layout -- cgit