update check key flags and code style, support "right shift"

This commit is contained in:
vcaesar 2018-12-16 13:50:22 -04:00
parent 77a7382e3b
commit d696f27f88
2 changed files with 7 additions and 5 deletions

View File

@ -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 ) {

View File

@ -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,