From 1a51ee3a6bbb86e65cd2b95482a23c892d0225a1 Mon Sep 17 00:00:00 2001 From: Alexis Janon <98706738+ajanon@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:00:20 +0200 Subject: [PATCH] [fix] Key release events no longer wrongly swallowed by swhkd In some cases, key release events for non-modifier keys are swallowed by swhkd. Given a simple modifier+key keybinding (ctrl+p for instance): when first pressing a key (p in this example) without a modifier, a key press event is sent to the virtual device to be consumed by other libraries and applications. Pressing the modifier key afterwards triggers the hotkey as expected. Releasing only the key at this point does not send a key release event to the virtual output, as the event_in_hotkeys boolean is true (control is still being pressed and control + p is mapped to a hotkey after all). To any library afterwards, the key is still being pressed as no release event has been received. To fix this issue, this changes the event_in_hotkey boolean to check for each hotkey if both the event and the hotkey are of the same type. This means that swhkd no longer swallows key press events if a matching hotkey triggers on key release only and it no longer swallows key release events if a matching hotkey triggers on key presses. --- swhkd/src/daemon.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swhkd/src/daemon.rs b/swhkd/src/daemon.rs index a30d927..9d80a9a 100644 --- a/swhkd/src/daemon.rs +++ b/swhkd/src/daemon.rs @@ -321,6 +321,8 @@ async fn main() -> Result<(), Box> { .all(|x| hotkey.modifiers().contains(x)) && keyboard_state.state_modifiers.len() == hotkey.modifiers().len()) && !hotkey.is_send() + && ((hotkey.is_on_release() && event.value() == 0) + || (!hotkey.is_on_release() && event.value() == 1)) }); // Don't emit event to virtual device if it's from a valid hotkey