aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--src/library_sdl.js5
2 files changed, 5 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index e0038c77..c162103a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,5 +136,5 @@ a license to everyone to use it as detailed in LICENSE.)
* Thomas Borsos <thomasborsos@gmail.com>
* Ori Avtalion <ori@avtalion.name>
* Guillaume Blanc <guillaumeblanc.sc@gmail.com>
-
+* Usagi Ito <usagi@WonderRabbitProject.net>
diff --git a/src/library_sdl.js b/src/library_sdl.js
index eedb8c48..6e235e90 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -686,8 +686,11 @@ var LibrarySDL = {
} else {
code = SDL.keyCodes[event.keyCode] || event.keyCode;
}
+
+ var scan = code & ~(1 << 10);
+ scan = SDL.scanCodes[scan] || scan;
- {{{ makeSetValue('SDL.keyboardState', 'code', 'down', 'i8') }}};
+ {{{ makeSetValue('SDL.keyboardState', 'scan', 'down', 'i8') }}};
// TODO: lmeta, rmeta, numlock, capslock, KMOD_MODE, KMOD_RESERVED
SDL.modState = ({{{ makeGetValue('SDL.keyboardState', '1248', 'i8') }}} ? 0x0040 | 0x0080 : 0) | // KMOD_LCTRL & KMOD_RCTRL
({{{ makeGetValue('SDL.keyboardState', '1249', 'i8') }}} ? 0x0001 | 0x0002 : 0) | // KMOD_LSHIFT & KMOD_RSHIFT