From 35d82c92f1208c197284ee106a86f7355e19050c Mon Sep 17 00:00:00 2001 From: vcaesar Date: Wed, 12 Dec 2018 13:40:57 -0400 Subject: [PATCH 1/4] add more numpad key --- key/keycode.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/key/keycode.h b/key/keycode.h index cafeefc..d65e099 100644 --- a/key/keycode.h +++ b/key/keycode.h @@ -76,6 +76,15 @@ enum _MMKeyCode { K_NUMPAD_8 = kVK_ANSI_Keypad8, K_NUMPAD_9 = kVK_ANSI_Keypad9, K_NUMPAD_LOCK = kVK_ANSI_KeypadClear, + // + K_NUMPAD_DECIMAL = kVK_ANSI_KeypadDecimal, + K_NUMPAD_PLUS = kVK_ANSI_KeypadPlus, + K_NUMPAD_MINUS = kVK_ANSI_KeypadMinus, + K_NUMPAD_MUL = kVK_ANSI_KeypadMultiply, + K_NUMPAD_DIV = kVK_ANSI_KeypadDivide, + K_NUMPAD_CLEAR = kVK_ANSI_KeypadClear, + K_NUMPAD_ENTER = kVK_ANSI_KeypadEnter, + K_NUMPAD_EQUAL = kVK_ANSI_KeypadEquals, K_AUDIO_VOLUME_MUTE = 1007, K_AUDIO_VOLUME_DOWN = 1001, @@ -152,6 +161,7 @@ enum _MMKeyCode { K_SPACE = XK_space, K_INSERT = XK_Insert, K_PRINTSCREEN = XK_Print, + K_MENU = K_NOT_A_KEY, // K_NUMPAD_0 = K_NOT_A_KEY, K_NUMPAD_0 = XK_KP_0, @@ -165,7 +175,15 @@ enum _MMKeyCode { K_NUMPAD_8 = XK_KP_8, K_NUMPAD_9 = XK_KP_9, K_NUMPAD_LOCK = XK_Num_Lock, - K_MENU = K_NOT_A_KEY, + // + K_NUMPAD_DECIMAL = XK_KP_Decimal, + K_NUMPAD_PLUS = 78, // XK_KP_Add + K_NUMPAD_MINUS = 74, // XK_KP_Subtract + K_NUMPAD_MUL = 55, // XK_KP_Multiply + K_NUMPAD_DIV = 98, // XK_KP_Divide + K_NUMPAD_CLEAR = VK_NOT_A_KEY, + K_NUMPAD_ENTER = 96, // XK_KP_Enter + K_NUMPAD_EQUAL = XK_equal, K_AUDIO_VOLUME_MUTE = XF86XK_AudioMute, K_AUDIO_VOLUME_DOWN = XF86XK_AudioLowerVolume, @@ -252,6 +270,15 @@ enum _MMKeyCode { K_NUMPAD_8 = VK_NUMPAD8, K_NUMPAD_9 = VK_NUMPAD9, K_NUMPAD_LOCK = VK_NUMLOCK, + // VK_NUMPAD_ + K_NUMPAD_DECIMAL = VK_DECIMAL, + K_NUMPAD_PLUS = VK_ADD, + K_NUMPAD_MINUS = VK_SUBTRACT, + K_NUMPAD_MUL = VK_MULTIPLY, + K_NUMPAD_DIV = VK_DIVIDE, + K_NUMPAD_CLEAR = VK_NOT_A_KEY, + K_NUMPAD_ENTER = VK_RETURN, + K_NUMPAD_EQUAL = VK_OEM_PLUS, K_AUDIO_VOLUME_MUTE = VK_VOLUME_MUTE, K_AUDIO_VOLUME_DOWN = VK_VOLUME_DOWN, From 75e09cd935f33855d50335ac4cdfd0836132e1e2 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Wed, 12 Dec 2018 13:41:52 -0400 Subject: [PATCH 2/4] add gokey key code --- key/goKey.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/key/goKey.h b/key/goKey.h index b6d87af..75be525 100644 --- a/key/goKey.h +++ b/key/goKey.h @@ -86,7 +86,6 @@ struct KeyNames{ { "audio_repeat", K_AUDIO_REPEAT }, { "audio_random", K_AUDIO_RANDOM }, - { "num0", K_NUMPAD_0 }, { "num1", K_NUMPAD_1 }, { "num2", K_NUMPAD_2 }, @@ -99,6 +98,15 @@ struct KeyNames{ { "num9", K_NUMPAD_9 }, { "num_lock", K_NUMPAD_LOCK }, + {"num.", K_NUMPAD_DECIMAL}, + {"num+", K_NUMPAD_PLUS}, + {"num-", K_NUMPAD_MINUS}, + {"num*", K_NUMPAD_MUL}, + {"num/", K_NUMPAD_DIV}, + {"num_clear", K_NUMPAD_CLEAR}, + {"num_enter", K_NUMPAD_ENTER}, + {"num_equal", K_NUMPAD_EQUAL}, + { "numpad_0", K_NUMPAD_0 }, { "numpad_1", K_NUMPAD_1 }, { "numpad_2", K_NUMPAD_2 }, From 8582221eb3883afa6f6d21e13a6c4f0f001f6648 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Wed, 12 Dec 2018 13:43:16 -0400 Subject: [PATCH 3/4] update keys doc --- docs/keys.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/keys.md b/docs/keys.md index 58b0aa7..69f0334 100644 --- a/docs/keys.md +++ b/docs/keys.md @@ -77,6 +77,15 @@ "num9" "num_lock" + "num." + "num+" + "num-" + "num*" + "num/" + "num_clear" + "num_enter" + "num_equal" + // "numpad_0" No Linux support "numpad_0" "numpad_1" From f4694848213c099db571b85391be7e2047012ca7 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Wed, 12 Dec 2018 13:46:33 -0400 Subject: [PATCH 4/4] update code fixed a mistake --- key/keycode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/key/keycode.h b/key/keycode.h index d65e099..64fa9cf 100644 --- a/key/keycode.h +++ b/key/keycode.h @@ -181,7 +181,7 @@ enum _MMKeyCode { K_NUMPAD_MINUS = 74, // XK_KP_Subtract K_NUMPAD_MUL = 55, // XK_KP_Multiply K_NUMPAD_DIV = 98, // XK_KP_Divide - K_NUMPAD_CLEAR = VK_NOT_A_KEY, + K_NUMPAD_CLEAR = K_NOT_A_KEY, K_NUMPAD_ENTER = 96, // XK_KP_Enter K_NUMPAD_EQUAL = XK_equal, @@ -276,7 +276,7 @@ enum _MMKeyCode { K_NUMPAD_MINUS = VK_SUBTRACT, K_NUMPAD_MUL = VK_MULTIPLY, K_NUMPAD_DIV = VK_DIVIDE, - K_NUMPAD_CLEAR = VK_NOT_A_KEY, + K_NUMPAD_CLEAR = K_NOT_A_KEY, K_NUMPAD_ENTER = VK_RETURN, K_NUMPAD_EQUAL = VK_OEM_PLUS,