geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WinRT: more keyboard code cleanups 

- use SDL_arraysize where appropriate
- made long lines of debug-logging code span multiple lines, for easier reading
main
David Ludwig 2014-10-25 08:43:51 -04:00
parent a1bac50d1b
commit 20b19aac86
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/winrt/SDL_winrtkeyboard.cpp
View File

@ -269,7 +269,7 @@ TranslateKeycode(int keycode, unsigned int nativeScancode)
* at least not for Windows [Phone] 8/8.1, as of Oct 24, 2014), then this * at least not for Windows [Phone] 8/8.1, as of Oct 24, 2014), then this
* hack might become deprecated, or obsolete. * hack might become deprecated, or obsolete.
*/ */
if (nativeScancode < (sizeof(windows_scancode_table) / sizeof(SDL_Scancode))) { if (nativeScancode < SDL_arraysize(windows_scancode_table)) {
switch (keycode) { switch (keycode) {
case 16: // VirtualKey.Shift case 16: // VirtualKey.Shift
switch (windows_scancode_table[nativeScancode]) { switch (windows_scancode_table[nativeScancode]) {
@ -311,7 +311,9 @@ WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args)
SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode); SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
#if 0 #if 0
SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode); SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode);
SDL_Log("key down, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, native scan code=0x%x, was down?=%s, vkey=%d, sdl scan code=%d (%s), sdl key code=%d (%s)\n", SDL_Log("key down, handled=%s, ext?=%s, released?=%s, menu key down?=%s, "
"repeat count=%d, native scan code=0x%x, was down?=%s, vkey=%d, "
"sdl scan code=%d (%s), sdl key code=%d (%s)\n",
(args->Handled ? "1" : "0"), (args->Handled ? "1" : "0"),
(args->KeyStatus.IsExtendedKey ? "1" : "0"), (args->KeyStatus.IsExtendedKey ? "1" : "0"),
(args->KeyStatus.IsKeyReleased ? "1" : "0"), (args->KeyStatus.IsKeyReleased ? "1" : "0"),
@ -336,7 +338,9 @@ WINRT_ProcessKeyUpEvent(Windows::UI::Core::KeyEventArgs ^args)
SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode); SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
#if 0 #if 0
SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode); SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode);
SDL_Log("key up, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, native scan code=0x%x, was down?=%s, vkey=%d, sdl scan code=%d (%s), sdl key code=%d (%s)\n", SDL_Log("key up, handled=%s, ext?=%s, released?=%s, menu key down?=%s, "
"repeat count=%d, native scan code=0x%x, was down?=%s, vkey=%d, "
"sdl scan code=%d (%s), sdl key code=%d (%s)\n",
(args->Handled ? "1" : "0"), (args->Handled ? "1" : "0"),
(args->KeyStatus.IsExtendedKey ? "1" : "0"), (args->KeyStatus.IsExtendedKey ? "1" : "0"),
(args->KeyStatus.IsKeyReleased ? "1" : "0"), (args->KeyStatus.IsKeyReleased ? "1" : "0"),