From 96985e0a2ce64ffd0107ce2ae62152a1a9443d9e Mon Sep 17 00:00:00 2001 From: CrackThrough Date: Sun, 6 Nov 2022 18:09:02 +0900 Subject: [PATCH] feat: handle new EventData --- src/lib.rs | 7 +++++-- vendor/skyhook | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index a54c6f9..b6c6773 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,6 +16,7 @@ pub enum NativeEventType { pub struct NativeEvent { pub time: usize, pub event_type: NativeEventType, + pub label: u16, pub key: u16, } @@ -41,14 +42,16 @@ pub extern "C" fn start_hook(callback: extern "C" fn(NativeEvent)) -> *const c_c if let Err(e) = skyhook::run(move |event| { let event = match event.data { - skyhook::types::EventData::KeyPress(key) => NativeEvent { + skyhook::types::EventData::KeyPress(label, key) => NativeEvent { time: get_time(event.time), event_type: NativeEventType::KeyPressed, + label: label as u16, key, }, - skyhook::types::EventData::KeyRelease(key) => NativeEvent { + skyhook::types::EventData::KeyRelease(label, key) => NativeEvent { time: get_time(event.time), event_type: NativeEventType::KeyReleased, + label: label as u16, key, }, }; diff --git a/vendor/skyhook b/vendor/skyhook index 7f8737e..4e7ad26 160000 --- a/vendor/skyhook +++ b/vendor/skyhook @@ -1 +1 @@ -Subproject commit 7f8737e4ee52f53b954c6e656fe266aca147fdb5 +Subproject commit 4e7ad264aac51c8ddee24c1f808fd88a4dc09dc0