Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 344 insertions, 347 deletions

diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp
index c8805300cb..d951ce331e 100644
--- a/indra/llwindow/llkeyboardsdl.cpp
+++ b/indra/llwindow/llkeyboardsdl.cpp
@@ -1,5 +1,6 @@
 /**
- * @author This module has many fathers, and it shows.
+ * @file llkeyboardsdl.cpp
+ * @brief Handler for assignable key bindings
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -27,8 +28,8 @@
 #include "linden_common.h"
 #include "llkeyboardsdl.h"
 #include "llwindowcallbacks.h"
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_keycode.h"
+
+#include "SDL3/SDL_keycode.h"
 
 LLKeyboardSDL::LLKeyboardSDL()
 {
@@ -39,11 +40,7 @@ LLKeyboardSDL::LLKeyboardSDL()
     // Virtual key mappings from SDL_keysym.h ...
 
     // SDL maps the letter keys to the ASCII you'd expect, but it's lowercase...
-
-    // <FS:ND> Looks like we need to map those despite of SDL_TEXTINPUT handling most of this, but without
-    // the translation lower->upper here accelerators will not work.
-
-    U16 cur_char;
+    LLKeyboard::NATIVE_KEY_TYPE cur_char;
     for (cur_char = 'A'; cur_char <= 'Z'; cur_char++)
     {
         mTranslateKeyMap[cur_char] = cur_char;
@@ -71,7 +68,7 @@ LLKeyboardSDL::LLKeyboardSDL()
     //mTranslateKeyMap[SDLK_KP3] = KEY_PAGE_DOWN;
     //mTranslateKeyMap[SDLK_KP0] = KEY_INSERT;
 
-    mTranslateKeyMap[SDLK_SPACE] = ' ';     // <FS:ND/> Those are handled by SDL2 via text input, do not map them
+    mTranslateKeyMap[SDLK_SPACE] = ' ';
     mTranslateKeyMap[SDLK_RETURN] = KEY_RETURN;
     mTranslateKeyMap[SDLK_LEFT] = KEY_LEFT;
     mTranslateKeyMap[SDLK_RIGHT] = KEY_RIGHT;
@@ -113,17 +110,17 @@ LLKeyboardSDL::LLKeyboardSDL()
     mTranslateKeyMap[SDLK_F10] = KEY_F10;
     mTranslateKeyMap[SDLK_F11] = KEY_F11;
     mTranslateKeyMap[SDLK_F12] = KEY_F12;
-    mTranslateKeyMap[SDLK_PLUS]   = '='; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_COMMA]  = ','; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_MINUS]  = '-'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_PERIOD] = '.'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_BACKQUOTE] = '`'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_SEMICOLON] = ';'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_LEFTBRACKET] = '['; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_BACKSLASH] = '\\'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_RIGHTBRACKET] = ']'; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
-    mTranslateKeyMap[SDLK_QUOTE] = '\''; // <FS:ND/> Those are handled by SDL2 via text input, do not map them
+    mTranslateKeyMap[SDLK_PLUS]   = '=';
+    mTranslateKeyMap[SDLK_COMMA]  = ',';
+    mTranslateKeyMap[SDLK_MINUS]  = '-';
+    mTranslateKeyMap[SDLK_PERIOD] = '.';
+    mTranslateKeyMap[SDLK_GRAVE] = '`';
+    mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE;
+    mTranslateKeyMap[SDLK_SEMICOLON] = ';';
+    mTranslateKeyMap[SDLK_LEFTBRACKET] = '[';
+    mTranslateKeyMap[SDLK_BACKSLASH] = '\\';
+    mTranslateKeyMap[SDLK_RIGHTBRACKET] = ']';
+    mTranslateKeyMap[SDLK_APOSTROPHE] = '\'';
 
     // Build inverse map
     for (auto iter = mTranslateKeyMap.begin(); iter != mTranslateKeyMap.end(); iter++)
@@ -161,12 +158,12 @@ void LLKeyboardSDL::resetMaskKeys()
     //    It looks a bit suspicious, as it won't correct for keys that have been released.
     //    Is this the way it's supposed to work?
 
-    if(mask & KMOD_SHIFT)
+    if(mask & SDL_KMOD_SHIFT)
     {
         mKeyLevel[KEY_SHIFT] = true;
     }
 
-    if(mask & (KMOD_CTRL
+    if(mask & (SDL_KMOD_CTRL
 #ifdef LL_DARWIN
         | KMOD_GUI
 #endif
@@ -175,24 +172,24 @@ void LLKeyboardSDL::resetMaskKeys()
         mKeyLevel[KEY_CONTROL] = true;
     }
 
-    if(mask & KMOD_ALT)
+    if(mask & SDL_KMOD_ALT)
     {
         mKeyLevel[KEY_ALT] = true;
     }
 }
 
 
-MASK LLKeyboardSDL::updateModifiers(const U32 mask)
+MASK LLKeyboardSDL::updateModifiers(const MASK mask)
 {
     // translate the mask
     MASK out_mask = MASK_NONE;
 
-    if(mask & KMOD_SHIFT)
+    if(mask & SDL_KMOD_SHIFT)
     {
         out_mask |= MASK_SHIFT;
     }
 
-    if(mask & (KMOD_CTRL
+    if(mask & (SDL_KMOD_CTRL
 #ifdef LL_DARWIN
         | KMOD_GUI
 #endif
@@ -201,7 +198,7 @@ MASK LLKeyboardSDL::updateModifiers(const U32 mask)
         out_mask |= MASK_CONTROL;
     }
 
-    if(mask & KMOD_ALT)
+    if(mask & SDL_KMOD_ALT)
     {
         out_mask |= MASK_ALT;
     }
@@ -210,12 +207,12 @@ MASK LLKeyboardSDL::updateModifiers(const U32 mask)
 }
 
 
-static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask)
+LLKeyboard::NATIVE_KEY_TYPE adjustNativekeyFromUnhandledMask(const LLKeyboard::NATIVE_KEY_TYPE key, const MASK mask)
 {
     // SDL doesn't automatically adjust the keysym according to
     // whether NUMLOCK is engaged, so we massage the keysym manually.
-    U32 rtn = key;
-    if (!(mask & KMOD_NUM))
+    LLKeyboard::NATIVE_KEY_TYPE rtn = key;
+    if (!(mask & SDL_KMOD_NUM))
     {
         switch (key)
         {
@@ -235,12 +232,12 @@ static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask)
 }
 
 
-bool LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask)
+bool LLKeyboardSDL::handleKeyDown(const LLKeyboard::NATIVE_KEY_TYPE key, const MASK mask)
 {
-    U32 adjusted_nativekey;
+    LLKeyboard::NATIVE_KEY_TYPE adjusted_nativekey;
     KEY translated_key = 0;
-    U32 translated_mask = MASK_NONE;
-    bool    handled = false;
+    MASK translated_mask = MASK_NONE;
+    bool handled = false;
 
     adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
 
@@ -255,12 +252,12 @@ bool LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask)
 }
 
 
-bool LLKeyboardSDL::handleKeyUp(const U32 key, const U32 mask)
+bool LLKeyboardSDL::handleKeyUp(const LLKeyboard::NATIVE_KEY_TYPE key, const MASK mask)
 {
-    U32 adjusted_nativekey;
+    LLKeyboard::NATIVE_KEY_TYPE adjusted_nativekey;
     KEY translated_key = 0;
     U32 translated_mask = MASK_NONE;
-    bool    handled = false;
+    bool handled = false;
 
     adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
 
@@ -279,17 +276,17 @@ MASK LLKeyboardSDL::currentMask(bool for_mouse_event)
     MASK result = MASK_NONE;
     SDL_Keymod mask = SDL_GetModState();
 
-    if (mask & KMOD_SHIFT)
+    if (mask & SDL_KMOD_SHIFT)
         result |= MASK_SHIFT;
-    if (mask & KMOD_CTRL)
+    if (mask & SDL_KMOD_CTRL)
         result |= MASK_CONTROL;
-    if (mask & KMOD_ALT)
+    if (mask & SDL_KMOD_ALT)
         result |= MASK_ALT;
 
     // For keyboard events, consider Meta keys equivalent to Control
     if (!for_mouse_event)
     {
-        if (mask & KMOD_GUI)
+        if (mask & SDL_KMOD_GUI)
             result |= MASK_CONTROL;
     }
 
@@ -309,6 +306,7 @@ void LLKeyboardSDL::scanKeyboard()
             mCallbacks->handleScanKey(key, mKeyDown[key], mKeyUp[key], mKeyLevel[key]);
         }
     }
+    mCurScanKey = KEY_NONE;
 
     // Reset edges for next frame
     for (S32 key = 0; key < KEY_COUNT; key++)
@@ -323,347 +321,346 @@ void LLKeyboardSDL::scanKeyboard()
 }
 
 
-bool LLKeyboardSDL::translateNumpadKey( const U32 os_key, KEY *translated_key)
+bool LLKeyboardSDL::translateNumpadKey( const LLKeyboard::NATIVE_KEY_TYPE os_key, KEY *translated_key)
 {
     return translateKey(os_key, translated_key);
 }
 
-U16 LLKeyboardSDL::inverseTranslateNumpadKey(const KEY translated_key)
+LLKeyboard::NATIVE_KEY_TYPE LLKeyboardSDL::inverseTranslateNumpadKey(const KEY translated_key)
 {
     return inverseTranslateKey(translated_key);
 }
 
 enum class WindowsVK : U32
 {
-    VK_UNKNOWN = 0,
-    VK_CANCEL = 0x03,
-    VK_BACK = 0x08,
-    VK_TAB = 0x09,
-    VK_CLEAR = 0x0C,
-    VK_RETURN = 0x0D,
-    VK_SHIFT = 0x10,
-    VK_CONTROL = 0x11,
-    VK_MENU = 0x12,
-    VK_PAUSE = 0x13,
-    VK_CAPITAL = 0x14,
-    VK_KANA = 0x15,
-    VK_HANGUL = 0x15,
-    VK_JUNJA = 0x17,
-    VK_FINAL = 0x18,
-    VK_HANJA = 0x19,
-    VK_KANJI = 0x19,
-    VK_ESCAPE = 0x1B,
-    VK_CONVERT = 0x1C,
-    VK_NONCONVERT = 0x1D,
-    VK_ACCEPT = 0x1E,
-    VK_MODECHANGE = 0x1F,
-    VK_SPACE = 0x20,
-    VK_PRIOR = 0x21,
-    VK_NEXT = 0x22,
-    VK_END = 0x23,
-    VK_HOME = 0x24,
-    VK_LEFT = 0x25,
-    VK_UP = 0x26,
-    VK_RIGHT = 0x27,
-    VK_DOWN = 0x28,
-    VK_SELECT = 0x29,
-    VK_PRINT = 0x2A,
-    VK_EXECUTE = 0x2B,
-    VK_SNAPSHOT = 0x2C,
-    VK_INSERT = 0x2D,
-    VK_DELETE = 0x2E,
-    VK_HELP = 0x2F,
-    VK_0 = 0x30,
-    VK_1 = 0x31,
-    VK_2 = 0x32,
-    VK_3 = 0x33,
-    VK_4 = 0x34,
-    VK_5 = 0x35,
-    VK_6 = 0x36,
-    VK_7 = 0x37,
-    VK_8 = 0x38,
-    VK_9 = 0x39,
-    VK_A = 0x41,
-    VK_B = 0x42,
-    VK_C = 0x43,
-    VK_D = 0x44,
-    VK_E = 0x45,
-    VK_F = 0x46,
-    VK_G = 0x47,
-    VK_H = 0x48,
-    VK_I = 0x49,
-    VK_J = 0x4A,
-    VK_K = 0x4B,
-    VK_L = 0x4C,
-    VK_M = 0x4D,
-    VK_N = 0x4E,
-    VK_O = 0x4F,
-    VK_P = 0x50,
-    VK_Q = 0x51,
-    VK_R = 0x52,
-    VK_S = 0x53,
-    VK_T = 0x54,
-    VK_U = 0x55,
-    VK_V = 0x56,
-    VK_W = 0x57,
-    VK_X = 0x58,
-    VK_Y = 0x59,
-    VK_Z = 0x5A,
-    VK_LWIN = 0x5B,
-    VK_RWIN = 0x5C,
-    VK_APPS = 0x5D,
-    VK_SLEEP = 0x5F,
-    VK_NUMPAD0 = 0x60,
-    VK_NUMPAD1 = 0x61,
-    VK_NUMPAD2 = 0x62,
-    VK_NUMPAD3 = 0x63,
-    VK_NUMPAD4 = 0x64,
-    VK_NUMPAD5 = 0x65,
-    VK_NUMPAD6 = 0x66,
-    VK_NUMPAD7 = 0x67,
-    VK_NUMPAD8 = 0x68,
-    VK_NUMPAD9 = 0x69,
-    VK_MULTIPLY = 0x6A,
-    VK_ADD = 0x6B,
-    VK_SEPARATOR = 0x6C,
-    VK_SUBTRACT = 0x6D,
-    VK_DECIMAL = 0x6E,
-    VK_DIVIDE = 0x6F,
-    VK_F1 = 0x70,
-    VK_F2 = 0x71,
-    VK_F3 = 0x72,
-    VK_F4 = 0x73,
-    VK_F5 = 0x74,
-    VK_F6 = 0x75,
-    VK_F7 = 0x76,
-    VK_F8 = 0x77,
-    VK_F9 = 0x78,
-    VK_F10 = 0x79,
-    VK_F11 = 0x7A,
-    VK_F12 = 0x7B,
-    VK_F13 = 0x7C,
-    VK_F14 = 0x7D,
-    VK_F15 = 0x7E,
-    VK_F16 = 0x7F,
-    VK_F17 = 0x80,
-    VK_F18 = 0x81,
-    VK_F19 = 0x82,
-    VK_F20 = 0x83,
-    VK_F21 = 0x84,
-    VK_F22 = 0x85,
-    VK_F23 = 0x86,
-    VK_F24 = 0x87,
-    VK_NUMLOCK = 0x90,
-    VK_SCROLL = 0x91,
-    VK_LSHIFT = 0xA0,
-    VK_RSHIFT = 0xA1,
-    VK_LCONTROL = 0xA2,
-    VK_RCONTROL = 0xA3,
-    VK_LMENU = 0xA4,
-    VK_RMENU = 0xA5,
-    VK_BROWSER_BACK = 0xA6,
-    VK_BROWSER_FORWARD = 0xA7,
-    VK_BROWSER_REFRESH = 0xA8,
-    VK_BROWSER_STOP = 0xA9,
-    VK_BROWSER_SEARCH = 0xAA,
-    VK_BROWSER_FAVORITES = 0xAB,
-    VK_BROWSER_HOME = 0xAC,
-    VK_VOLUME_MUTE = 0xAD,
-    VK_VOLUME_DOWN = 0xAE,
-    VK_VOLUME_UP = 0xAF,
-    VK_MEDIA_NEXT_TRACK = 0xB0,
-    VK_MEDIA_PREV_TRACK = 0xB1,
-    VK_MEDIA_STOP = 0xB2,
-    VK_MEDIA_PLAY_PAUSE = 0xB3,
-    VK_MEDIA_LAUNCH_MAIL = 0xB4,
-    VK_MEDIA_LAUNCH_MEDIA_SELECT = 0xB5,
-    VK_MEDIA_LAUNCH_APP1 = 0xB6,
-    VK_MEDIA_LAUNCH_APP2 = 0xB7,
-    VK_OEM_1 = 0xBA,
-    VK_OEM_PLUS = 0xBB,
-    VK_OEM_COMMA = 0xBC,
-    VK_OEM_MINUS = 0xBD,
-    VK_OEM_PERIOD = 0xBE,
-    VK_OEM_2 = 0xBF,
-    VK_OEM_3 = 0xC0,
-    VK_OEM_4 = 0xDB,
-    VK_OEM_5 = 0xDC,
-    VK_OEM_6 = 0xDD,
-    VK_OEM_7 = 0xDE,
-    VK_OEM_8 = 0xDF,
-    VK_OEM_102 = 0xE2,
-    VK_PROCESSKEY = 0xE5,
-    VK_PACKET = 0xE7,
-    VK_ATTN = 0xF6,
-    VK_CRSEL = 0xF7,
-    VK_EXSEL = 0xF8,
-    VK_EREOF = 0xF9,
-    VK_PLAY = 0xFA,
-    VK_ZOOM = 0xFB,
-    VK_NONAME = 0xFC,
-    VK_PA1 = 0xFD,
-    VK_OEM_CLEAR = 0xFE,
+    LL_VK_UNKNOWN = 0,
+    LL_VK_CANCEL = 0x03,
+    LL_VK_BACK = 0x08,
+    LL_VK_TAB = 0x09,
+    LL_VK_CLEAR = 0x0C,
+    LL_VK_RETURN = 0x0D,
+    LL_VK_SHIFT = 0x10,
+    LL_VK_CONTROL = 0x11,
+    LL_VK_MENU = 0x12,
+    LL_VK_PAUSE = 0x13,
+    LL_VK_CAPITAL = 0x14,
+    LL_VK_KANA = 0x15,
+    LL_VK_HANGUL = 0x15,
+    LL_VK_JUNJA = 0x17,
+    LL_VK_FINAL = 0x18,
+    LL_VK_HANJA = 0x19,
+    LL_VK_KANJI = 0x19,
+    LL_VK_ESCAPE = 0x1B,
+    LL_VK_CONVERT = 0x1C,
+    LL_VK_NONCONVERT = 0x1D,
+    LL_VK_ACCEPT = 0x1E,
+    LL_VK_MODECHANGE = 0x1F,
+    LL_VK_SPACE = 0x20,
+    LL_VK_PRIOR = 0x21,
+    LL_VK_NEXT = 0x22,
+    LL_VK_END = 0x23,
+    LL_VK_HOME = 0x24,
+    LL_VK_LEFT = 0x25,
+    LL_VK_UP = 0x26,
+    LL_VK_RIGHT = 0x27,
+    LL_VK_DOWN = 0x28,
+    LL_VK_SELECT = 0x29,
+    LL_VK_PRINT = 0x2A,
+    LL_VK_EXECUTE = 0x2B,
+    LL_VK_SNAPSHOT = 0x2C,
+    LL_VK_INSERT = 0x2D,
+    LL_VK_DELETE = 0x2E,
+    LL_VK_HELP = 0x2F,
+    LL_VK_0 = 0x30,
+    LL_VK_1 = 0x31,
+    LL_VK_2 = 0x32,
+    LL_VK_3 = 0x33,
+    LL_VK_4 = 0x34,
+    LL_VK_5 = 0x35,
+    LL_VK_6 = 0x36,
+    LL_VK_7 = 0x37,
+    LL_VK_8 = 0x38,
+    LL_VK_9 = 0x39,
+    LL_VK_A = 0x41,
+    LL_VK_B = 0x42,
+    LL_VK_C = 0x43,
+    LL_VK_D = 0x44,
+    LL_VK_E = 0x45,
+    LL_VK_F = 0x46,
+    LL_VK_G = 0x47,
+    LL_VK_H = 0x48,
+    LL_VK_I = 0x49,
+    LL_VK_J = 0x4A,
+    LL_VK_K = 0x4B,
+    LL_VK_L = 0x4C,
+    LL_VK_M = 0x4D,
+    LL_VK_N = 0x4E,
+    LL_VK_O = 0x4F,
+    LL_VK_P = 0x50,
+    LL_VK_Q = 0x51,
+    LL_VK_R = 0x52,
+    LL_VK_S = 0x53,
+    LL_VK_T = 0x54,
+    LL_VK_U = 0x55,
+    LL_VK_V = 0x56,
+    LL_VK_W = 0x57,
+    LL_VK_X = 0x58,
+    LL_VK_Y = 0x59,
+    LL_VK_Z = 0x5A,
+    LL_VK_LWIN = 0x5B,
+    LL_VK_RWIN = 0x5C,
+    LL_VK_APPS = 0x5D,
+    LL_VK_SLEEP = 0x5F,
+    LL_VK_NUMPAD0 = 0x60,
+    LL_VK_NUMPAD1 = 0x61,
+    LL_VK_NUMPAD2 = 0x62,
+    LL_VK_NUMPAD3 = 0x63,
+    LL_VK_NUMPAD4 = 0x64,
+    LL_VK_NUMPAD5 = 0x65,
+    LL_VK_NUMPAD6 = 0x66,
+    LL_VK_NUMPAD7 = 0x67,
+    LL_VK_NUMPAD8 = 0x68,
+    LL_VK_NUMPAD9 = 0x69,
+    LL_VK_MULTIPLY = 0x6A,
+    LL_VK_ADD = 0x6B,
+    LL_VK_SEPARATOR = 0x6C,
+    LL_VK_SUBTRACT = 0x6D,
+    LL_VK_DECIMAL = 0x6E,
+    LL_VK_DIVIDE = 0x6F,
+    LL_VK_F1 = 0x70,
+    LL_VK_F2 = 0x71,
+    LL_VK_F3 = 0x72,
+    LL_VK_F4 = 0x73,
+    LL_VK_F5 = 0x74,
+    LL_VK_F6 = 0x75,
+    LL_VK_F7 = 0x76,
+    LL_VK_F8 = 0x77,
+    LL_VK_F9 = 0x78,
+    LL_VK_F10 = 0x79,
+    LL_VK_F11 = 0x7A,
+    LL_VK_F12 = 0x7B,
+    LL_VK_F13 = 0x7C,
+    LL_VK_F14 = 0x7D,
+    LL_VK_F15 = 0x7E,
+    LL_VK_F16 = 0x7F,
+    LL_VK_F17 = 0x80,
+    LL_VK_F18 = 0x81,
+    LL_VK_F19 = 0x82,
+    LL_VK_F20 = 0x83,
+    LL_VK_F21 = 0x84,
+    LL_VK_F22 = 0x85,
+    LL_VK_F23 = 0x86,
+    LL_VK_F24 = 0x87,
+    LL_VK_NUMLOCK = 0x90,
+    LL_VK_SCROLL = 0x91,
+    LL_VK_LSHIFT = 0xA0,
+    LL_VK_RSHIFT = 0xA1,
+    LL_VK_LCONTROL = 0xA2,
+    LL_VK_RCONTROL = 0xA3,
+    LL_VK_LMENU = 0xA4,
+    LL_VK_RMENU = 0xA5,
+    LL_VK_BROWSER_BACK = 0xA6,
+    LL_VK_BROWSER_FORWARD = 0xA7,
+    LL_VK_BROWSER_REFRESH = 0xA8,
+    LL_VK_BROWSER_STOP = 0xA9,
+    LL_VK_BROWSER_SEARCH = 0xAA,
+    LL_VK_BROWSER_FAVORITES = 0xAB,
+    LL_VK_BROWSER_HOME = 0xAC,
+    LL_VK_VOLUME_MUTE = 0xAD,
+    LL_VK_VOLUME_DOWN = 0xAE,
+    LL_VK_VOLUME_UP = 0xAF,
+    LL_VK_MEDIA_NEXT_TRACK = 0xB0,
+    LL_VK_MEDIA_PREV_TRACK = 0xB1,
+    LL_VK_MEDIA_STOP = 0xB2,
+    LL_VK_MEDIA_PLAY_PAUSE = 0xB3,
+    LL_VK_MEDIA_LAUNCH_MAIL = 0xB4,
+    LL_VK_MEDIA_LAUNCH_MEDIA_SELECT = 0xB5,
+    LL_VK_MEDIA_LAUNCH_APP1 = 0xB6,
+    LL_VK_MEDIA_LAUNCH_APP2 = 0xB7,
+    LL_VK_OEM_1 = 0xBA,
+    LL_VK_OEM_PLUS = 0xBB,
+    LL_VK_OEM_COMMA = 0xBC,
+    LL_VK_OEM_MINUS = 0xBD,
+    LL_VK_OEM_PERIOD = 0xBE,
+    LL_VK_OEM_2 = 0xBF,
+    LL_VK_OEM_3 = 0xC0,
+    LL_VK_OEM_4 = 0xDB,
+    LL_VK_OEM_5 = 0xDC,
+    LL_VK_OEM_6 = 0xDD,
+    LL_VK_OEM_7 = 0xDE,
+    LL_VK_OEM_8 = 0xDF,
+    LL_VK_OEM_102 = 0xE2,
+    LL_VK_PROCESSKEY = 0xE5,
+    LL_VK_PACKET = 0xE7,
+    LL_VK_ATTN = 0xF6,
+    LL_VK_CRSEL = 0xF7,
+    LL_VK_EXSEL = 0xF8,
+    LL_VK_EREOF = 0xF9,
+    LL_VK_PLAY = 0xFA,
+    LL_VK_ZOOM = 0xFB,
+    LL_VK_NONAME = 0xFC,
+    LL_VK_PA1 = 0xFD,
+    LL_VK_OEM_CLEAR = 0xFE,
 };
 
-std::map< U32, U32 > mSDL2_to_Win;
-std::set< U32 > mIgnoreSDL2Keys;
+std::map< U32, U32 > mSDL_to_Win;
 
-U32 LLKeyboardSDL::mapSDL2toWin( U32 aSymbol )
+U32 LLKeyboardSDL::mapSDLtoWin( U32 aSymbol )
 {
-    // <FS:ND> Map SDLK_ virtual keys to Windows VK_ virtual keys.
-    // Text is handled via unicode input (SDL_TEXTINPUT event) and does not need to be translated into VK_ values as those match already.
-    if( mSDL2_to_Win.empty() )
+    // <FS:ND> Map SDLK_ virtual keys to Windows LL_VK_ virtual keys.
+    // Text is handled via unicode input (SDL_TEXTINPUT event) and does not need to be translated into LL_VK_ values as those match already.
+    if( mSDL_to_Win.empty() )
     {
 
-        mSDL2_to_Win[ SDLK_BACKSPACE ] = (U32)WindowsVK::VK_BACK;
-        mSDL2_to_Win[ SDLK_TAB ] = (U32)WindowsVK::VK_TAB;
-        mSDL2_to_Win[ 12 ] = (U32)WindowsVK::VK_CLEAR;
-        mSDL2_to_Win[ SDLK_RETURN ] = (U32)WindowsVK::VK_RETURN;
-        mSDL2_to_Win[ 19 ] = (U32)WindowsVK::VK_PAUSE;
-        mSDL2_to_Win[ SDLK_ESCAPE ] = (U32)WindowsVK::VK_ESCAPE;
-        mSDL2_to_Win[ SDLK_SPACE ] = (U32)WindowsVK::VK_SPACE;
-        mSDL2_to_Win[ SDLK_QUOTE ] = (U32)WindowsVK::VK_OEM_7;
-        mSDL2_to_Win[ SDLK_COMMA ] = (U32)WindowsVK::VK_OEM_COMMA;
-        mSDL2_to_Win[ SDLK_MINUS ] = (U32)WindowsVK::VK_OEM_MINUS;
-        mSDL2_to_Win[ SDLK_PERIOD ] = (U32)WindowsVK::VK_OEM_PERIOD;
-        mSDL2_to_Win[ SDLK_SLASH ] = (U32)WindowsVK::VK_OEM_2;
+        mSDL_to_Win[ SDLK_BACKSPACE ] = (U32)WindowsVK::LL_VK_BACK;
+        mSDL_to_Win[ SDLK_TAB ] = (U32)WindowsVK::LL_VK_TAB;
+        mSDL_to_Win[ 12 ] = (U32)WindowsVK::LL_VK_CLEAR;
+        mSDL_to_Win[ SDLK_RETURN ] = (U32)WindowsVK::LL_VK_RETURN;
+        mSDL_to_Win[ 19 ] = (U32)WindowsVK::LL_VK_PAUSE;
+        mSDL_to_Win[ SDLK_ESCAPE ] = (U32)WindowsVK::LL_VK_ESCAPE;
+        mSDL_to_Win[ SDLK_SPACE ] = (U32)WindowsVK::LL_VK_SPACE;
+        mSDL_to_Win[ SDLK_APOSTROPHE ] = (U32)WindowsVK::LL_VK_OEM_7;
+        mSDL_to_Win[ SDLK_COMMA ] = (U32)WindowsVK::LL_VK_OEM_COMMA;
+        mSDL_to_Win[ SDLK_MINUS ] = (U32)WindowsVK::LL_VK_OEM_MINUS;
+        mSDL_to_Win[ SDLK_PERIOD ] = (U32)WindowsVK::LL_VK_OEM_PERIOD;
+        mSDL_to_Win[ SDLK_SLASH ] = (U32)WindowsVK::LL_VK_OEM_2;
 
-        mSDL2_to_Win[ SDLK_0 ] = (U32)WindowsVK::VK_0;
-        mSDL2_to_Win[ SDLK_1 ] = (U32)WindowsVK::VK_1;
-        mSDL2_to_Win[ SDLK_2 ] = (U32)WindowsVK::VK_2;
-        mSDL2_to_Win[ SDLK_3 ] = (U32)WindowsVK::VK_3;
-        mSDL2_to_Win[ SDLK_4 ] = (U32)WindowsVK::VK_4;
-        mSDL2_to_Win[ SDLK_5 ] = (U32)WindowsVK::VK_5;
-        mSDL2_to_Win[ SDLK_6 ] = (U32)WindowsVK::VK_6;
-        mSDL2_to_Win[ SDLK_7 ] = (U32)WindowsVK::VK_7;
-        mSDL2_to_Win[ SDLK_8 ] = (U32)WindowsVK::VK_8;
-        mSDL2_to_Win[ SDLK_9 ] = (U32)WindowsVK::VK_9;
+        mSDL_to_Win[ SDLK_0 ] = (U32)WindowsVK::LL_VK_0;
+        mSDL_to_Win[ SDLK_1 ] = (U32)WindowsVK::LL_VK_1;
+        mSDL_to_Win[ SDLK_2 ] = (U32)WindowsVK::LL_VK_2;
+        mSDL_to_Win[ SDLK_3 ] = (U32)WindowsVK::LL_VK_3;
+        mSDL_to_Win[ SDLK_4 ] = (U32)WindowsVK::LL_VK_4;
+        mSDL_to_Win[ SDLK_5 ] = (U32)WindowsVK::LL_VK_5;
+        mSDL_to_Win[ SDLK_6 ] = (U32)WindowsVK::LL_VK_6;
+        mSDL_to_Win[ SDLK_7 ] = (U32)WindowsVK::LL_VK_7;
+        mSDL_to_Win[ SDLK_8 ] = (U32)WindowsVK::LL_VK_8;
+        mSDL_to_Win[ SDLK_9 ] = (U32)WindowsVK::LL_VK_9;
 
-        mSDL2_to_Win[ SDLK_SEMICOLON ] = (U32)WindowsVK::VK_OEM_1;
-        mSDL2_to_Win[ SDLK_LESS ] = (U32)WindowsVK::VK_OEM_102;
-        mSDL2_to_Win[ SDLK_EQUALS ] = (U32)WindowsVK::VK_OEM_PLUS;
-        mSDL2_to_Win[ SDLK_KP_EQUALS ] = (U32)WindowsVK::VK_OEM_PLUS;
+        mSDL_to_Win[ SDLK_SEMICOLON ] = (U32)WindowsVK::LL_VK_OEM_1;
+        mSDL_to_Win[ SDLK_LESS ] = (U32)WindowsVK::LL_VK_OEM_102;
+        mSDL_to_Win[ SDLK_EQUALS ] = (U32)WindowsVK::LL_VK_OEM_PLUS;
+        mSDL_to_Win[ SDLK_KP_EQUALS ] = (U32)WindowsVK::LL_VK_OEM_PLUS;
 
-        mSDL2_to_Win[ SDLK_LEFTBRACKET ] = (U32)WindowsVK::VK_OEM_4;
-        mSDL2_to_Win[ SDLK_BACKSLASH ] = (U32)WindowsVK::VK_OEM_5;
-        mSDL2_to_Win[ SDLK_RIGHTBRACKET ] = (U32)WindowsVK::VK_OEM_6;
-        mSDL2_to_Win[ SDLK_BACKQUOTE ] = (U32)WindowsVK::VK_OEM_8;
+        mSDL_to_Win[ SDLK_LEFTBRACKET ] = (U32)WindowsVK::LL_VK_OEM_4;
+        mSDL_to_Win[ SDLK_BACKSLASH ] = (U32)WindowsVK::LL_VK_OEM_5;
+        mSDL_to_Win[ SDLK_RIGHTBRACKET ] = (U32)WindowsVK::LL_VK_OEM_6;
+        mSDL_to_Win[ SDLK_GRAVE ] = (U32)WindowsVK::LL_VK_OEM_8;
 
-        mSDL2_to_Win[ SDLK_a ] = (U32)WindowsVK::VK_A;
-        mSDL2_to_Win[ SDLK_b ] = (U32)WindowsVK::VK_B;
-        mSDL2_to_Win[ SDLK_c ] = (U32)WindowsVK::VK_C;
-        mSDL2_to_Win[ SDLK_d ] = (U32)WindowsVK::VK_D;
-        mSDL2_to_Win[ SDLK_e ] = (U32)WindowsVK::VK_E;
-        mSDL2_to_Win[ SDLK_f ] = (U32)WindowsVK::VK_F;
-        mSDL2_to_Win[ SDLK_g ] = (U32)WindowsVK::VK_G;
-        mSDL2_to_Win[ SDLK_h ] = (U32)WindowsVK::VK_H;
-        mSDL2_to_Win[ SDLK_i ] = (U32)WindowsVK::VK_I;
-        mSDL2_to_Win[ SDLK_j ] = (U32)WindowsVK::VK_J;
-        mSDL2_to_Win[ SDLK_k ] = (U32)WindowsVK::VK_K;
-        mSDL2_to_Win[ SDLK_l ] = (U32)WindowsVK::VK_L;
-        mSDL2_to_Win[ SDLK_m ] = (U32)WindowsVK::VK_M;
-        mSDL2_to_Win[ SDLK_n ] = (U32)WindowsVK::VK_N;
-        mSDL2_to_Win[ SDLK_o ] = (U32)WindowsVK::VK_O;
-        mSDL2_to_Win[ SDLK_p ] = (U32)WindowsVK::VK_P;
-        mSDL2_to_Win[ SDLK_q ] = (U32)WindowsVK::VK_Q;
-        mSDL2_to_Win[ SDLK_r ] = (U32)WindowsVK::VK_R;
-        mSDL2_to_Win[ SDLK_s ] = (U32)WindowsVK::VK_S;
-        mSDL2_to_Win[ SDLK_t ] = (U32)WindowsVK::VK_T;
-        mSDL2_to_Win[ SDLK_u ] = (U32)WindowsVK::VK_U;
-        mSDL2_to_Win[ SDLK_v ] = (U32)WindowsVK::VK_V;
-        mSDL2_to_Win[ SDLK_w ] = (U32)WindowsVK::VK_W;
-        mSDL2_to_Win[ SDLK_x ] = (U32)WindowsVK::VK_X;
-        mSDL2_to_Win[ SDLK_y ] = (U32)WindowsVK::VK_Y;
-        mSDL2_to_Win[ SDLK_z ] = (U32)WindowsVK::VK_Z;
+        mSDL_to_Win[ SDLK_A ] = (U32)WindowsVK::LL_VK_A;
+        mSDL_to_Win[ SDLK_B ] = (U32)WindowsVK::LL_VK_B;
+        mSDL_to_Win[ SDLK_C ] = (U32)WindowsVK::LL_VK_C;
+        mSDL_to_Win[ SDLK_D ] = (U32)WindowsVK::LL_VK_D;
+        mSDL_to_Win[ SDLK_E ] = (U32)WindowsVK::LL_VK_E;
+        mSDL_to_Win[ SDLK_F ] = (U32)WindowsVK::LL_VK_F;
+        mSDL_to_Win[ SDLK_G ] = (U32)WindowsVK::LL_VK_G;
+        mSDL_to_Win[ SDLK_H ] = (U32)WindowsVK::LL_VK_H;
+        mSDL_to_Win[ SDLK_I ] = (U32)WindowsVK::LL_VK_I;
+        mSDL_to_Win[ SDLK_J ] = (U32)WindowsVK::LL_VK_J;
+        mSDL_to_Win[ SDLK_K ] = (U32)WindowsVK::LL_VK_K;
+        mSDL_to_Win[ SDLK_L ] = (U32)WindowsVK::LL_VK_L;
+        mSDL_to_Win[ SDLK_M ] = (U32)WindowsVK::LL_VK_M;
+        mSDL_to_Win[ SDLK_N ] = (U32)WindowsVK::LL_VK_N;
+        mSDL_to_Win[ SDLK_O ] = (U32)WindowsVK::LL_VK_O;
+        mSDL_to_Win[ SDLK_P ] = (U32)WindowsVK::LL_VK_P;
+        mSDL_to_Win[ SDLK_Q ] = (U32)WindowsVK::LL_VK_Q;
+        mSDL_to_Win[ SDLK_R ] = (U32)WindowsVK::LL_VK_R;
+        mSDL_to_Win[ SDLK_S ] = (U32)WindowsVK::LL_VK_S;
+        mSDL_to_Win[ SDLK_T ] = (U32)WindowsVK::LL_VK_T;
+        mSDL_to_Win[ SDLK_Y ] = (U32)WindowsVK::LL_VK_U;
+        mSDL_to_Win[ SDLK_V ] = (U32)WindowsVK::LL_VK_V;
+        mSDL_to_Win[ SDLK_W ] = (U32)WindowsVK::LL_VK_W;
+        mSDL_to_Win[ SDLK_X ] = (U32)WindowsVK::LL_VK_X;
+        mSDL_to_Win[ SDLK_Y ] = (U32)WindowsVK::LL_VK_Y;
+        mSDL_to_Win[ SDLK_Z ] = (U32)WindowsVK::LL_VK_Z;
 
-        mSDL2_to_Win[ SDLK_DELETE ] = (U32)WindowsVK::VK_DELETE;
+        mSDL_to_Win[ SDLK_DELETE ] = (U32)WindowsVK::LL_VK_DELETE;
 
 
-        mSDL2_to_Win[ SDLK_NUMLOCKCLEAR ] = (U32)WindowsVK::VK_NUMLOCK;
-        mSDL2_to_Win[ SDLK_SCROLLLOCK ] = (U32)WindowsVK::VK_SCROLL;
+        mSDL_to_Win[ SDLK_NUMLOCKCLEAR ] = (U32)WindowsVK::LL_VK_NUMLOCK;
+        mSDL_to_Win[ SDLK_SCROLLLOCK ] = (U32)WindowsVK::LL_VK_SCROLL;
 
-        mSDL2_to_Win[ SDLK_HELP ] = (U32)WindowsVK::VK_HELP;
-        mSDL2_to_Win[ SDLK_PRINTSCREEN ] = (U32)WindowsVK::VK_SNAPSHOT;
-        mSDL2_to_Win[ SDLK_CANCEL ] = (U32)WindowsVK::VK_CANCEL;
-        mSDL2_to_Win[ SDLK_APPLICATION ] = (U32)WindowsVK::VK_APPS;
+        mSDL_to_Win[ SDLK_HELP ] = (U32)WindowsVK::LL_VK_HELP;
+        mSDL_to_Win[ SDLK_PRINTSCREEN ] = (U32)WindowsVK::LL_VK_SNAPSHOT;
+        mSDL_to_Win[ SDLK_CANCEL ] = (U32)WindowsVK::LL_VK_CANCEL;
+        mSDL_to_Win[ SDLK_APPLICATION ] = (U32)WindowsVK::LL_VK_APPS;
 
-        mSDL2_to_Win[ SDLK_UNKNOWN    ] = (U32)WindowsVK::VK_UNKNOWN;
-        mSDL2_to_Win[ SDLK_BACKSPACE  ] = (U32)WindowsVK::VK_BACK;
-        mSDL2_to_Win[ SDLK_TAB        ] = (U32)WindowsVK::VK_TAB;
-        mSDL2_to_Win[ SDLK_CLEAR      ] = (U32)WindowsVK::VK_CLEAR;
-        mSDL2_to_Win[ SDLK_RETURN     ] = (U32)WindowsVK::VK_RETURN;
-        mSDL2_to_Win[ SDLK_PAUSE      ] = (U32)WindowsVK::VK_PAUSE;
-        mSDL2_to_Win[ SDLK_ESCAPE     ] = (U32)WindowsVK::VK_ESCAPE;
-        mSDL2_to_Win[ SDLK_DELETE     ] = (U32)WindowsVK::VK_DELETE;
+        mSDL_to_Win[ SDLK_UNKNOWN    ] = (U32)WindowsVK::LL_VK_UNKNOWN;
+        mSDL_to_Win[ SDLK_BACKSPACE  ] = (U32)WindowsVK::LL_VK_BACK;
+        mSDL_to_Win[ SDLK_TAB        ] = (U32)WindowsVK::LL_VK_TAB;
+        mSDL_to_Win[ SDLK_CLEAR      ] = (U32)WindowsVK::LL_VK_CLEAR;
+        mSDL_to_Win[ SDLK_RETURN     ] = (U32)WindowsVK::LL_VK_RETURN;
+        mSDL_to_Win[ SDLK_PAUSE      ] = (U32)WindowsVK::LL_VK_PAUSE;
+        mSDL_to_Win[ SDLK_ESCAPE     ] = (U32)WindowsVK::LL_VK_ESCAPE;
+        mSDL_to_Win[ SDLK_DELETE     ] = (U32)WindowsVK::LL_VK_DELETE;
 
-        mSDL2_to_Win[ SDLK_KP_PERIOD  ] = (U32)WindowsVK::VK_OEM_PERIOD; // VK_DECIMAL?
-        mSDL2_to_Win[ SDLK_KP_DIVIDE  ] = (U32)WindowsVK::VK_DIVIDE;
-        mSDL2_to_Win[ SDLK_KP_MULTIPLY] = (U32)WindowsVK::VK_MULTIPLY;
-        mSDL2_to_Win[ SDLK_KP_MINUS   ] = (U32)WindowsVK::VK_OEM_MINUS; // VK_SUBSTRACT?
-        mSDL2_to_Win[ SDLK_KP_PLUS    ] = (U32)WindowsVK::VK_OEM_PLUS;  // VK_ADD?
-        mSDL2_to_Win[ SDLK_KP_ENTER   ] = (U32)WindowsVK::VK_RETURN;
-        mSDL2_to_Win[ SDLK_KP_0 ] = (U32)WindowsVK::VK_NUMPAD0;
-        mSDL2_to_Win[ SDLK_KP_1 ] = (U32)WindowsVK::VK_NUMPAD1;
-        mSDL2_to_Win[ SDLK_KP_2 ] = (U32)WindowsVK::VK_NUMPAD2;
-        mSDL2_to_Win[ SDLK_KP_3 ] = (U32)WindowsVK::VK_NUMPAD3;
-        mSDL2_to_Win[ SDLK_KP_4 ] = (U32)WindowsVK::VK_NUMPAD4;
-        mSDL2_to_Win[ SDLK_KP_5 ] = (U32)WindowsVK::VK_NUMPAD5;
-        mSDL2_to_Win[ SDLK_KP_6 ] = (U32)WindowsVK::VK_NUMPAD6;
-        mSDL2_to_Win[ SDLK_KP_7 ] = (U32)WindowsVK::VK_NUMPAD7;
-        mSDL2_to_Win[ SDLK_KP_8 ] = (U32)WindowsVK::VK_NUMPAD8;
-        mSDL2_to_Win[ SDLK_KP_9 ] = (U32)WindowsVK::VK_NUMPAD9;
+        mSDL_to_Win[ SDLK_KP_PERIOD  ] = (U32)WindowsVK::LL_VK_DELETE; // LL_VK_DECIMAL?
+        mSDL_to_Win[ SDLK_KP_DIVIDE  ] = (U32)WindowsVK::LL_VK_DIVIDE;
+        mSDL_to_Win[ SDLK_KP_MULTIPLY] = (U32)WindowsVK::LL_VK_MULTIPLY;
+        mSDL_to_Win[ SDLK_KP_MINUS   ] = (U32)WindowsVK::LL_VK_OEM_MINUS; // LL_VK_SUBSTRACT?
+        mSDL_to_Win[ SDLK_KP_PLUS    ] = (U32)WindowsVK::LL_VK_OEM_PLUS;  // LL_VK_ADD?
+        mSDL_to_Win[ SDLK_KP_ENTER   ] = (U32)WindowsVK::LL_VK_RETURN;
+        mSDL_to_Win[ SDLK_KP_0 ] = (U32)WindowsVK::LL_VK_INSERT;
+        mSDL_to_Win[ SDLK_KP_1 ] = (U32)WindowsVK::LL_VK_END;
+        mSDL_to_Win[ SDLK_KP_2 ] = (U32)WindowsVK::LL_VK_DOWN;
+        mSDL_to_Win[ SDLK_KP_3 ] = (U32)WindowsVK::LL_VK_NEXT;
+        mSDL_to_Win[ SDLK_KP_4 ] = (U32)WindowsVK::LL_VK_LEFT;
+        mSDL_to_Win[ SDLK_KP_5 ] = (U32)WindowsVK::LL_VK_NUMPAD5;
+        mSDL_to_Win[ SDLK_KP_6 ] = (U32)WindowsVK::LL_VK_RIGHT;
+        mSDL_to_Win[ SDLK_KP_7 ] = (U32)WindowsVK::LL_VK_HOME;
+        mSDL_to_Win[ SDLK_KP_8 ] = (U32)WindowsVK::LL_VK_UP;
+        mSDL_to_Win[ SDLK_KP_9 ] = (U32)WindowsVK::LL_VK_PRIOR;
 
         // ?
 
-        mSDL2_to_Win[ SDLK_UP         ] = (U32)WindowsVK::VK_UP;
-        mSDL2_to_Win[ SDLK_DOWN       ] = (U32)WindowsVK::VK_DOWN;
-        mSDL2_to_Win[ SDLK_RIGHT      ] = (U32)WindowsVK::VK_RIGHT;
-        mSDL2_to_Win[ SDLK_LEFT       ] = (U32)WindowsVK::VK_LEFT;
-        mSDL2_to_Win[ SDLK_INSERT     ] = (U32)WindowsVK::VK_INSERT;
-        mSDL2_to_Win[ SDLK_HOME       ] = (U32)WindowsVK::VK_HOME;
-        mSDL2_to_Win[ SDLK_END        ] = (U32)WindowsVK::VK_END;
-        mSDL2_to_Win[ SDLK_PAGEUP     ] = (U32)WindowsVK::VK_PRIOR;
-        mSDL2_to_Win[ SDLK_PAGEDOWN   ] = (U32)WindowsVK::VK_NEXT;
-        mSDL2_to_Win[ SDLK_F1         ] = (U32)WindowsVK::VK_F1;
-        mSDL2_to_Win[ SDLK_F2         ] = (U32)WindowsVK::VK_F2;
-        mSDL2_to_Win[ SDLK_F3         ] = (U32)WindowsVK::VK_F3;
-        mSDL2_to_Win[ SDLK_F4         ] = (U32)WindowsVK::VK_F4;
-        mSDL2_to_Win[ SDLK_F5         ] = (U32)WindowsVK::VK_F5;
-        mSDL2_to_Win[ SDLK_F6         ] = (U32)WindowsVK::VK_F6;
-        mSDL2_to_Win[ SDLK_F7         ] = (U32)WindowsVK::VK_F7;
-        mSDL2_to_Win[ SDLK_F8         ] = (U32)WindowsVK::VK_F8;
-        mSDL2_to_Win[ SDLK_F9         ] = (U32)WindowsVK::VK_F9;
-        mSDL2_to_Win[ SDLK_F10        ] = (U32)WindowsVK::VK_F10;
-        mSDL2_to_Win[ SDLK_F11        ] = (U32)WindowsVK::VK_F11;
-        mSDL2_to_Win[ SDLK_F12        ] = (U32)WindowsVK::VK_F12;
-        mSDL2_to_Win[ SDLK_F13        ] = (U32)WindowsVK::VK_F13;
-        mSDL2_to_Win[ SDLK_F14        ] = (U32)WindowsVK::VK_F14;
-        mSDL2_to_Win[ SDLK_F15        ] = (U32)WindowsVK::VK_F15;
-        mSDL2_to_Win[ SDLK_CAPSLOCK   ] = (U32)WindowsVK::VK_CAPITAL;
-        mSDL2_to_Win[ SDLK_RSHIFT     ] = (U32)WindowsVK::VK_SHIFT;
-        mSDL2_to_Win[ SDLK_LSHIFT     ] = (U32)WindowsVK::VK_SHIFT;
-        mSDL2_to_Win[ SDLK_RCTRL      ] = (U32)WindowsVK::VK_CONTROL;
-        mSDL2_to_Win[ SDLK_LCTRL      ] = (U32)WindowsVK::VK_CONTROL;
-        mSDL2_to_Win[ SDLK_RALT       ] = (U32)WindowsVK::VK_MENU;
-        mSDL2_to_Win[ SDLK_LALT       ] = (U32)WindowsVK::VK_MENU;
+        mSDL_to_Win[ SDLK_UP         ] = (U32)WindowsVK::LL_VK_UP;
+        mSDL_to_Win[ SDLK_DOWN       ] = (U32)WindowsVK::LL_VK_DOWN;
+        mSDL_to_Win[ SDLK_RIGHT      ] = (U32)WindowsVK::LL_VK_RIGHT;
+        mSDL_to_Win[ SDLK_LEFT       ] = (U32)WindowsVK::LL_VK_LEFT;
+        mSDL_to_Win[ SDLK_INSERT     ] = (U32)WindowsVK::LL_VK_INSERT;
+        mSDL_to_Win[ SDLK_HOME       ] = (U32)WindowsVK::LL_VK_HOME;
+        mSDL_to_Win[ SDLK_END        ] = (U32)WindowsVK::LL_VK_END;
+        mSDL_to_Win[ SDLK_PAGEUP     ] = (U32)WindowsVK::LL_VK_PRIOR;
+        mSDL_to_Win[ SDLK_PAGEDOWN   ] = (U32)WindowsVK::LL_VK_NEXT;
+        mSDL_to_Win[ SDLK_F1         ] = (U32)WindowsVK::LL_VK_F1;
+        mSDL_to_Win[ SDLK_F2         ] = (U32)WindowsVK::LL_VK_F2;
+        mSDL_to_Win[ SDLK_F3         ] = (U32)WindowsVK::LL_VK_F3;
+        mSDL_to_Win[ SDLK_F4         ] = (U32)WindowsVK::LL_VK_F4;
+        mSDL_to_Win[ SDLK_F5         ] = (U32)WindowsVK::LL_VK_F5;
+        mSDL_to_Win[ SDLK_F6         ] = (U32)WindowsVK::LL_VK_F6;
+        mSDL_to_Win[ SDLK_F7         ] = (U32)WindowsVK::LL_VK_F7;
+        mSDL_to_Win[ SDLK_F8         ] = (U32)WindowsVK::LL_VK_F8;
+        mSDL_to_Win[ SDLK_F9         ] = (U32)WindowsVK::LL_VK_F9;
+        mSDL_to_Win[ SDLK_F10        ] = (U32)WindowsVK::LL_VK_F10;
+        mSDL_to_Win[ SDLK_F11        ] = (U32)WindowsVK::LL_VK_F11;
+        mSDL_to_Win[ SDLK_F12        ] = (U32)WindowsVK::LL_VK_F12;
+        mSDL_to_Win[ SDLK_F13        ] = (U32)WindowsVK::LL_VK_F13;
+        mSDL_to_Win[ SDLK_F14        ] = (U32)WindowsVK::LL_VK_F14;
+        mSDL_to_Win[ SDLK_F15        ] = (U32)WindowsVK::LL_VK_F15;
+        mSDL_to_Win[ SDLK_CAPSLOCK   ] = (U32)WindowsVK::LL_VK_CAPITAL;
+        mSDL_to_Win[ SDLK_RSHIFT     ] = (U32)WindowsVK::LL_VK_SHIFT;
+        mSDL_to_Win[ SDLK_LSHIFT     ] = (U32)WindowsVK::LL_VK_SHIFT;
+        mSDL_to_Win[ SDLK_RCTRL      ] = (U32)WindowsVK::LL_VK_CONTROL;
+        mSDL_to_Win[ SDLK_LCTRL      ] = (U32)WindowsVK::LL_VK_CONTROL;
+        mSDL_to_Win[ SDLK_RALT       ] = (U32)WindowsVK::LL_VK_MENU;
+        mSDL_to_Win[ SDLK_LALT       ] = (U32)WindowsVK::LL_VK_MENU;
 
-        mSDL2_to_Win[ SDLK_MENU       ] = (U32)WindowsVK::VK_MENU;
+        mSDL_to_Win[ SDLK_MENU       ] = (U32)WindowsVK::LL_VK_MENU;
 
-        // VK_MODECHANGE ?
-        // mSDL2_to_Win[ SDLK_MODE       ] = (U32)WindowsVK::VK_MODE;
+        // LL_VK_MODECHANGE ?
+        // mSDL_to_Win[ SDLK_MODE       ] = (U32)WindowsVK::LL_VK_MODE;
 
         // ?
-        // mSDL2_to_Win[ SDLK_SYSREQ     ] = (U32)WindowsVK::VK_SYSREQ;
-        // mSDL2_to_Win[ SDLK_POWER      ] = (U32)WindowsVK::VK_POWER;
-        // mSDL2_to_Win[ SDLK_UNDO       ] = (U32)WindowsVK::VK_UNDO;
-        // mSDL2_to_Win[ SDLK_KP_EQUALS  ] = (U32)WindowsVK::VK_EQUALS;
-        // mSDL2_to_Win[ 311 ] = (U32)WindowsVK::VK_LWIN;
-        // mSDL2_to_Win[ 312 ] = (U32)WindowsVK::VK_RWIN;
-        // mSDL2_to_Win[ SDLK_COLON ] = ?
+        // mSDL_to_Win[ SDLK_SYSREQ     ] = (U32)WindowsVK::LL_VK_SYSREQ;
+        // mSDL_to_Win[ SDLK_POWER      ] = (U32)WindowsVK::LL_VK_POWER;
+        // mSDL_to_Win[ SDLK_UNDO       ] = (U32)WindowsVK::LL_VK_UNDO;
+        // mSDL_to_Win[ SDLK_KP_EQUALS  ] = (U32)WindowsVK::LL_VK_EQUALS;
+        // mSDL_to_Win[ 311 ] = (U32)WindowsVK::LL_VK_LWIN;
+        // mSDL_to_Win[ 312 ] = (U32)WindowsVK::LL_VK_RWIN;
+        // mSDL_to_Win[ SDLK_COLON ] = ?
     }
 
-    auto itr = mSDL2_to_Win.find( aSymbol );
-    if( itr != mSDL2_to_Win.end() )
+    auto itr = mSDL_to_Win.find( aSymbol );
+    if( itr != mSDL_to_Win.end() )
         return itr->second;
 
     return aSymbol;