Skip to content

Propagate macos hotkey events #555

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

Open
FlxB2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Propagate macos hotkey events #555

Show file tree
Hide file tree
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
36 changes: 18 additions & 18 deletions super_native_extensions/rust/src/darwin/macos/hot_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::{

use super::hot_key_sys::{
kEventClassKeyboard, kEventHotKeyPressed, kEventHotKeyReleased, kEventParamDirectObject,
typeEventHotKeyID, EventHandlerCallRef, EventHandlerRef, EventHotKeyID, EventHotKeyRef,
typeEventHotKeyID, CallNextEventHandler, EventHandlerCallRef, EventHandlerRef, EventHotKeyID, EventHotKeyRef,
EventRef, EventTypeSpec, GetEventDispatcherTarget, GetEventKind, GetEventParameter,
InstallEventHandler, RegisterEventHotKey, RemoveEventHandler, UnregisterEventHotKey,
};
Expand Down Expand Up @@ -167,37 +167,37 @@ impl Drop for PlatformHotKeyManager {
}

unsafe extern "C" fn event_handler(
_in_handler_call_ref: EventHandlerCallRef,
in_handler_call_ref: EventHandlerCallRef,
in_event: EventRef,
in_user_data: *mut ::std::os::raw::c_void,
) -> OSStatus {
let mut hot_key_id = EventHotKeyID {
signature: 0,
id: 0,
};
#[allow(clippy::collapsible_if)]
if GetEventParameter(

let result = GetEventParameter(
in_event,
kEventParamDirectObject,
typeEventHotKeyID,
std::ptr::null_mut(),
mem::size_of::<EventHotKeyID>() as u64,
std::ptr::null_mut(),
&mut hot_key_id as *mut _ as *mut _,
) == 0
{
if hot_key_id.signature == HOT_KEY_TAG {
let kind = GetEventKind(in_event);
let manager = in_user_data as *mut Weak<PlatformHotKeyManager>;
let manager = &*manager;
if let Some(manager) = manager.upgrade() {
if kind == kEventHotKeyPressed {
manager.on_hot_key_pressed(hot_key_id.id);
} else if kind == kEventHotKeyReleased {
manager.on_hot_key_released(hot_key_id.id);
}
);

if result == 0 && hot_key_id.signature == HOT_KEY_TAG {
let kind = GetEventKind(in_event);
let manager = in_user_data as *mut Weak<PlatformHotKeyManager>;
let manager = &*manager;
if let Some(manager) = manager.upgrade() {
if kind == kEventHotKeyPressed {
manager.on_hot_key_pressed(hot_key_id.id);
} else if kind == kEventHotKeyReleased {
manager.on_hot_key_released(hot_key_id.id);
}
}
}
0
}

CallNextEventHandler(in_handler_call_ref, in_event)
}
7 changes: 7 additions & 0 deletions super_native_extensions/rust/src/darwin/macos/hot_key_sys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,10 @@ extern "C" {
extern "C" {
pub fn GetEventDispatcherTarget() -> EventTargetRef;
}

extern "C" {
pub fn CallNextEventHandler(
inHandlerCallRef: EventHandlerCallRef,
inEvent: EventRef,
) -> OSStatus;
}