Compare commits

...

2 Commits

Author SHA1 Message Date
paring fb3c7bc175
refactor: rename event field 2022-11-06 23:25:17 +09:00
paring 5dd72723e6
chore: update submodule 2022-11-06 23:23:37 +09:00
2 changed files with 7 additions and 7 deletions

View File

@ -16,8 +16,8 @@ pub enum NativeEventType {
pub struct NativeEvent { pub struct NativeEvent {
pub time: usize, pub time: usize,
pub event_type: NativeEventType, pub event_type: NativeEventType,
pub label: u16, pub vkey: u16,
pub key: u16, pub keycode: u16,
} }
static mut CALLBACK: Option<extern "C" fn(NativeEvent)> = None; static mut CALLBACK: Option<extern "C" fn(NativeEvent)> = None;
@ -45,14 +45,14 @@ pub extern "C" fn start_hook(callback: extern "C" fn(NativeEvent)) -> *const c_c
skyhook::types::EventData::KeyPress(label, key) => NativeEvent { skyhook::types::EventData::KeyPress(label, key) => NativeEvent {
time: get_time(event.time), time: get_time(event.time),
event_type: NativeEventType::KeyPressed, event_type: NativeEventType::KeyPressed,
label: label as u16, vkey: label as u16,
key, keycode: key,
}, },
skyhook::types::EventData::KeyRelease(label, key) => NativeEvent { skyhook::types::EventData::KeyRelease(label, key) => NativeEvent {
time: get_time(event.time), time: get_time(event.time),
event_type: NativeEventType::KeyReleased, event_type: NativeEventType::KeyReleased,
label: label as u16, vkey: label as u16,
key, keycode: key,
}, },
}; };
send_callback(event); send_callback(event);

2
vendor/skyhook vendored

@ -1 +1 @@
Subproject commit 4e7ad264aac51c8ddee24c1f808fd88a4dc09dc0 Subproject commit 3838edd7415f1adf81a79c215541f64be649c191