WinRT: added key event support for most WinRT/VirtualKey-based keys
authorDavid Ludwig <dludwig@pobox.com>
Sun, 04 Nov 2012 09:02:58 -0500
changeset 8336 0b9aa42be7ae
parent 8335 4f41add2ff00
child 8337 4a67a3cca43d
child 8338 53c8cafb945a
WinRT: added key event support for most WinRT/VirtualKey-based keys
src/video/windowsrt/SDL_WinRTApp.cpp
src/video/windowsrt/SDL_WinRTApp.h
--- a/src/video/windowsrt/SDL_WinRTApp.cpp	Mon Oct 29 23:32:13 2012 -0400
+++ b/src/video/windowsrt/SDL_WinRTApp.cpp	Sun Nov 04 09:02:58 2012 -0500
@@ -6,6 +6,7 @@
 #include "SDL_stdinc.h"
 #include "../SDL_sysvideo.h"
 #include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
 #include "SDL_events.h"
 #include "SDL_log.h"
 }
@@ -78,6 +79,13 @@
 	window->PointerMoved +=
 		ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &SDL_WinRTApp::OnPointerMoved);
 
+    window->KeyDown +=
+		ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &SDL_WinRTApp::OnKeyDown);
+
+	window->KeyUp +=
+		ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &SDL_WinRTApp::OnKeyUp);
+
+
 	m_renderer->Initialize(CoreWindow::GetForCurrentThread());
 }
 
@@ -158,6 +166,223 @@
     }
 }
 
