From 7988615a25298d8547475c5d729dd2faa8203e13 Mon Sep 17 00:00:00 2001 From: Simon Hofmann Date: Tue, 1 Feb 2022 20:45:32 +0100 Subject: [PATCH] Added missing mappings --- src/keycode.h | 24 ++++++++++++++++++++++++ src/main.cc | 9 +++++++++ 2 files changed, 33 insertions(+) diff --git a/src/keycode.h b/src/keycode.h index c5acd6e..187d8e9 100644 --- a/src/keycode.h +++ b/src/keycode.h @@ -60,11 +60,18 @@ enum _MMKeyCode { K_SHIFT = kVK_Shift, K_RIGHTSHIFT = kVK_RightShift, K_CAPSLOCK = kVK_CapsLock, + K_NUMLOCK = K_NOT_A_KEY, + K_SCROLL_LOCK = K_NOT_A_KEY, K_SPACE = kVK_Space, K_INSERT = K_NOT_A_KEY, K_PRINTSCREEN = K_NOT_A_KEY, K_MENU = K_NOT_A_KEY, + K_ADD = kVK_ANSI_KeypadPlus, + K_SUBTRACT = kVK_ANSI_KeypadMinus, + K_DIVIDE = kVK_ANSI_KeypadDivide, + K_MULTIPLY = kVK_ANSI_KeypadMultiply, + K_NUMPAD_0 = kVK_ANSI_Keypad0, K_NUMPAD_1 = kVK_ANSI_Keypad1, K_NUMPAD_2 = kVK_ANSI_Keypad2, @@ -75,6 +82,7 @@ enum _MMKeyCode { K_NUMPAD_7 = kVK_ANSI_Keypad7, K_NUMPAD_8 = kVK_ANSI_Keypad8, K_NUMPAD_9 = kVK_ANSI_Keypad9, + K_NUMPAD_DECIMAL = kVK_ANSI_KeypadDecimal, K_AUDIO_VOLUME_MUTE = 1007, K_AUDIO_VOLUME_DOWN = 1001, @@ -148,11 +156,18 @@ enum _MMKeyCode { K_SHIFT = XK_Shift_L, K_RIGHTSHIFT = XK_Shift_R, K_CAPSLOCK = XK_Shift_Lock, + K_NUMLOCK = XK_Num_Lock, + K_SCROLL_LOCK = XK_Scroll_Lock, K_SPACE = XK_space, K_INSERT = XK_Insert, K_PRINTSCREEN = XK_Print, K_MENU = K_NOT_A_KEY, + K_ADD = XK_KP_Add, + K_SUBTRACT = XK_KP_Subtract, + K_DIVIDE = XK_KP_Divide, + K_MULTIPLY = XK_KP_Multiply, + K_NUMPAD_0 = XK_KP_0, K_NUMPAD_1 = XK_KP_1, K_NUMPAD_2 = XK_KP_2, @@ -163,6 +178,7 @@ enum _MMKeyCode { K_NUMPAD_7 = XK_KP_7, K_NUMPAD_8 = XK_KP_8, K_NUMPAD_9 = XK_KP_9, + K_NUMPAD_DECIMAL = XK_KP_Decimal, K_AUDIO_VOLUME_MUTE = XF86XK_AudioMute, K_AUDIO_VOLUME_DOWN = XF86XK_AudioLowerVolume, @@ -233,11 +249,18 @@ enum _MMKeyCode { K_RIGHTSHIFT = VK_RSHIFT, K_ALT = VK_MENU, K_CAPSLOCK = VK_CAPITAL, + K_NUMLOCK = VK_NUMLOCK, + K_SCROLL_LOCK = VK_SCROLL, K_SPACE = VK_SPACE, K_PRINTSCREEN = VK_SNAPSHOT, K_INSERT = VK_INSERT, K_MENU = VK_APPS, + K_ADD = VK_ADD, + K_SUBTRACT = VK_SUBTRACT, + K_DIVIDE = VK_DIVIDE, + K_MULTIPLY = VK_MULTIPLY, + K_NUMPAD_0 = VK_NUMPAD0, K_NUMPAD_1 = VK_NUMPAD1, K_NUMPAD_2 = VK_NUMPAD2, @@ -248,6 +271,7 @@ enum _MMKeyCode { K_NUMPAD_7 = VK_NUMPAD7, K_NUMPAD_8 = VK_NUMPAD8, K_NUMPAD_9 = VK_NUMPAD9, + K_NUMPAD_DECIMAL = VK_DECIMAL, K_AUDIO_VOLUME_MUTE = VK_VOLUME_MUTE, K_AUDIO_VOLUME_DOWN = VK_VOLUME_DOWN, diff --git a/src/main.cc b/src/main.cc index 93d04de..d048dc8 100644 --- a/src/main.cc +++ b/src/main.cc @@ -305,6 +305,10 @@ static KeyNames key_names[] = {"insert", K_INSERT}, {"menu", K_MENU}, + {"caps_lock", K_CAPSLOCK}, + {"num_lock", K_NUMLOCK}, + {"scroll_lock", K_SCROLL_LOCK}, + {"audio_mute", K_AUDIO_VOLUME_MUTE}, {"audio_vol_down", K_AUDIO_VOLUME_DOWN}, {"audio_vol_up", K_AUDIO_VOLUME_UP}, @@ -329,6 +333,11 @@ static KeyNames key_names[] = {"numpad_8", K_NUMPAD_8}, {"numpad_9", K_NUMPAD_9}, + {"add", K_ADD}, + {"subtract", K_SUBTRACT}, + {"multiply", K_MULTIPLY}, + {"divide", K_DIVIDE}, + {"lights_mon_up", K_LIGHTS_MON_UP}, {"lights_mon_down", K_LIGHTS_MON_DOWN}, {"lights_kbd_toggle", K_LIGHTS_KBD_TOGGLE},