Linux viewer (ReleaseOS) resurrection (#1099)

Co-authored-by: AiraYumi <aira.youme@airanyumi.net>

1 files changed, 587 insertions, 250 deletions

diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp
index 7c9aa1d340..b29b832011 100644
--- a/indra/llwindow/llkeyboardsdl.cpp
+++ b/indra/llwindow/llkeyboardsdl.cpp
@@ -1,324 +1,661 @@
-/** 
- * @file llkeyboardsdl.cpp
- * @brief Handler for assignable key bindings
+/**
+ * @author This module has many fathers, and it shows.
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
-#if LL_SDL
-
 #include "linden_common.h"
 #include "llkeyboardsdl.h"
 #include "llwindowcallbacks.h"
-#include "SDL/SDL.h"
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_keycode.h"
 
 LLKeyboardSDL::LLKeyboardSDL()
 {
-	// Set up key mapping for SDL - eventually can read this from a file?
-	// Anything not in the key map gets dropped
-	// Add default A-Z
-
-	// Virtual key mappings from SDL_keysym.h ...
-
-	// SDL maps the letter keys to the ASCII you'd expect, but it's lowercase...
-	U16 cur_char;
-	for (cur_char = 'A'; cur_char <= 'Z'; cur_char++)
-	{
-		mTranslateKeyMap[cur_char] = cur_char;
-	}
-	for (cur_char = 'a'; cur_char <= 'z'; cur_char++)
-	{
-		mTranslateKeyMap[cur_char] = (cur_char - 'a') + 'A';
-	}
-
-	for (cur_char = '0'; cur_char <= '9'; cur_char++)
-	{
-		mTranslateKeyMap[cur_char] = cur_char;
-	}
-
-	// These ones are translated manually upon keydown/keyup because
-	// SDL doesn't handle their numlock transition.
-	//mTranslateKeyMap[SDLK_KP4] = KEY_PAD_LEFT;
-	//mTranslateKeyMap[SDLK_KP6] = KEY_PAD_RIGHT;
-	//mTranslateKeyMap[SDLK_KP8] = KEY_PAD_UP;
-	//mTranslateKeyMap[SDLK_KP2] = KEY_PAD_DOWN;
-	//mTranslateKeyMap[SDLK_KP_PERIOD] = KEY_DELETE;
-	//mTranslateKeyMap[SDLK_KP7] = KEY_HOME;
-	//mTranslateKeyMap[SDLK_KP1] = KEY_END;
-	//mTranslateKeyMap[SDLK_KP9] = KEY_PAGE_UP;
-	//mTranslateKeyMap[SDLK_KP3] = KEY_PAGE_DOWN;
-	//mTranslateKeyMap[SDLK_KP0] = KEY_INSERT;
-
-	mTranslateKeyMap[SDLK_SPACE] = ' ';
-	mTranslateKeyMap[SDLK_RETURN] = KEY_RETURN;
-	mTranslateKeyMap[SDLK_LEFT] = KEY_LEFT;
-	mTranslateKeyMap[SDLK_RIGHT] = KEY_RIGHT;
-	mTranslateKeyMap[SDLK_UP] = KEY_UP;
-	mTranslateKeyMap[SDLK_DOWN] = KEY_DOWN;
-	mTranslateKeyMap[SDLK_ESCAPE] = KEY_ESCAPE;
-	mTranslateKeyMap[SDLK_KP_ENTER] = KEY_RETURN;
-	mTranslateKeyMap[SDLK_ESCAPE] = KEY_ESCAPE;
-	mTranslateKeyMap[SDLK_BACKSPACE] = KEY_BACKSPACE;
-	mTranslateKeyMap[SDLK_DELETE] = KEY_DELETE;
-	mTranslateKeyMap[SDLK_LSHIFT] = KEY_SHIFT;
-	mTranslateKeyMap[SDLK_RSHIFT] = KEY_SHIFT;
-	mTranslateKeyMap[SDLK_LCTRL] = KEY_CONTROL;
-	mTranslateKeyMap[SDLK_RCTRL] = KEY_CONTROL;
-	mTranslateKeyMap[SDLK_LALT] = KEY_ALT;
-	mTranslateKeyMap[SDLK_RALT] = KEY_ALT;
-	mTranslateKeyMap[SDLK_HOME] = KEY_HOME;
-	mTranslateKeyMap[SDLK_END] = KEY_END;
-	mTranslateKeyMap[SDLK_PAGEUP] = KEY_PAGE_UP;
-	mTranslateKeyMap[SDLK_PAGEDOWN] = KEY_PAGE_DOWN;
-	mTranslateKeyMap[SDLK_MINUS] = KEY_HYPHEN;
-	mTranslateKeyMap[SDLK_EQUALS] = KEY_EQUALS;
-	mTranslateKeyMap[SDLK_KP_EQUALS] = KEY_EQUALS;
-	mTranslateKeyMap[SDLK_INSERT] = KEY_INSERT;
-	mTranslateKeyMap[SDLK_CAPSLOCK] = KEY_CAPSLOCK;
-	mTranslateKeyMap[SDLK_TAB] = KEY_TAB;
-	mTranslateKeyMap[SDLK_KP_PLUS] = KEY_ADD;
-	mTranslateKeyMap[SDLK_KP_MINUS] = KEY_SUBTRACT;
-	mTranslateKeyMap[SDLK_KP_MULTIPLY] = KEY_MULTIPLY;
-	mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_PAD_DIVIDE;
-	mTranslateKeyMap[SDLK_F1] = KEY_F1;
-	mTranslateKeyMap[SDLK_F2] = KEY_F2;
-	mTranslateKeyMap[SDLK_F3] = KEY_F3;
-	mTranslateKeyMap[SDLK_F4] = KEY_F4;
-	mTranslateKeyMap[SDLK_F5] = KEY_F5;
-	mTranslateKeyMap[SDLK_F6] = KEY_F6;
-	mTranslateKeyMap[SDLK_F7] = KEY_F7;
-	mTranslateKeyMap[SDLK_F8] = KEY_F8;
-	mTranslateKeyMap[SDLK_F9] = KEY_F9;
-	mTranslateKeyMap[SDLK_F10] = KEY_F10;
-	mTranslateKeyMap[SDLK_F11] = KEY_F11;
-	mTranslateKeyMap[SDLK_F12] = KEY_F12;
-	mTranslateKeyMap[SDLK_PLUS]   = '=';
-	mTranslateKeyMap[SDLK_COMMA]  = ',';
-	mTranslateKeyMap[SDLK_MINUS]  = '-';
-	mTranslateKeyMap[SDLK_PERIOD] = '.';
-	mTranslateKeyMap[SDLK_BACKQUOTE] = '`';
-	mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE;
-	mTranslateKeyMap[SDLK_SEMICOLON] = ';';
-	mTranslateKeyMap[SDLK_LEFTBRACKET] = '[';
-	mTranslateKeyMap[SDLK_BACKSLASH] = '\\';
-	mTranslateKeyMap[SDLK_RIGHTBRACKET] = ']';
-	mTranslateKeyMap[SDLK_QUOTE] = '\'';
-
-	// Build inverse map
-	std::map<U16, KEY>::iterator iter;
-	for (iter = mTranslateKeyMap.begin(); iter != mTranslateKeyMap.end(); iter++)
-	{
-		mInvTranslateKeyMap[iter->second] = iter->first;
-	}
-
-	// numpad map
-	mTranslateNumpadMap[SDLK_KP0] = KEY_PAD_INS;
-	mTranslateNumpadMap[SDLK_KP1] = KEY_PAD_END;
-	mTranslateNumpadMap[SDLK_KP2] = KEY_PAD_DOWN;
-	mTranslateNumpadMap[SDLK_KP3] = KEY_PAD_PGDN;
-	mTranslateNumpadMap[SDLK_KP4] = KEY_PAD_LEFT;
-	mTranslateNumpadMap[SDLK_KP5] = KEY_PAD_CENTER;
-	mTranslateNumpadMap[SDLK_KP6] = KEY_PAD_RIGHT;
-	mTranslateNumpadMap[SDLK_KP7] = KEY_PAD_HOME;
-	mTranslateNumpadMap[SDLK_KP8] = KEY_PAD_UP;
-	mTranslateNumpadMap[SDLK_KP9] = KEY_PAD_PGUP;
-	mTranslateNumpadMap[SDLK_KP_PERIOD] = KEY_PAD_DEL;
-
-	// build inverse numpad map
-	for (iter = mTranslateNumpadMap.begin();
-	     iter != mTranslateNumpadMap.end();
-	     iter++)
-	{
-		mInvTranslateNumpadMap[iter->second] = iter->first;
-	}
+    // Set up key mapping for SDL - eventually can read this from a file?
+    // Anything not in the key map gets dropped
+    // Add default A-Z
+
+    // 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;
+    for (cur_char = 'A'; cur_char <= 'Z'; cur_char++)
+    {
+        mTranslateKeyMap[cur_char] = cur_char;
+    }
+    for (cur_char = 'a'; cur_char <= 'z'; cur_char++)
+    {
+        mTranslateKeyMap[cur_char] = (cur_char - 'a') + 'A';
+    }
+
+    for (cur_char = '0'; cur_char <= '9'; cur_char++)
+    {
+        mTranslateKeyMap[cur_char] = cur_char;
+    }
+
+    // These ones are translated manually upon keydown/keyup because
+    // SDL doesn't handle their numlock transition.
+    //mTranslateKeyMap[SDLK_KP4] = KEY_PAD_LEFT;
+    //mTranslateKeyMap[SDLK_KP6] = KEY_PAD_RIGHT;
+    //mTranslateKeyMap[SDLK_KP8] = KEY_PAD_UP;
+    //mTranslateKeyMap[SDLK_KP2] = KEY_PAD_DOWN;
+    //mTranslateKeyMap[SDLK_KP_PERIOD] = KEY_DELETE;
+    //mTranslateKeyMap[SDLK_KP7] = KEY_HOME;
+    //mTranslateKeyMap[SDLK_KP1] = KEY_END;
+    //mTranslateKeyMap[SDLK_KP9] = KEY_PAGE_UP;
+    //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_RETURN] = KEY_RETURN;
+    mTranslateKeyMap[SDLK_LEFT] = KEY_LEFT;
+    mTranslateKeyMap[SDLK_RIGHT] = KEY_RIGHT;
+    mTranslateKeyMap[SDLK_UP] = KEY_UP;
+    mTranslateKeyMap[SDLK_DOWN] = KEY_DOWN;
+    mTranslateKeyMap[SDLK_KP_ENTER] = KEY_RETURN;
+    mTranslateKeyMap[SDLK_ESCAPE] = KEY_ESCAPE;
+    mTranslateKeyMap[SDLK_BACKSPACE] = KEY_BACKSPACE;
+    mTranslateKeyMap[SDLK_DELETE] = KEY_DELETE;
+    mTranslateKeyMap[SDLK_LSHIFT] = KEY_SHIFT;
+    mTranslateKeyMap[SDLK_RSHIFT] = KEY_SHIFT;
+    mTranslateKeyMap[SDLK_LCTRL] = KEY_CONTROL;
+    mTranslateKeyMap[SDLK_RCTRL] = KEY_CONTROL;
+    mTranslateKeyMap[SDLK_LALT] = KEY_ALT;
+    mTranslateKeyMap[SDLK_RALT] = KEY_ALT;
+    mTranslateKeyMap[SDLK_HOME] = KEY_HOME;
+    mTranslateKeyMap[SDLK_END] = KEY_END;
+    mTranslateKeyMap[SDLK_PAGEUP] = KEY_PAGE_UP;
+    mTranslateKeyMap[SDLK_PAGEDOWN] = KEY_PAGE_DOWN;
+    mTranslateKeyMap[SDLK_MINUS] = KEY_HYPHEN;
+    mTranslateKeyMap[SDLK_EQUALS] = KEY_EQUALS;
+    mTranslateKeyMap[SDLK_KP_EQUALS] = KEY_EQUALS;
+    mTranslateKeyMap[SDLK_INSERT] = KEY_INSERT;
+    mTranslateKeyMap[SDLK_CAPSLOCK] = KEY_CAPSLOCK;
+    mTranslateKeyMap[SDLK_TAB] = KEY_TAB;
+    mTranslateKeyMap[SDLK_KP_PLUS] = KEY_ADD;
+    mTranslateKeyMap[SDLK_KP_MINUS] = KEY_SUBTRACT;
+    mTranslateKeyMap[SDLK_KP_MULTIPLY] = KEY_MULTIPLY;
+    mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_PAD_DIVIDE;
+    mTranslateKeyMap[SDLK_F1] = KEY_F1;
+    mTranslateKeyMap[SDLK_F2] = KEY_F2;
+    mTranslateKeyMap[SDLK_F3] = KEY_F3;
+    mTranslateKeyMap[SDLK_F4] = KEY_F4;
+    mTranslateKeyMap[SDLK_F5] = KEY_F5;
+    mTranslateKeyMap[SDLK_F6] = KEY_F6;
+    mTranslateKeyMap[SDLK_F7] = KEY_F7;
+    mTranslateKeyMap[SDLK_F8] = KEY_F8;
+    mTranslateKeyMap[SDLK_F9] = KEY_F9;
+    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
+
+    // Build inverse map
+    for (auto iter = mTranslateKeyMap.begin(); iter != mTranslateKeyMap.end(); iter++)
+    {
+        mInvTranslateKeyMap[iter->second] = iter->first;
+    }
+
+    // numpad map
+    mTranslateNumpadMap[SDLK_KP_0] = KEY_PAD_INS;
+    mTranslateNumpadMap[SDLK_KP_1] = KEY_PAD_END;
+    mTranslateNumpadMap[SDLK_KP_2] = KEY_PAD_DOWN;
+    mTranslateNumpadMap[SDLK_KP_3] = KEY_PAD_PGDN;
+    mTranslateNumpadMap[SDLK_KP_4] = KEY_PAD_LEFT;
+    mTranslateNumpadMap[SDLK_KP_5] = KEY_PAD_CENTER;
+    mTranslateNumpadMap[SDLK_KP_6] = KEY_PAD_RIGHT;
+    mTranslateNumpadMap[SDLK_KP_7] = KEY_PAD_HOME;
+    mTranslateNumpadMap[SDLK_KP_8] = KEY_PAD_UP;
+    mTranslateNumpadMap[SDLK_KP_9] = KEY_PAD_PGUP;
+    mTranslateNumpadMap[SDLK_KP_PERIOD] = KEY_PAD_DEL;
+
+    // build inverse numpad map
+    for (auto iter = mTranslateNumpadMap.begin();
+         iter != mTranslateNumpadMap.end();
+         iter++)
+    {
+        mInvTranslateNumpadMap[iter->second] = iter->first;
+    }
 }
 
 void LLKeyboardSDL::resetMaskKeys()
 {
-	SDLMod mask = SDL_GetModState();
-
-	// MBW -- XXX -- This mirrors the operation of the Windows version of 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)
-	{
-		mKeyLevel[KEY_SHIFT] = TRUE;
-	}
-
-	if(mask & KMOD_CTRL)
-	{
-		mKeyLevel[KEY_CONTROL] = TRUE;
-	}
-
-	if(mask & KMOD_ALT)
-	{
-		mKeyLevel[KEY_ALT] = TRUE;
-	}
+    SDL_Keymod mask = SDL_GetModState();
+
+    // MBW -- XXX -- This mirrors the operation of the Windows version of 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)
+    {
+        mKeyLevel[KEY_SHIFT] = TRUE;
+    }
+
+    if(mask & KMOD_CTRL)
+    {
+        mKeyLevel[KEY_CONTROL] = TRUE;
+    }
+
+    if(mask & KMOD_ALT)
+    {
+        mKeyLevel[KEY_ALT] = TRUE;
+    }
 }
 
 
 MASK LLKeyboardSDL::updateModifiers(const U32 mask)
 {
-	// translate the mask
-	MASK out_mask = MASK_NONE;
+    // translate the mask
+    MASK out_mask = MASK_NONE;
 
-	if(mask & KMOD_SHIFT)
-	{
-		out_mask |= MASK_SHIFT;
-	}
+    if(mask & KMOD_SHIFT)
+    {
+        out_mask |= MASK_SHIFT;
+    }
 
-	if(mask & KMOD_CTRL)
-	{
-		out_mask |= MASK_CONTROL;
-	}
+    if(mask & KMOD_CTRL)
+    {
+        out_mask |= MASK_CONTROL;
+    }
 
-	if(mask & KMOD_ALT)
-	{
-		out_mask |= MASK_ALT;
-	}
+    if(mask & KMOD_ALT)
+    {
+        out_mask |= MASK_ALT;
+    }
 
-	return out_mask;
+    return out_mask;
 }
 
 
-static U16 adjustNativekeyFromUnhandledMask(const U16 key, const U32 mask)
+static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask)
 {
-	// SDL doesn't automatically adjust the keysym according to
-	// whether NUMLOCK is engaged, so we massage the keysym manually.
-	U16 rtn = key;
-	if (!(mask & KMOD_NUM))
-	{
-		switch (key)
-		{
-		case SDLK_KP_PERIOD: rtn = SDLK_DELETE; break;
-		case SDLK_KP0: rtn = SDLK_INSERT; break;
-		case SDLK_KP1: rtn = SDLK_END; break;
-		case SDLK_KP2: rtn = SDLK_DOWN; break;
-		case SDLK_KP3: rtn = SDLK_PAGEDOWN; break;
-		case SDLK_KP4: rtn = SDLK_LEFT; break;
-		case SDLK_KP6: rtn = SDLK_RIGHT; break;
-		case SDLK_KP7: rtn = SDLK_HOME; break;
-		case SDLK_KP8: rtn = SDLK_UP; break;
-		case SDLK_KP9: rtn = SDLK_PAGEUP; break;
-		}
-	}
-	return rtn;
+    // 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))
+    {
+        switch (key)
+        {
+            case SDLK_KP_PERIOD: rtn = SDLK_DELETE; break;
+            case SDLK_KP_0: rtn = SDLK_INSERT; break;
+            case SDLK_KP_1: rtn = SDLK_END; break;
+            case SDLK_KP_2: rtn = SDLK_DOWN; break;
+            case SDLK_KP_3: rtn = SDLK_PAGEDOWN; break;
+            case SDLK_KP_4: rtn = SDLK_LEFT; break;
+            case SDLK_KP_6: rtn = SDLK_RIGHT; break;
+            case SDLK_KP_7: rtn = SDLK_HOME; break;
+            case SDLK_KP_8: rtn = SDLK_UP; break;
+            case SDLK_KP_9: rtn = SDLK_PAGEUP; break;
+        }
+    }
+    return rtn;
 }
 
 
-BOOL LLKeyboardSDL::handleKeyDown(const U16 key, const U32 mask)
+BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask)
 {
-	U16     adjusted_nativekey;
-	KEY	translated_key = 0;
-	U32	translated_mask = MASK_NONE;
-	BOOL	handled = FALSE;
+    U32 adjusted_nativekey;
+    KEY	translated_key = 0;
+    U32	translated_mask = MASK_NONE;
+    BOOL handled = FALSE;
+
+    adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
 
-	adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
+    translated_mask = updateModifiers(mask);
 
-	translated_mask = updateModifiers(mask);
-	
-	if(translateNumpadKey(adjusted_nativekey, &translated_key))
-	{
-		handled = handleTranslatedKeyDown(translated_key, translated_mask);
-	}
+    if(translateNumpadKey(adjusted_nativekey, &translated_key))
+    {
+        handled = handleTranslatedKeyDown(translated_key, translated_mask);
+    }
 
-	return handled;
+    return handled;
 }
 
 
-BOOL LLKeyboardSDL::handleKeyUp(const U16 key, const U32 mask)
+BOOL LLKeyboardSDL::handleKeyUp(const U32 key, const U32 mask)
 {
-	U16     adjusted_nativekey;
-	KEY	translated_key = 0;
-	U32	translated_mask = MASK_NONE;
-	BOOL	handled = FALSE;
+    U32 adjusted_nativekey;
+    KEY	translated_key = 0;
+    U32	translated_mask = MASK_NONE;
+    BOOL handled = FALSE;
 
-	adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
+    adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
 
-	translated_mask = updateModifiers(mask);
+    translated_mask = updateModifiers(mask);
 
-	if(translateNumpadKey(adjusted_nativekey, &translated_key))
-	{
-		handled = handleTranslatedKeyUp(translated_key, translated_mask);
-	}
+    if(translateNumpadKey(adjusted_nativekey, &translated_key))
+    {
+        handled = handleTranslatedKeyUp(translated_key, translated_mask);
+    }
 
-	return handled;
+    return handled;
 }
 
 MASK LLKeyboardSDL::currentMask(BOOL for_mouse_event)
 {
-	MASK result = MASK_NONE;
-	SDLMod mask = SDL_GetModState();
-
-	if (mask & KMOD_SHIFT)			result |= MASK_SHIFT;
-	if (mask & KMOD_CTRL)			result |= MASK_CONTROL;
-	if (mask & KMOD_ALT)			result |= MASK_ALT;
-
-	// For keyboard events, consider Meta keys equivalent to Control
-	if (!for_mouse_event)
-	{
-		if (mask & KMOD_META) result |= MASK_CONTROL;
-	}
-
-	return result;
+    MASK result = MASK_NONE;
+    SDL_Keymod mask = SDL_GetModState();
+
+    if (mask & KMOD_SHIFT)
+        result |= MASK_SHIFT;
+    if (mask & KMOD_CTRL)
+        result |= MASK_CONTROL;
+    if (mask & KMOD_ALT)
+        result |= MASK_ALT;
+
+    // For keyboard events, consider Meta keys equivalent to Control
+    if (!for_mouse_event)
+    {
+        if (mask & KMOD_GUI)
+            result |= MASK_CONTROL;
+    }
+
+    return result;
 }
 
 void LLKeyboardSDL::scanKeyboard()
 {
-	for (S32 key = 0; key < KEY_COUNT; key++)
-	{
-		// Generate callback if any event has occurred on this key this frame.
-		// Can't just test mKeyLevel, because this could be a slow frame and
-		// key might have gone down then up. JC
-		if (mKeyLevel[key] || mKeyDown[key] || mKeyUp[key])
-		{
-			mCurScanKey = key;
-			mCallbacks->handleScanKey(key, mKeyDown[key], mKeyUp[key], mKeyLevel[key]);
-		}
-	}
-
-	// Reset edges for next frame
-	for (S32 key = 0; key < KEY_COUNT; key++)
-	{
-		mKeyUp[key] = FALSE;
-		mKeyDown[key] = FALSE;
-		if (mKeyLevel[key])
-		{
-			mKeyLevelFrameCount[key]++;
-		}
-	}
+    for (S32 key = 0; key < KEY_COUNT; key++)
+    {
+        // Generate callback if any event has occurred on this key this frame.
+        // Can't just test mKeyLevel, because this could be a slow frame and
+        // key might have gone down then up. JC
+        if (mKeyLevel[key] || mKeyDown[key] || mKeyUp[key])
+        {
+            mCurScanKey = key;
+            mCallbacks->handleScanKey(key, mKeyDown[key], mKeyUp[key], mKeyLevel[key]);
+        }
+    }
+
+    // Reset edges for next frame
+    for (S32 key = 0; key < KEY_COUNT; key++)
+    {
+        mKeyUp[key] = FALSE;
+        mKeyDown[key] = FALSE;
+        if (mKeyLevel[key])
+        {
+            mKeyLevelFrameCount[key]++;
+        }
+    }
 }
 
- 
-BOOL LLKeyboardSDL::translateNumpadKey( const U16 os_key, KEY *translated_key)
+
+BOOL LLKeyboardSDL::translateNumpadKey( const U32 os_key, KEY *translated_key)
 {
-	return translateKey(os_key, translated_key);	
+    return translateKey(os_key, translated_key);
 }
 
 U16 LLKeyboardSDL::inverseTranslateNumpadKey(const KEY translated_key)
 {
-	return inverseTranslateKey(translated_key);
+    return inverseTranslateKey(translated_key);
 }
 
-#endif
-
+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,
+};
+
+std::map< U32, U32 > mSDL2_to_Win;
+std::set< U32 > mIgnoreSDL2Keys;
+
+U32 LLKeyboardSDL::mapSDL2toWin( 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() )
+    {
+
+        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;
+
+        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;
+
+        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;
+
+        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;
+
+        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;
+
+        mSDL2_to_Win[ SDLK_DELETE ] = (U32)WindowsVK::VK_DELETE;
+
+
+        mSDL2_to_Win[ SDLK_NUMLOCKCLEAR ] = (U32)WindowsVK::VK_NUMLOCK;
+        mSDL2_to_Win[ SDLK_SCROLLLOCK ] = (U32)WindowsVK::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;
+
+        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;
+
+        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;
+
+        // ?
+
+        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;
+
+        mSDL2_to_Win[ SDLK_MENU       ] = (U32)WindowsVK::VK_MENU;
+
+        // VK_MODECHANGE ?
+        // mSDL2_to_Win[ SDLK_MODE       ] = (U32)WindowsVK::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 ] = ?
+    }
+
+    auto itr = mSDL2_to_Win.find( aSymbol );
+    if( itr != mSDL2_to_Win.end() )
+        return itr->second;
+
+    return aSymbol;
+}