WinRT: more keyboard code cleanups
authorDavid Ludwig <dludwig@pobox.com>
Sat, 25 Oct 2014 08:43:51 -0400
changeset 9190 ff12797f287b
parent 9189 5dc3c7c2864c
child 9191 7a728256c5f5
WinRT: more keyboard code cleanups - use SDL_arraysize where appropriate - made long lines of debug-logging code span multiple lines, for easier reading
src/video/winrt/SDL_winrtkeyboard.cpp
--- a/src/video/winrt/SDL_winrtkeyboard.cpp	Fri Oct 24 22:09:47 2014 -0400
+++ b/src/video/winrt/SDL_winrtkeyboard.cpp	Sat Oct 25 08:43:51 2014 -0400
@@ -269,7 +269,7 @@
      * at least not for Windows [Phone] 8/8.1, as of Oct 24, 2014), then this
      * hack might become deprecated, or obsolete.
      */
-    if (nativeScancode < (sizeof(windows_scancode_table) / sizeof(SDL_Scancode))) {
+    if (nativeScancode < SDL_arraysize(windows_scancode_table)) {
         switch (keycode) {
             case 16:    // VirtualKey.Shift
                 switch (windows_scancode_table[nativeScancode]) {
@@ -311,7 +311,9 @@
     SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
 #if 0
     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->KeyStatus.IsExtendedKey ? "1" : "0"),
         (args->KeyStatus.IsKeyReleased ? "1" : "0"),
@@ -336,7 +338,9 @@
     SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
 #if 0
     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->KeyStatus.IsExtendedKey ? "1" : "0"),
         (args->KeyStatus.IsKeyReleased ? "1" : "0"),