Skip to content
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

Cancel event when CGEventTap callback returns nullptr #665

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

Cancel event when CGEventTap callback returns nullptr #665

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
12 changes: 7 additions & 5 deletions core-graphics/src/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,13 @@ unsafe extern "C" fn cg_event_tap_callback_internal(
let callback = _user_info as *mut CGEventTapCallBackFn;
let event = CGEvent::from_ptr(_event);
let new_event = (*callback)(_proxy, _etype, &event);
let event = match new_event {
Some(new_event) => new_event,
None => event,
};
ManuallyDrop::new(event).as_ptr()
match new_event {
Some(new_event) => ManuallyDrop::new(new_event).as_ptr(),
None => {
std::mem::forget(event);
std::ptr::null_mut() as crate::sys::CGEventRef
}
}
}

/// ```no_run
Expand Down