Skip to content

fix: allow the dispatch macro to work with no args #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 6, 2025
Merged

fix: allow the dispatch macro to work with no args #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e3a2d4
allow dispatch macro to work with 0 param dispatchers
sashetophizika Oct 2, 2025
0506caf
fixed macro pattern order
sashetophizika Oct 2, 2025
58117db
updated macro syntax
sashetophizika Oct 3, 2025
306feb9
updated dispatch macro examples
sashetophizika Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/bind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ fn main() -> hyprland::Result<()> {
Keyword::set("submap", "reset")?;

let instance = Instance::from_current_env()?;
dispatch!(&instance, Custom, "submap", "example")?;
dispatch!(&instance; Custom, "submap", "example")?;
println!("Press enter to revert to default keymap");
let _ = std::io::stdin()
.read(&mut [0u8])
.expect("Crashed: Run `hyprctl dispatch submap reset` to return to default submap");
dispatch!(&instance, Custom, "submap", "reset")?;
dispatch!(&instance; Custom, "submap", "reset")?;

Ok(())
}
4 changes: 2 additions & 2 deletions examples/bind_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ async fn main() -> hyprland::Result<()> {
Keyword::set_async("submap", "reset").await?;

let instance3 = Instance::from_current_env()?;
dispatch!(async; &instance3, Custom, "submap", "example").await?;
dispatch!(async; &instance3; Custom, "submap", "example").await?;
println!("Press enter to revert to default keymap");
let _ = std::io::stdin().read(&mut [0u8])?;
dispatch!(async; &instance3, Custom, "submap", "reset").await?;
dispatch!(async; &instance3; Custom, "submap", "reset").await?;
Ok(())
}
6 changes: 3 additions & 3 deletions examples/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ fn main() -> hyprland::Result<()> {
Dispatch::call(ToggleFloating(None))?;

describe("Toggling split layout");
Dispatch::call(ToggleSplit)?;
dispatch!(ToggleSplit)?;
describe("Reverting split layout");
Dispatch::call(ToggleSplit)?;

describe("Toggling opaque");
Dispatch::call(ToggleOpaque)?;
dispatch!(ToggleOpaque)?;
describe("Reverting opaque");
Dispatch::call(ToggleOpaque)?;

describe("Closing window");
Dispatch::call(KillActiveWindow)?;
dispatch!(KillActiveWindow)?;

Ok(())
}
6 changes: 3 additions & 3 deletions examples/dispatch_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ async fn main() -> hyprland::Result<()> {
Dispatch::call_async(ToggleFloating(None)).await?;

describe("Toggling split layout");
Dispatch::call_async(ToggleSplit).await?;
dispatch!(async; ToggleSplit).await?;
describe("Reverting split layout");
Dispatch::call_async(ToggleSplit).await?;

describe("Toggling opaque");
Dispatch::call_async(ToggleOpaque).await?;
dispatch!(async; ToggleOpaque).await?;
describe("Reverting opaque");
Dispatch::call_async(ToggleOpaque).await?;

describe("Closing window");
Dispatch::call_async(KillActiveWindow).await?;
dispatch!(async; KillActiveWindow).await?;

Ok(())
}
20 changes: 16 additions & 4 deletions src/dispatch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,16 +835,28 @@ impl Dispatch {
/// Macro abstraction over [Dispatch::call]
#[macro_export]
macro_rules! dispatch {
(async; $instance:expr, $dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::instance_call_async($instance, $crate::dispatch::DispatchType::$dis($($arg), *))
(async; $dis:ident) => {
$crate::dispatch::Dispatch::call_async($crate::dispatch::DispatchType::$dis)
};
(async; $dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::call_async($crate::dispatch::DispatchType::$dis($($arg), *))
};
($instance:expr, $dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::instance_call($instance, $crate::dispatch::DispatchType::$dis($($arg), *))
(async; $instance:expr; $dis:ident) => {
$crate::dispatch::Dispatch::instance_call_async($instance, $crate::dispatch::DispatchType::$dis)
};
(async; $instance:expr; $dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::instance_call_async($instance, $crate::dispatch::DispatchType::$dis($($arg), *))
};
($dis:ident) => {
$crate::dispatch::Dispatch::call($crate::dispatch::DispatchType::$dis)
};
($dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::call($crate::dispatch::DispatchType::$dis($($arg), *))
};
($instance:expr; $dis:ident) => {
$crate::dispatch::Dispatch::instance_call($instance, $crate::dispatch::DispatchType::$dis)
};
($instance:expr; $dis:ident, $( $arg:expr ), *) => {
$crate::dispatch::Dispatch::instance_call($instance, $crate::dispatch::DispatchType::$dis($($arg), *))
};
}