aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-08 09:34:51 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-08 09:34:51 -0700
commit0a1110333ae81557e6319f2109bc591f834dbc16 (patch)
treee9aec0920e55d529b5b1133c1f37b3fe384c1ece /tests
parentc78357cce927d3ffc80fcafabc3cd20cf2751d38 (diff)
support for sdl scancodes
Diffstat (limited to 'tests')
-rwxr-xr-xtests/runner.py2
-rw-r--r--tests/sdl_key.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 03ec803f..d13815f3 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -6866,7 +6866,7 @@ elif 'browser' in str(sys.argv):
open(os.path.join(self.get_dir(), 'sdl_key.c'), 'w').write(self.with_report_result(open(path_from_root('tests', 'sdl_key.c')).read()))
Popen(['python', EMCC, os.path.join(self.get_dir(), 'sdl_key.c'), '-o', 'page.html', '--pre-js', 'pre.js']).communicate()
- self.run_browser('page.html', '', '/report_result?30030')
+ self.run_browser('page.html', '', '/report_result?510510')
def test_sdl_mouse(self):
open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
diff --git a/tests/sdl_key.c b/tests/sdl_key.c
index 633e975f..6a5ad694 100644
--- a/tests/sdl_key.c
+++ b/tests/sdl_key.c
@@ -19,7 +19,13 @@ void one() {
case SDLK_UP: printf("up\n"); result *= 7; break;
case SDLK_SPACE: printf("space\n"); result *= 11; break;
case SDLK_a: printf("a\n"); result *= 13; break;
- default: { REPORT_RESULT(); emscripten_run_script("throw 'done'"); }
+ default: {
+ if (event.key.keysym.scancode == SDL_SCANCODE_B) {
+ printf("b scancode\n"); result *= 17; break;
+ }
+ REPORT_RESULT();
+ emscripten_run_script("throw 'done'");
+ }
}
break;
default: /* Report an unhandled event */
@@ -38,6 +44,7 @@ int main(int argc, char **argv) {
emscripten_run_script("simulateKeyEvent(39)");
emscripten_run_script("simulateKeyEvent(32)");
emscripten_run_script("simulateKeyEvent(97)");
+ emscripten_run_script("simulateKeyEvent(98)");
emscripten_run_script("simulateKeyEvent(100)"); // trigger the end
if (argc == 1337) one(); // keep it alive