livesplit-hotkey: Add new_consuming on macOS

LiveSplit · Jan 16, 2024 · 7313255 · 7313255
1 parent 655b2ec
commit 7313255
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/crates/livesplit-hotkey/src/macos/cg.rs b/crates/livesplit-hotkey/src/macos/cg.rs
@@ -210,6 +210,7 @@ bitflags::bitflags! {
 #[link(name = "CoreGraphics", kind = "framework")]
 extern "C" {
     pub fn CGEventGetFlags(event: EventRef) -> EventFlags;
+    pub fn CGEventSetType(event: EventRef, event_type: EventType);
 
     pub fn CGEventTapCreate(
         tap: EventTapLocation,

diff --git a/crates/livesplit-hotkey/src/macos/mod.rs b/crates/livesplit-hotkey/src/macos/mod.rs
@@ -16,8 +16,8 @@ use self::{
         CFRunLoopGetCurrent, CFRunLoopRemoveSource, CFRunLoopRun,
     },
     cg::{
-        CGEventGetFlags, CGEventTapCreate, EventField, EventFlags, EventMask, EventRef,
-        EventTapLocation, EventTapOptions, EventTapPlacement, EventTapProxy, EventType,
+        CGEventGetFlags, CGEventSetType, CGEventTapCreate, EventField, EventFlags, EventMask,
+        EventRef, EventTapLocation, EventTapOptions, EventTapPlacement, EventTapProxy, EventType,
     },
 };
 use crate::{ConsumePreference, Hotkey, KeyCode, Modifiers, Result};
@@ -97,9 +97,10 @@ impl Drop for Hook {
 
 impl Hook {
     pub fn new(consume: ConsumePreference) -> Result<Self> {
-        if matches!(consume, ConsumePreference::MustConsume) {
-            return Err(crate::Error::UnmatchedPreference);
-        }
+        let is_consuming = matches!(
+            consume,
+            ConsumePreference::PreferConsume | ConsumePreference::MustConsume,
+        );
 
         let state = Arc::new(State {
             hotkeys: Mutex::new(HashMap::new()),
@@ -124,7 +125,11 @@ impl Hook {
             let port = CGEventTapCreate(
                 EventTapLocation::SESSION,
                 EventTapPlacement::HEAD_INSERT_EVENT_TAP,
-                EventTapOptions::DEFAULT_TAP,
+                if is_consuming {
+                    EventTapOptions::DEFAULT_TAP
+                } else {
+                    EventTapOptions::LISTEN_ONLY
+                },
                 EventMask::KEY_DOWN,
                 Some(callback),
                 state_ptr as *mut c_void,
@@ -479,6 +484,7 @@ unsafe extern "C" fn callback(
         .get_mut(&key_code.with_modifiers(modifiers))
     {
         callback();
+        CGEventSetType(event, EventType::NULL);
     }
 
     event