Skip to content

Add pressed state to hotkey listener #18

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
multiplex55 merged 1 commit into from
Jun 8, 2025
Merged

Add pressed state to hotkey listener #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 21 additions & 7 deletions src/hotkey.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ impl HotkeyTrigger {
let watch = self.key;
tracing::debug!("starting hotkey listener for {:?}", watch);
thread::spawn(move || {
let mut pressed = false;
#[cfg(feature = "unstable_grab")]
{
if watch == Key::CapsLock {
let mut shift_pressed = false;
let mut pressed = false;
let callback = move |event: Event| -> Option<Event> {
tracing::debug!("grabbed event: {:?}", event.event_type);
match event.event_type {
Expand All @@ -127,7 +129,8 @@ impl HotkeyTrigger {
if k == Key::ShiftLeft || k == Key::ShiftRight {
shift_pressed = true;
} else if k == watch {
if !shift_pressed {
if !shift_pressed && !pressed {
pressed = true;
tracing::debug!("hotkey triggered");
if let Ok(mut flag) = open.lock() {
*flag = true;
Expand All @@ -140,6 +143,8 @@ impl HotkeyTrigger {
tracing::debug!("grab key release: {:?}", k);
if k == Key::ShiftLeft || k == Key::ShiftRight {
shift_pressed = false;
} else if k == watch {
pressed = false;
}
}
_ => {}
Expand All @@ -154,14 +159,23 @@ impl HotkeyTrigger {
}

listen(move |event| {
if let EventType::KeyPress(k) = event.event_type {
tracing::debug!("key pressed: {:?}", k);
if k == watch {
tracing::debug!("hotkey triggered");
if let Ok(mut flag) = open.lock() {
*flag = true;
match event.event_type {
EventType::KeyPress(k) => {
tracing::debug!("key pressed: {:?}", k);
if k == watch && !pressed {
pressed = true;
tracing::debug!("hotkey triggered");
if let Ok(mut flag) = open.lock() {
*flag = true;
}
}
}
EventType::KeyRelease(k) => {
if k == watch {
pressed = false;
}
}
_ => {}
}
})
.unwrap();
Expand Down