Skip to content

Commit

Permalink
Merge pull request #475 from CryZe/dont-repeat-hotkey-macos
Browse files Browse the repository at this point in the history 
Don't repeat the hotkeys on macOS
  • Loading branch information
@CryZe
CryZe authored Nov 9, 2021
2 parents 0acdf90 + ffb305a commit 07ae39b
Showing 1 changed file with 140 additions and 132 deletions.
272 changes: 140 additions & 132 deletions crates/livesplit-hotkey/src/macos/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,140 +162,148 @@ unsafe extern "C" fn callback(
event: EventRef,
user_info: *mut c_void,
) -> EventRef {
if matches!(ty, EventType::KeyDown) {
let key_code = cg::CGEventGetIntegerValueField(event, EventField::KeyboardEventKeycode);
let key_code = match key_code {
0x00 => KeyCode::KeyA,
0x01 => KeyCode::KeyS,
0x02 => KeyCode::KeyD,
0x03 => KeyCode::KeyF,
0x04 => KeyCode::KeyH,
0x05 => KeyCode::KeyG,
0x06 => KeyCode::KeyZ,
0x07 => KeyCode::KeyX,
0x08 => KeyCode::KeyC,
0x09 => KeyCode::KeyV,
0x0A => KeyCode::IntlBackslash,
0x0B => KeyCode::KeyB,
0x0C => KeyCode::KeyQ,
0x0D => KeyCode::KeyW,
0x0E => KeyCode::KeyE,
0x0F => KeyCode::KeyR,
0x10 => KeyCode::KeyY,
0x11 => KeyCode::KeyT,
0x12 => KeyCode::Digit1,
0x13 => KeyCode::Digit2,
0x14 => KeyCode::Digit3,
0x15 => KeyCode::Digit4,
0x16 => KeyCode::Digit6,
0x17 => KeyCode::Digit5,
0x18 => KeyCode::Equal,
0x19 => KeyCode::Digit9,
0x1A => KeyCode::Digit7,
0x1B => KeyCode::Minus,
0x1C => KeyCode::Digit8,
0x1D => KeyCode::Digit0,
0x1E => KeyCode::BracketRight,
0x1F => KeyCode::KeyO,
0x20 => KeyCode::KeyU,
0x21 => KeyCode::BracketLeft,
0x22 => KeyCode::KeyI,
0x23 => KeyCode::KeyP,
0x24 => KeyCode::Enter,
0x25 => KeyCode::KeyL,
0x26 => KeyCode::KeyJ,
0x27 => KeyCode::Quote,
0x28 => KeyCode::KeyK,
0x29 => KeyCode::Semicolon,
0x2A => KeyCode::Backslash,
0x2B => KeyCode::Comma,
0x2C => KeyCode::Slash,
0x2D => KeyCode::KeyN,
0x2E => KeyCode::KeyM,
0x2F => KeyCode::Period,
0x30 => KeyCode::Tab,
0x31 => KeyCode::Space,
0x32 => KeyCode::Backquote,
0x33 => KeyCode::Backspace,
0x34 => KeyCode::NumpadEnter, // Not Chrome
0x35 => KeyCode::Escape,
0x36 => KeyCode::MetaRight,
0x37 => KeyCode::MetaLeft,
0x38 => KeyCode::ShiftLeft,
0x39 => KeyCode::CapsLock,
0x3A => KeyCode::AltLeft,
0x3B => KeyCode::ControlLeft,
0x3C => KeyCode::ShiftRight,
0x3D => KeyCode::AltRight,
0x3E => KeyCode::ControlRight,
0x3F => KeyCode::Fn, // Not Chrome
0x40 => KeyCode::F17,
0x41 => KeyCode::NumpadDecimal,
0x43 => KeyCode::NumpadMultiply,
0x45 => KeyCode::NumpadAdd,
0x47 => KeyCode::NumLock,
0x48 => KeyCode::AudioVolumeUp,
0x49 => KeyCode::AudioVolumeDown,
0x4A => KeyCode::AudioVolumeMute,
0x4B => KeyCode::NumpadDivide,
0x4C => KeyCode::NumpadEnter,
0x4E => KeyCode::NumpadSubtract,
0x4F => KeyCode::F18,
0x50 => KeyCode::F19,
0x51 => KeyCode::NumpadEqual,
0x52 => KeyCode::Numpad0,
0x53 => KeyCode::Numpad1,
0x54 => KeyCode::Numpad2,
0x55 => KeyCode::Numpad3,
0x56 => KeyCode::Numpad4,
0x57 => KeyCode::Numpad5,
0x58 => KeyCode::Numpad6,
0x59 => KeyCode::Numpad7,
0x5A => KeyCode::F20,
0x5B => KeyCode::Numpad8,
0x5C => KeyCode::Numpad9,
0x5D => KeyCode::IntlYen,
0x5E => KeyCode::IntlRo,
0x5F => KeyCode::NumpadComma,
0x60 => KeyCode::F5,
0x61 => KeyCode::F6,
0x62 => KeyCode::F7,
0x63 => KeyCode::F3,
0x64 => KeyCode::F8,
0x65 => KeyCode::F9,
0x66 => KeyCode::Lang2,
0x67 => KeyCode::F11,
0x68 => KeyCode::Lang1, // KanaMode in Safari
0x69 => KeyCode::F13,
0x6A => KeyCode::F16,
0x6B => KeyCode::F14,
0x6D => KeyCode::F10,
0x6E => KeyCode::ContextMenu, // Missing on MDN
0x6F => KeyCode::F12,
0x71 => KeyCode::F15,
// `Help` sometimes replaces the `Insert` key on mac keyboards, Chrome prefers `Insert`.
0x72 => KeyCode::Help,
0x73 => KeyCode::Home,
0x74 => KeyCode::PageUp,
0x75 => KeyCode::Delete,
0x76 => KeyCode::F4,
0x77 => KeyCode::End,
0x78 => KeyCode::F2,
0x79 => KeyCode::PageDown,
0x7A => KeyCode::F1,
0x7B => KeyCode::ArrowLeft,
0x7C => KeyCode::ArrowRight,
0x7D => KeyCode::ArrowDown,
0x7E => KeyCode::ArrowUp,
_ => return event,
};
if !matches!(ty, EventType::KeyDown) {
return event;
}

let hotkeys = user_info as *const RegisteredKeys;
let hotkeys = &*hotkeys;
if let Some(callback) = hotkeys.lock().get_mut(&key_code) {
callback();
}
let is_repeating = cg::CGEventGetIntegerValueField(event, EventField::KeyboardEventAutorepeat);
if is_repeating != 0 {
return event;
}

let key_code = cg::CGEventGetIntegerValueField(event, EventField::KeyboardEventKeycode);
let key_code = match key_code {
0x00 => KeyCode::KeyA,
0x01 => KeyCode::KeyS,
0x02 => KeyCode::KeyD,
0x03 => KeyCode::KeyF,
0x04 => KeyCode::KeyH,
0x05 => KeyCode::KeyG,
0x06 => KeyCode::KeyZ,
0x07 => KeyCode::KeyX,
0x08 => KeyCode::KeyC,
0x09 => KeyCode::KeyV,
0x0A => KeyCode::IntlBackslash,
0x0B => KeyCode::KeyB,
0x0C => KeyCode::KeyQ,
0x0D => KeyCode::KeyW,
0x0E => KeyCode::KeyE,
0x0F => KeyCode::KeyR,
0x10 => KeyCode::KeyY,
0x11 => KeyCode::KeyT,
0x12 => KeyCode::Digit1,
0x13 => KeyCode::Digit2,
0x14 => KeyCode::Digit3,
0x15 => KeyCode::Digit4,
0x16 => KeyCode::Digit6,
0x17 => KeyCode::Digit5,
0x18 => KeyCode::Equal,
0x19 => KeyCode::Digit9,
0x1A => KeyCode::Digit7,
0x1B => KeyCode::Minus,
0x1C => KeyCode::Digit8,
0x1D => KeyCode::Digit0,
0x1E => KeyCode::BracketRight,
0x1F => KeyCode::KeyO,
0x20 => KeyCode::KeyU,
0x21 => KeyCode::BracketLeft,
0x22 => KeyCode::KeyI,
0x23 => KeyCode::KeyP,
0x24 => KeyCode::Enter,
0x25 => KeyCode::KeyL,
0x26 => KeyCode::KeyJ,
0x27 => KeyCode::Quote,
0x28 => KeyCode::KeyK,
0x29 => KeyCode::Semicolon,
0x2A => KeyCode::Backslash,
0x2B => KeyCode::Comma,
0x2C => KeyCode::Slash,
0x2D => KeyCode::KeyN,
0x2E => KeyCode::KeyM,
0x2F => KeyCode::Period,
0x30 => KeyCode::Tab,
0x31 => KeyCode::Space,
0x32 => KeyCode::Backquote,
0x33 => KeyCode::Backspace,
0x34 => KeyCode::NumpadEnter, // Not Chrome
0x35 => KeyCode::Escape,
0x36 => KeyCode::MetaRight,
0x37 => KeyCode::MetaLeft,
0x38 => KeyCode::ShiftLeft,
0x39 => KeyCode::CapsLock,
0x3A => KeyCode::AltLeft,
0x3B => KeyCode::ControlLeft,
0x3C => KeyCode::ShiftRight,
0x3D => KeyCode::AltRight,
0x3E => KeyCode::ControlRight,
0x3F => KeyCode::Fn, // Not Chrome
0x40 => KeyCode::F17,
0x41 => KeyCode::NumpadDecimal,
0x43 => KeyCode::NumpadMultiply,
0x45 => KeyCode::NumpadAdd,
0x47 => KeyCode::NumLock,
0x48 => KeyCode::AudioVolumeUp,
0x49 => KeyCode::AudioVolumeDown,
0x4A => KeyCode::AudioVolumeMute,
0x4B => KeyCode::NumpadDivide,
0x4C => KeyCode::NumpadEnter,
0x4E => KeyCode::NumpadSubtract,
0x4F => KeyCode::F18,
0x50 => KeyCode::F19,
0x51 => KeyCode::NumpadEqual,
0x52 => KeyCode::Numpad0,
0x53 => KeyCode::Numpad1,
0x54 => KeyCode::Numpad2,
0x55 => KeyCode::Numpad3,
0x56 => KeyCode::Numpad4,
0x57 => KeyCode::Numpad5,
0x58 => KeyCode::Numpad6,
0x59 => KeyCode::Numpad7,
0x5A => KeyCode::F20,
0x5B => KeyCode::Numpad8,
0x5C => KeyCode::Numpad9,
0x5D => KeyCode::IntlYen,
0x5E => KeyCode::IntlRo,
0x5F => KeyCode::NumpadComma,
0x60 => KeyCode::F5,
0x61 => KeyCode::F6,
0x62 => KeyCode::F7,
0x63 => KeyCode::F3,
0x64 => KeyCode::F8,
0x65 => KeyCode::F9,
0x66 => KeyCode::Lang2,
0x67 => KeyCode::F11,
0x68 => KeyCode::Lang1, // KanaMode in Safari
0x69 => KeyCode::F13,
0x6A => KeyCode::F16,
0x6B => KeyCode::F14,
0x6D => KeyCode::F10,
0x6E => KeyCode::ContextMenu, // Missing on MDN
0x6F => KeyCode::F12,
0x71 => KeyCode::F15,
// `Help` sometimes replaces the `Insert` key on mac keyboards, Chrome prefers `Insert`.
0x72 => KeyCode::Help,
0x73 => KeyCode::Home,
0x74 => KeyCode::PageUp,
0x75 => KeyCode::Delete,
0x76 => KeyCode::F4,
0x77 => KeyCode::End,
0x78 => KeyCode::F2,
0x79 => KeyCode::PageDown,
0x7A => KeyCode::F1,
0x7B => KeyCode::ArrowLeft,
0x7C => KeyCode::ArrowRight,
0x7D => KeyCode::ArrowDown,
0x7E => KeyCode::ArrowUp,
_ => return event,
};

let hotkeys = user_info as *const RegisteredKeys;
let hotkeys = &*hotkeys;
if let Some(callback) = hotkeys.lock().get_mut(&key_code) {
callback();
}

event
}

Expand Down

0 comments on commit 07ae39b

Please sign in to comment.