+static SDL_Scancode WinRT_Keycodes[] = {
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.None -- 0
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.LeftButton -- 1
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.RightButton -- 2
+    SDL_SCANCODE_CANCEL, // VirtualKey.Cancel -- 3
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.MiddleButton -- 4
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.XButton1 -- 5
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.XButton2 -- 6
+    SDL_SCANCODE_UNKNOWN, // -- 7
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Back -- 8  (maybe SDL_SCANCODE_AC_BACK ?)
+    SDL_SCANCODE_TAB, // VirtualKey.Tab -- 9
+    SDL_SCANCODE_UNKNOWN, // -- 10
+    SDL_SCANCODE_UNKNOWN, // -- 11
+    SDL_SCANCODE_CLEAR, // VirtualKey.Clear -- 12
+    SDL_SCANCODE_RETURN, // VirtualKey.Enter -- 13
+    SDL_SCANCODE_UNKNOWN, // -- 14
+    SDL_SCANCODE_UNKNOWN, // -- 15
+    SDL_SCANCODE_LSHIFT, // VirtualKey.Shift -- 16
+    SDL_SCANCODE_LCTRL, // VirtualKey.Control -- 17
+    SDL_SCANCODE_MENU, // VirtualKey.Menu -- 18
+    SDL_SCANCODE_PAUSE, // VirtualKey.Pause -- 19
+    SDL_SCANCODE_CAPSLOCK, // VirtualKey.CapitalLock -- 20
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Kana or VirtualKey.Hangul -- 21
+    SDL_SCANCODE_UNKNOWN, // -- 22
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Junja -- 23
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Final -- 24
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Hanja or VirtualKey.Kanji -- 25
+    SDL_SCANCODE_UNKNOWN, // -- 26
+    SDL_SCANCODE_ESCAPE, // VirtualKey.Escape -- 27
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Convert -- 28
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.NonConvert -- 29
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Accept -- 30
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.ModeChange -- 31  (maybe SDL_SCANCODE_MODE ?)
+    SDL_SCANCODE_SPACE, // VirtualKey.Space -- 32
+    SDL_SCANCODE_PAGEUP, // VirtualKey.PageUp -- 33
+    SDL_SCANCODE_PAGEDOWN, // VirtualKey.PageDown -- 34
+    SDL_SCANCODE_END, // VirtualKey.End -- 35
+    SDL_SCANCODE_HOME, // VirtualKey.Home -- 36
+    SDL_SCANCODE_LEFT, // VirtualKey.Left -- 37
+    SDL_SCANCODE_UP, // VirtualKey.Up -- 38
+    SDL_SCANCODE_RIGHT, // VirtualKey.Right -- 39
+    SDL_SCANCODE_DOWN, // VirtualKey.Down -- 40
+    SDL_SCANCODE_SELECT, // VirtualKey.Select -- 41
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Print -- 42  (maybe SDL_SCANCODE_PRINTSCREEN ?)
+    SDL_SCANCODE_EXECUTE, // VirtualKey.Execute -- 43
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Snapshot -- 44
+    SDL_SCANCODE_INSERT, // VirtualKey.Insert -- 45
+    SDL_SCANCODE_DELETE, // VirtualKey.Delete -- 46
+    SDL_SCANCODE_HELP, // VirtualKey.Help -- 47
+    SDL_SCANCODE_0, // VirtualKey.Number0 -- 48
+    SDL_SCANCODE_1, // VirtualKey.Number1 -- 49
+    SDL_SCANCODE_2, // VirtualKey.Number2 -- 50
+    SDL_SCANCODE_3, // VirtualKey.Number3 -- 51
+    SDL_SCANCODE_4, // VirtualKey.Number4 -- 52
+    SDL_SCANCODE_5, // VirtualKey.Number5 -- 53
+    SDL_SCANCODE_6, // VirtualKey.Number6 -- 54
+    SDL_SCANCODE_7, // VirtualKey.Number7 -- 55
+    SDL_SCANCODE_8, // VirtualKey.Number8 -- 56
+    SDL_SCANCODE_9, // VirtualKey.Number9 -- 57
+    SDL_SCANCODE_UNKNOWN, // -- 58
+    SDL_SCANCODE_UNKNOWN, // -- 59
+    SDL_SCANCODE_UNKNOWN, // -- 60
+    SDL_SCANCODE_UNKNOWN, // -- 61
+    SDL_SCANCODE_UNKNOWN, // -- 62
+    SDL_SCANCODE_UNKNOWN, // -- 63
+    SDL_SCANCODE_UNKNOWN, // -- 64
+    SDL_SCANCODE_A, // VirtualKey.A -- 65
+    SDL_SCANCODE_B, // VirtualKey.B -- 66
+    SDL_SCANCODE_C, // VirtualKey.C -- 67
+    SDL_SCANCODE_D, // VirtualKey.D -- 68
+    SDL_SCANCODE_E, // VirtualKey.E -- 69
+    SDL_SCANCODE_F, // VirtualKey.F -- 70
+    SDL_SCANCODE_G, // VirtualKey.G -- 71
+    SDL_SCANCODE_H, // VirtualKey.H -- 72
+    SDL_SCANCODE_I, // VirtualKey.I -- 73
+    SDL_SCANCODE_J, // VirtualKey.J -- 74
+    SDL_SCANCODE_K, // VirtualKey.K -- 75
+    SDL_SCANCODE_L, // VirtualKey.L -- 76
+    SDL_SCANCODE_M, // VirtualKey.M -- 77
+    SDL_SCANCODE_N, // VirtualKey.N -- 78
+    SDL_SCANCODE_O, // VirtualKey.O -- 79
+    SDL_SCANCODE_P, // VirtualKey.P -- 80
+    SDL_SCANCODE_Q, // VirtualKey.Q -- 81
+    SDL_SCANCODE_R, // VirtualKey.R -- 82
+    SDL_SCANCODE_S, // VirtualKey.S -- 83
+    SDL_SCANCODE_T, // VirtualKey.T -- 84
+    SDL_SCANCODE_U, // VirtualKey.U -- 85
+    SDL_SCANCODE_V, // VirtualKey.V -- 86
+    SDL_SCANCODE_W, // VirtualKey.W -- 87
+    SDL_SCANCODE_X, // VirtualKey.X -- 88
+    SDL_SCANCODE_Y, // VirtualKey.Y -- 89
+    SDL_SCANCODE_Z, // VirtualKey.Z -- 90
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.LeftWindows -- 91  (maybe SDL_SCANCODE_APPLICATION or SDL_SCANCODE_LGUI ?)
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.RightWindows -- 92  (maybe SDL_SCANCODE_APPLICATION or SDL_SCANCODE_RGUI ?)
+    SDL_SCANCODE_APPLICATION, // VirtualKey.Application -- 93
+    SDL_SCANCODE_UNKNOWN, // -- 94
+    SDL_SCANCODE_SLEEP, // VirtualKey.Sleep -- 95
+    SDL_SCANCODE_KP_0, // VirtualKey.NumberPad0 -- 96
+    SDL_SCANCODE_KP_1, // VirtualKey.NumberPad1 -- 97
+    SDL_SCANCODE_KP_2, // VirtualKey.NumberPad2 -- 98
+    SDL_SCANCODE_KP_3, // VirtualKey.NumberPad3 -- 99
+    SDL_SCANCODE_KP_4, // VirtualKey.NumberPad4 -- 100
+    SDL_SCANCODE_KP_5, // VirtualKey.NumberPad5 -- 101
+    SDL_SCANCODE_KP_6, // VirtualKey.NumberPad6 -- 102
+    SDL_SCANCODE_KP_7, // VirtualKey.NumberPad7 -- 103
+    SDL_SCANCODE_KP_8, // VirtualKey.NumberPad8 -- 104
+    SDL_SCANCODE_KP_9, // VirtualKey.NumberPad9 -- 105
+    SDL_SCANCODE_KP_MULTIPLY, // VirtualKey.Multiply -- 106
+    SDL_SCANCODE_KP_PLUS, // VirtualKey.Add -- 107
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Separator -- 108
+    SDL_SCANCODE_KP_MINUS, // VirtualKey.Subtract -- 109
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Decimal -- 110  (maybe SDL_SCANCODE_DECIMALSEPARATOR, SDL_SCANCODE_KP_DECIMAL, or SDL_SCANCODE_KP_PERIOD ?)
+    SDL_SCANCODE_KP_DIVIDE, // VirtualKey.Divide -- 111
+    SDL_SCANCODE_F1, // VirtualKey.F1 -- 112
+    SDL_SCANCODE_F2, // VirtualKey.F2 -- 113
+    SDL_SCANCODE_F3, // VirtualKey.F3 -- 114
+    SDL_SCANCODE_F4, // VirtualKey.F4 -- 115
+    SDL_SCANCODE_F5, // VirtualKey.F5 -- 116
+    SDL_SCANCODE_F6, // VirtualKey.F6 -- 117
+    SDL_SCANCODE_F7, // VirtualKey.F7 -- 118
+    SDL_SCANCODE_F8, // VirtualKey.F8 -- 119
+    SDL_SCANCODE_F9, // VirtualKey.F9 -- 120
+    SDL_SCANCODE_F10, // VirtualKey.F10 -- 121
+    SDL_SCANCODE_F11, // VirtualKey.F11 -- 122
+    SDL_SCANCODE_F12, // VirtualKey.F12 -- 123
+    SDL_SCANCODE_F13, // VirtualKey.F13 -- 124
+    SDL_SCANCODE_F14, // VirtualKey.F14 -- 125
+    SDL_SCANCODE_F15, // VirtualKey.F15 -- 126
+    SDL_SCANCODE_F16, // VirtualKey.F16 -- 127
+    SDL_SCANCODE_F17, // VirtualKey.F17 -- 128
+    SDL_SCANCODE_F18, // VirtualKey.F18 -- 129
+    SDL_SCANCODE_F19, // VirtualKey.F19 -- 130
+    SDL_SCANCODE_F20, // VirtualKey.F20 -- 131
+    SDL_SCANCODE_F21, // VirtualKey.F21 -- 132
+    SDL_SCANCODE_F22, // VirtualKey.F22 -- 133
+    SDL_SCANCODE_F23, // VirtualKey.F23 -- 134
+    SDL_SCANCODE_F24, // VirtualKey.F24 -- 135
+    SDL_SCANCODE_UNKNOWN, // -- 136
+    SDL_SCANCODE_UNKNOWN, // -- 137
+    SDL_SCANCODE_UNKNOWN, // -- 138
+    SDL_SCANCODE_UNKNOWN, // -- 139
+    SDL_SCANCODE_UNKNOWN, // -- 140
+    SDL_SCANCODE_UNKNOWN, // -- 141
+    SDL_SCANCODE_UNKNOWN, // -- 142
+    SDL_SCANCODE_UNKNOWN, // -- 143
+    SDL_SCANCODE_NUMLOCKCLEAR, // VirtualKey.NumberKeyLock -- 144
+    SDL_SCANCODE_SCROLLLOCK, // VirtualKey.Scroll -- 145
+    SDL_SCANCODE_UNKNOWN, // -- 146
+    SDL_SCANCODE_UNKNOWN, // -- 147
+    SDL_SCANCODE_UNKNOWN, // -- 148
+    SDL_SCANCODE_UNKNOWN, // -- 149
+    SDL_SCANCODE_UNKNOWN, // -- 150
+    SDL_SCANCODE_UNKNOWN, // -- 151
+    SDL_SCANCODE_UNKNOWN, // -- 152
+    SDL_SCANCODE_UNKNOWN, // -- 153
+    SDL_SCANCODE_UNKNOWN, // -- 154
+    SDL_SCANCODE_UNKNOWN, // -- 155
+    SDL_SCANCODE_UNKNOWN, // -- 156
+    SDL_SCANCODE_UNKNOWN, // -- 157
+    SDL_SCANCODE_UNKNOWN, // -- 158
+    SDL_SCANCODE_UNKNOWN, // -- 159
+    SDL_SCANCODE_LSHIFT, // VirtualKey.LeftShift -- 160
+    SDL_SCANCODE_RSHIFT, // VirtualKey.RightShift -- 161
+    SDL_SCANCODE_LCTRL, // VirtualKey.LeftControl -- 162
+    SDL_SCANCODE_RCTRL, // VirtualKey.RightControl -- 163
+    SDL_SCANCODE_MENU, // VirtualKey.LeftMenu -- 164
+    SDL_SCANCODE_MENU, // VirtualKey.RightMenu -- 165
+};
+
+static SDL_Scancode
+TranslateKeycode(int keycode)
+{
+    SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+    if (keycode < SDL_arraysize(WinRT_Keycodes)) {
+        scancode = WinRT_Keycodes[keycode];
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        SDL_Log("WinRT TranslateKeycode, unknown keycode=%d\n", (int)keycode);
+    }
+    return scancode;
+}
+
+void SDL_WinRTApp::OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args)
+{
+#if 0
+    SDL_Log("key down, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, scan code=%d, was down?=%s, vkey=%d\n",
+        (args->Handled ? "1" : "0"),
+        (args->KeyStatus.IsExtendedKey ? "1" : "0"),
+        (args->KeyStatus.IsKeyReleased ? "1" : "0"),
+        (args->KeyStatus.IsMenuKeyDown ? "1" : "0"),
+        args->KeyStatus.RepeatCount,
+        args->KeyStatus.ScanCode,
+        (args->KeyStatus.WasKeyDown ? "1" : "0"),
+        args->VirtualKey);
+    //args->Handled = true;
+    //VirtualKey vkey = args->VirtualKey;
+#endif
+    SDL_SendKeyboardKey(SDL_PRESSED, TranslateKeycode((int)args->VirtualKey));
+}
+
+void SDL_WinRTApp::OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args)
+{
+#if 0
+    SDL_Log("key up, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, scan code=%d, was down?=%s, vkey=%d\n",
+        (args->Handled ? "1" : "0"),
+        (args->KeyStatus.IsExtendedKey ? "1" : "0"),
+        (args->KeyStatus.IsKeyReleased ? "1" : "0"),
+        (args->KeyStatus.IsMenuKeyDown ? "1" : "0"),
+        args->KeyStatus.RepeatCount,
+        args->KeyStatus.ScanCode,
+        (args->KeyStatus.WasKeyDown ? "1" : "0"),
+        args->VirtualKey);
+    //args->Handled = true;
+#endif
+    SDL_SendKeyboardKey(SDL_RELEASED, TranslateKeycode((int)args->VirtualKey));
+}
+
 void SDL_WinRTApp::OnActivated(CoreApplicationView^ applicationView, IActivatedEventArgs^ args)
 {
 	CoreWindow::GetForCurrentThread()->Activate();
--- a/src/video/windowsrt/SDL_WinRTApp.h	Mon Oct 29 23:32:13 2012 -0400
+++ b/src/video/windowsrt/SDL_WinRTApp.h	Sun Nov 04 09:02:58 2012 -0500
@@ -39,6 +39,8 @@
 	void OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
 	void OnPointerReleased(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
 	void OnPointerMoved(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
+    void OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
+    void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
 
 private:
 	CubeRenderer^ m_renderer;