From d696f27f883ab63b4e66fde4431e784be477ae44 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Sun, 16 Dec 2018 13:50:22 -0400 Subject: [PATCH] update check key flags and code style, support "right shift" --- key/goKey.h | 6 ++++-- key/keycode.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/key/goKey.h b/key/goKey.h index d07faf9..199af52 100644 --- a/key/goKey.h +++ b/key/goKey.h @@ -69,8 +69,9 @@ struct KeyNames{ { "rctrl", K_RCONTROL }, { "control", K_CONTROL }, { "shift", K_SHIFT }, + { "rshift", K_RSHIFT }, + { "right_shift", K_RSHIFT }, { "capslock", K_CAPSLOCK }, - { "right_shift", K_RIGHTSHIFT }, { "space", K_SPACE }, { "printscreen", K_PRINTSCREEN }, { "insert", K_INSERT }, @@ -170,7 +171,8 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags){ strcmp(f, "rctrl") == 0 || strcmp(f, "lctrl") == 0 ) { *flags = MOD_CONTROL; } - else if( strcmp(f, "shift") == 0 ) { + else if( strcmp(f, "shift") == 0 || strcmp(f, "right_shift") == 0 || + strcmp(f, "rshift") == 0) { *flags = MOD_SHIFT; } else if( strcmp(f, "none") == 0 ) { diff --git a/key/keycode.h b/key/keycode.h index f0f109f..3712923 100644 --- a/key/keycode.h +++ b/key/keycode.h @@ -63,7 +63,7 @@ enum _MMKeyCode { K_LCONTROL = kVK_Control, K_RCONTROL = kVK_RightControl, K_SHIFT = kVK_Shift, - K_RIGHTSHIFT = kVK_RightShift, + K_RSHIFT = kVK_RightShift, K_CAPSLOCK = kVK_CapsLock, K_SPACE = kVK_Space, K_INSERT = K_NOT_A_KEY, @@ -165,7 +165,7 @@ enum _MMKeyCode { K_LCONTROL = XK_Control_L, K_RCONTROL = XK_Control_R, K_SHIFT = XK_Shift_L, - K_RIGHTSHIFT = XK_Shift_R, + K_RSHIFT = XK_Shift_R, K_CAPSLOCK = XK_Shift_Lock, K_SPACE = XK_space, K_INSERT = XK_Insert, @@ -264,7 +264,7 @@ enum _MMKeyCode { K_LCONTROL = VK_LCONTROL, K_RCONTROL = VK_RCONTROL, K_SHIFT = VK_SHIFT, - K_RIGHTSHIFT = VK_RSHIFT, + K_RSHIFT = VK_RSHIFT, K_ALT = VK_MENU, K_CAPSLOCK = VK_CAPITAL, K_SPACE = VK_SPACE,