Commit 01f3498c3372a929bb7b719a855f577b8ed24813
2014-10-26T12:33:10
WinRT: more keyboard code cleanups - made keycode listings a bit easier to read - listed VK_ keycode names, where appropriate - removed a few pieces of dead + commented-out code - applied a common 'WINRT_' prefix to internal function names
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
diff --git a/src/video/winrt/SDL_winrtkeyboard.cpp b/src/video/winrt/SDL_winrtkeyboard.cpp
index 686f39e..920e45f 100644
--- a/src/video/winrt/SDL_winrtkeyboard.cpp
+++ b/src/video/winrt/SDL_winrtkeyboard.cpp
@@ -38,179 +38,179 @@ extern "C" {
static SDL_Scancode WinRT_Official_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_BACKSPACE, // VirtualKey.Back -- 8
- 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
- SDL_SCANCODE_AC_BACK, // VirtualKey.GoBack -- 166 : The go back key.
- SDL_SCANCODE_AC_FORWARD, // VirtualKey.GoForward -- 167 : The go forward key.
- SDL_SCANCODE_AC_REFRESH, // VirtualKey.Refresh -- 168 : The refresh key.
- SDL_SCANCODE_AC_STOP, // VirtualKey.Stop -- 169 : The stop key.
- SDL_SCANCODE_AC_SEARCH, // VirtualKey.Search -- 170 : The search key.
- SDL_SCANCODE_AC_BOOKMARKS, // VirtualKey.Favorites -- 171 : The favorites key.
- SDL_SCANCODE_AC_HOME // VirtualKey.GoHome -- 172 : The go home key.
+ 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_BACKSPACE, /* VirtualKey.Back -- 8 */
+ 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 */
+ SDL_SCANCODE_AC_BACK, /* VirtualKey.GoBack -- 166 : The go back key. */
+ SDL_SCANCODE_AC_FORWARD, /* VirtualKey.GoForward -- 167 : The go forward key. */
+ SDL_SCANCODE_AC_REFRESH, /* VirtualKey.Refresh -- 168 : The refresh key. */
+ SDL_SCANCODE_AC_STOP, /* VirtualKey.Stop -- 169 : The stop key. */
+ SDL_SCANCODE_AC_SEARCH, /* VirtualKey.Search -- 170 : The search key. */
+ SDL_SCANCODE_AC_BOOKMARKS, /* VirtualKey.Favorites -- 171 : The favorites key. */
+ SDL_SCANCODE_AC_HOME /* VirtualKey.GoHome -- 172 : The go home key. */
};
/* Attempt to translate a keycode that isn't listed in WinRT's VirtualKey enum.
@@ -219,43 +219,43 @@ static SDL_Scancode
WINRT_TranslateUnofficialKeycode(int keycode)
{
switch (keycode) {
- case 173: return SDL_SCANCODE_MUTE;
- case 174: return SDL_SCANCODE_VOLUMEDOWN;
- case 175: return SDL_SCANCODE_VOLUMEUP;
- case 176: return SDL_SCANCODE_AUDIONEXT;
- case 177: return SDL_SCANCODE_AUDIOPREV;
- // case 178: return ;
- case 179: return SDL_SCANCODE_AUDIOPLAY;
- case 180: return SDL_SCANCODE_MAIL;
- case 181: return SDL_SCANCODE_MEDIASELECT;
- // case 182: return ;
- case 183: return SDL_SCANCODE_CALCULATOR;
- // case 184: return ;
- // case 185: return ;
- case 186: return SDL_SCANCODE_SEMICOLON;
- case 187: return SDL_SCANCODE_EQUALS;
- case 188: return SDL_SCANCODE_COMMA;
- case 189: return SDL_SCANCODE_MINUS;
- case 190: return SDL_SCANCODE_PERIOD;
- case 191: return SDL_SCANCODE_SLASH;
- case 192: return SDL_SCANCODE_GRAVE;
+ case 173: return SDL_SCANCODE_MUTE; /* VK_VOLUME_MUTE */
+ case 174: return SDL_SCANCODE_VOLUMEDOWN; /* VK_VOLUME_DOWN */
+ case 175: return SDL_SCANCODE_VOLUMEUP; /* VK_VOLUME_UP */
+ case 176: return SDL_SCANCODE_AUDIONEXT; /* VK_MEDIA_NEXT_TRACK */
+ case 177: return SDL_SCANCODE_AUDIOPREV; /* VK_MEDIA_PREV_TRACK */
+ // case 178: return ; /* VK_MEDIA_STOP */
+ case 179: return SDL_SCANCODE_AUDIOPLAY; /* VK_MEDIA_PLAY_PAUSE */
+ case 180: return SDL_SCANCODE_MAIL; /* VK_LAUNCH_MAIL */
+ case 181: return SDL_SCANCODE_MEDIASELECT; /* VK_LAUNCH_MEDIA_SELECT */
+ // case 182: return ; /* VK_LAUNCH_APP1 */
+ case 183: return SDL_SCANCODE_CALCULATOR; /* VK_LAUNCH_APP2 */
+ // case 184: return ; /* ... reserved ... */
+ // case 185: return ; /* ... reserved ... */
+ case 186: return SDL_SCANCODE_SEMICOLON; /* VK_OEM_1, ';:' key on US standard keyboards */
+ case 187: return SDL_SCANCODE_EQUALS; /* VK_OEM_PLUS */
+ case 188: return SDL_SCANCODE_COMMA; /* VK_OEM_COMMA */
+ case 189: return SDL_SCANCODE_MINUS; /* VK_OEM_MINUS */
+ case 190: return SDL_SCANCODE_PERIOD; /* VK_OEM_PERIOD */
+ case 191: return SDL_SCANCODE_SLASH; /* VK_OEM_2, '/?' key on US standard keyboards */
+ case 192: return SDL_SCANCODE_GRAVE; /* VK_OEM_3, '`~' key on US standard keyboards */
// ?
- // ...
+ // ... reserved or unassigned ...
// ?
- case 219: return SDL_SCANCODE_LEFTBRACKET;
- case 220: return SDL_SCANCODE_BACKSLASH;
- case 221: return SDL_SCANCODE_RIGHTBRACKET;
- case 222: return SDL_SCANCODE_APOSTROPHE;
+ case 219: return SDL_SCANCODE_LEFTBRACKET; /* VK_OEM_4, '[{' key on US standard keyboards */
+ case 220: return SDL_SCANCODE_BACKSLASH; /* VK_OEM_5, '\|' key on US standard keyboards */
+ case 221: return SDL_SCANCODE_RIGHTBRACKET; /* VK_OEM_6, ']}' key on US standard keyboards */
+ case 222: return SDL_SCANCODE_APOSTROPHE; /* VK_OEM_7, 'single/double quote' on US standard keyboards */
default: break;
}
return SDL_SCANCODE_UNKNOWN;
}
static SDL_Scancode
-TranslateKeycode(int keycode, unsigned int nativeScancode)
+WINRT_TranslateKeycode(int keycode, unsigned int nativeScancode)
{
// TODO, WinRT: try filling out the WinRT keycode table as much as possible, using the Win32 table for interpretation hints
- //SDL_Log("WinRT TranslateKeycode, keycode=%d\n", (int)keycode);
+
SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
/* HACK ALERT: At least one VirtualKey constant (Shift) with a left/right
@@ -316,7 +316,7 @@ TranslateKeycode(int keycode, unsigned int nativeScancode)
void
WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args)
{
- SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
+ SDL_Scancode sdlScancode = WINRT_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, "
@@ -335,7 +335,6 @@ WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args)
keycode,
SDL_GetKeyName(keycode));
//args->Handled = true;
- //VirtualKey vkey = args->VirtualKey;
#endif
SDL_SendKeyboardKey(SDL_PRESSED, sdlScancode);
}
@@ -343,7 +342,7 @@ WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args)
void
WINRT_ProcessKeyUpEvent(Windows::UI::Core::KeyEventArgs ^args)
{
- SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey, args->KeyStatus.ScanCode);
+ SDL_Scancode sdlScancode = WINRT_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, "