WinRT: fallback to scancode key detection, if VirtualKey/VK detection…

… fails
libsdl-org · Oct 25, 2014 · ed2fff6 · ed2fff6
1 parent 20b19aa
commit ed2fff6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/video/winrt/SDL_winrtkeyboard.cpp b/src/video/winrt/SDL_winrtkeyboard.cpp
@@ -292,13 +292,19 @@ TranslateKeycode(int keycode, unsigned int nativeScancode)
     /* Try to get a documented, WinRT, 'VirtualKey' next (as documented at
        http://msdn.microsoft.com/en-us/library/windows/apps/windows.system.virtualkey.aspx ).
        If that fails, fall back to a Win32 virtual key.
+       If that fails, attempt to fall back to a scancode-derived key.
     */
     if (keycode < SDL_arraysize(WinRT_Official_Keycodes)) {
         scancode = WinRT_Official_Keycodes[keycode];
     }
     if (scancode == SDL_SCANCODE_UNKNOWN) {
         scancode = WINRT_TranslateUnofficialKeycode(keycode);
     }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        if (nativeScancode < SDL_arraysize(windows_scancode_table)) {
+            scancode = windows_scancode_table[nativeScancode];
+        }
+    }
     if (scancode == SDL_SCANCODE_UNKNOWN) {
         SDL_Log("WinRT TranslateKeycode, unknown keycode=%d\n", (int)keycode);
     }