add more shortcuts and checks

This commit is contained in:
2018-08-10 00:12:35 +02:00
parent 94fa4022f0
commit e4e7719f83
9 changed files with 222 additions and 138 deletions

View File

@@ -123,51 +123,51 @@ kKey convert_key(int key)
switch(key)
{
#ifdef __APPLE__
CASE(kVK_ANSI_A, kKey::Unknown);
CASE(kVK_ANSI_S, kKey::Unknown);
CASE(kVK_ANSI_D, kKey::Unknown);
CASE(kVK_ANSI_F, kKey::Unknown);
CASE(kVK_ANSI_H, kKey::Unknown);
CASE(kVK_ANSI_G, kKey::Unknown);
CASE(kVK_ANSI_A, kKey::KeyA);
CASE(kVK_ANSI_S, kKey::KeyS);
CASE(kVK_ANSI_D, kKey::KeyD);
CASE(kVK_ANSI_F, kKey::KeyF);
CASE(kVK_ANSI_H, kKey::KeyH);
CASE(kVK_ANSI_G, kKey::KeyG);
CASE(kVK_ANSI_Z, kKey::KeyZ);
CASE(kVK_ANSI_X, kKey::Unknown);
CASE(kVK_ANSI_C, kKey::Unknown);
CASE(kVK_ANSI_V, kKey::Unknown);
CASE(kVK_ANSI_B, kKey::Unknown);
CASE(kVK_ANSI_Q, kKey::Unknown);
CASE(kVK_ANSI_W, kKey::Unknown);
CASE(kVK_ANSI_X, kKey::KeyX);
CASE(kVK_ANSI_C, kKey::KeyC);
CASE(kVK_ANSI_V, kKey::KeyV);
CASE(kVK_ANSI_B, kKey::KeyB);
CASE(kVK_ANSI_Q, kKey::KeyQ);
CASE(kVK_ANSI_W, kKey::KeyW);
CASE(kVK_ANSI_E, kKey::KeyE);
CASE(kVK_ANSI_R, kKey::Unknown);
CASE(kVK_ANSI_Y, kKey::Unknown);
CASE(kVK_ANSI_T, kKey::Unknown);
CASE(kVK_ANSI_1, kKey::Unknown);
CASE(kVK_ANSI_2, kKey::Unknown);
CASE(kVK_ANSI_3, kKey::Unknown);
CASE(kVK_ANSI_4, kKey::Unknown);
CASE(kVK_ANSI_6, kKey::Unknown);
CASE(kVK_ANSI_5, kKey::Unknown);
CASE(kVK_ANSI_R, kKey::KeyR);
CASE(kVK_ANSI_Y, kKey::KeyY);
CASE(kVK_ANSI_T, kKey::KeyT);
CASE(kVK_ANSI_1, kKey::Key1);
CASE(kVK_ANSI_2, kKey::Key2);
CASE(kVK_ANSI_3, kKey::Key3);
CASE(kVK_ANSI_4, kKey::Key4);
CASE(kVK_ANSI_6, kKey::Key6);
CASE(kVK_ANSI_5, kKey::Key5);
CASE(kVK_ANSI_Equal, kKey::Unknown);
CASE(kVK_ANSI_9, kKey::Unknown);
CASE(kVK_ANSI_7, kKey::Unknown);
CASE(kVK_ANSI_9, kKey::Key9);
CASE(kVK_ANSI_7, kKey::Key7);
CASE(kVK_ANSI_Minus, kKey::Unknown);
CASE(kVK_ANSI_8, kKey::Unknown);
CASE(kVK_ANSI_0, kKey::Unknown);
CASE(kVK_ANSI_8, kKey::Key8);
CASE(kVK_ANSI_0, kKey::Key0);
CASE(kVK_ANSI_RightBracket, kKey::Unknown);
CASE(kVK_ANSI_O, kKey::Unknown);
CASE(kVK_ANSI_U, kKey::Unknown);
CASE(kVK_ANSI_O, kKey::KeyO);
CASE(kVK_ANSI_U, kKey::KeyU);
CASE(kVK_ANSI_LeftBracket, kKey::Unknown);
CASE(kVK_ANSI_I, kKey::Unknown);
CASE(kVK_ANSI_P, kKey::Unknown);
CASE(kVK_ANSI_L, kKey::Unknown);
CASE(kVK_ANSI_J, kKey::Unknown);
CASE(kVK_ANSI_I, kKey::KeyI);
CASE(kVK_ANSI_P, kKey::KeyP);
CASE(kVK_ANSI_L, kKey::KeyL);
CASE(kVK_ANSI_J, kKey::KeyJ);
CASE(kVK_ANSI_Quote, kKey::Unknown);
CASE(kVK_ANSI_K, kKey::Unknown);
CASE(kVK_ANSI_K, kKey::KeyK);
CASE(kVK_ANSI_Semicolon, kKey::Unknown);
CASE(kVK_ANSI_Backslash, kKey::Unknown);
CASE(kVK_ANSI_Comma, kKey::Unknown);
CASE(kVK_ANSI_Slash, kKey::Unknown);
CASE(kVK_ANSI_N, kKey::Unknown);
CASE(kVK_ANSI_M, kKey::Unknown);
CASE(kVK_ANSI_N, kKey::KeyN);
CASE(kVK_ANSI_M, kKey::KeyM);
CASE(kVK_ANSI_Period, kKey::Unknown);
CASE(kVK_ANSI_Grave, kKey::Unknown);
CASE(kVK_ANSI_KeypadDecimal, kKey::Unknown);
@@ -206,22 +206,22 @@ kKey convert_key(int key)
CASE(kVK_VolumeUp, kKey::Unknown);
CASE(kVK_VolumeDown, kKey::Unknown);
CASE(kVK_Mute, kKey::Unknown);
CASE(kVK_F18, kKey::Unknown);
CASE(kVK_F19, kKey::Unknown);
CASE(kVK_F20, kKey::Unknown);
CASE(kVK_F5, kKey::Unknown);
CASE(kVK_F6, kKey::Unknown);
CASE(kVK_F7, kKey::Unknown);
CASE(kVK_F3, kKey::Unknown);
CASE(kVK_F8, kKey::Unknown);
CASE(kVK_F9, kKey::Unknown);
CASE(kVK_F11, kKey::Unknown);
CASE(kVK_F13, kKey::Unknown);
CASE(kVK_F16, kKey::Unknown);
CASE(kVK_F14, kKey::Unknown);
CASE(kVK_F10, kKey::Unknown);
CASE(kVK_F12, kKey::Unknown);
CASE(kVK_F15, kKey::Unknown);
CASE(kVK_F18, kKey::KeyF18);
CASE(kVK_F19, kKey::KeyF19);
CASE(kVK_F20, kKey::KeyF20);
CASE(kVK_F5, kKey::KeyF5);
CASE(kVK_F6, kKey::KeyF6);
CASE(kVK_F7, kKey::KeyF7);
CASE(kVK_F3, kKey::KeyF3);
CASE(kVK_F8, kKey::KeyF8);
CASE(kVK_F9, kKey::KeyF9);
CASE(kVK_F11, kKey::KeyF11);
CASE(kVK_F13, kKey::KeyF13);
CASE(kVK_F16, kKey::KeyF16);
CASE(kVK_F14, kKey::KeyF14);
CASE(kVK_F10, kKey::KeyF10);
CASE(kVK_F12, kKey::KeyF12);
CASE(kVK_F15, kKey::KeyF15);
CASE(kVK_Help, kKey::Unknown);
CASE(kVK_Home, kKey::Unknown);
CASE(kVK_PageUp, kKey::Unknown);
@@ -279,41 +279,41 @@ kKey convert_key(int key)
CASE(VK_INSERT, kKey::Unknown);
CASE(VK_DELETE, kKey::Unknown);
CASE(VK_HELP, kKey::Unknown);
CASE('0', kKey::Unknown);
CASE('1', kKey::Unknown);
CASE('2', kKey::Unknown);
CASE('3', kKey::Unknown);
CASE('4', kKey::Unknown);
CASE('5', kKey::Unknown);
CASE('6', kKey::Unknown);
CASE('7', kKey::Unknown);
CASE('8', kKey::Unknown);
CASE('9', kKey::Unknown);
CASE('A', kKey::Unknown);
CASE('B', kKey::Unknown);
CASE('C', kKey::Unknown);
CASE('D', kKey::Unknown);
CASE('0', kKey::Key0);
CASE('1', kKey::Key1);
CASE('2', kKey::Key2);
CASE('3', kKey::Key3);
CASE('4', kKey::Key4);
CASE('5', kKey::Key5);
CASE('6', kKey::Key6);
CASE('7', kKey::Key7);
CASE('8', kKey::Key8);
CASE('9', kKey::Key9);
CASE('A', kKey::KeyA);
CASE('B', kKey::KeyB);
CASE('C', kKey::KeyC);
CASE('D', kKey::KeyD);
CASE('E', kKey::KeyE);
CASE('F', kKey::Unknown);
CASE('G', kKey::Unknown);
CASE('H', kKey::Unknown);
CASE('I', kKey::Unknown);
CASE('J', kKey::Unknown);
CASE('K', kKey::Unknown);
CASE('L', kKey::Unknown);
CASE('M', kKey::Unknown);
CASE('N', kKey::Unknown);
CASE('O', kKey::Unknown);
CASE('P', kKey::Unknown);
CASE('Q', kKey::Unknown);
CASE('R', kKey::Unknown);
CASE('S', kKey::Unknown);
CASE('T', kKey::Unknown);
CASE('U', kKey::Unknown);
CASE('V', kKey::Unknown);
CASE('W', kKey::Unknown);
CASE('X', kKey::Unknown);
CASE('Y', kKey::Unknown);
CASE('F', kKey::KeyF);
CASE('G', kKey::KeyG);
CASE('H', kKey::KeyH);
CASE('I', kKey::KeyI);
CASE('J', kKey::KeyJ);
CASE('K', kKey::KeyK);
CASE('L', kKey::KeyL);
CASE('M', kKey::KeyM);
CASE('N', kKey::KeyN);
CASE('O', kKey::KeyO);
CASE('P', kKey::KeyP);
CASE('Q', kKey::KeyQ);
CASE('R', kKey::KeyR);
CASE('S', kKey::KeyS);
CASE('T', kKey::KeyT);
CASE('U', kKey::KeyU);
CASE('V', kKey::KeyV);
CASE('W', kKey::KeyW);
CASE('X', kKey::KeyX);
CASE('Y', kKey::KeyY);
CASE('Z', kKey::KeyZ);
CASE(VK_LWIN, kKey::Unknown);
CASE(VK_RWIN, kKey::Unknown);
@@ -335,30 +335,30 @@ kKey convert_key(int key)
CASE(VK_SUBTRACT, kKey::Unknown);
CASE(VK_DECIMAL, kKey::Unknown);
CASE(VK_DIVIDE, kKey::Unknown);
CASE(VK_F1, kKey::Unknown);
CASE(VK_F2, kKey::Unknown);
CASE(VK_F3, kKey::Unknown);
CASE(VK_F4, kKey::Unknown);
CASE(VK_F5, kKey::Unknown);
CASE(VK_F6, kKey::Unknown);
CASE(VK_F7, kKey::Unknown);
CASE(VK_F8, kKey::Unknown);
CASE(VK_F9, kKey::Unknown);
CASE(VK_F10, kKey::Unknown);
CASE(VK_F11, kKey::Unknown);
CASE(VK_F12, kKey::Unknown);
CASE(VK_F13, kKey::Unknown);
CASE(VK_F14, kKey::Unknown);
CASE(VK_F15, kKey::Unknown);
CASE(VK_F16, kKey::Unknown);
CASE(VK_F17, kKey::Unknown);
CASE(VK_F18, kKey::Unknown);
CASE(VK_F19, kKey::Unknown);
CASE(VK_F20, kKey::Unknown);
CASE(VK_F21, kKey::Unknown);
CASE(VK_F22, kKey::Unknown);
CASE(VK_F23, kKey::Unknown);
CASE(VK_F24, kKey::Unknown);
CASE(VK_F1, kKey::KeyF1);
CASE(VK_F2, kKey::KeyF2);
CASE(VK_F3, kKey::KeyF3);
CASE(VK_F4, kKey::KeyF4);
CASE(VK_F5, kKey::KeyF5);
CASE(VK_F6, kKey::KeyF6);
CASE(VK_F7, kKey::KeyF7);
CASE(VK_F8, kKey::KeyF8);
CASE(VK_F9, kKey::KeyF9);
CASE(VK_F10, kKey::KeyF10);
CASE(VK_F11, kKey::KeyF11);
CASE(VK_F12, kKey::KeyF12);
CASE(VK_F13, kKey::KeyF13);
CASE(VK_F14, kKey::KeyF14);
CASE(VK_F15, kKey::KeyF15);
CASE(VK_F16, kKey::KeyF16);
CASE(VK_F17, kKey::KeyF17);
CASE(VK_F18, kKey::KeyF18);
CASE(VK_F19, kKey::KeyF19);
CASE(VK_F20, kKey::KeyF20);
CASE(VK_F21, kKey::KeyF21);
CASE(VK_F22, kKey::KeyF22);
CASE(VK_F23, kKey::KeyF23);
CASE(VK_F24, kKey::KeyF24);
CASE(VK_NUMLOCK, kKey::Unknown);
CASE(VK_SCROLL, kKey::Unknown);
//CASE(VK_OEM_NEC_EQUAL, kKey::Unknown); // same as VK_OEM_FJ_JISHO