- Fix for mod property of SDL key events

 - Added misc SDL functions (SDL_GetKeyName, SDL_GetAppState, SDL_SetGammaRamp)
 - Added modifiers to test_sdl_key

2 files changed, 36 insertions, 20 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 58332aed..5c5e3152 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -12112,23 +12112,26 @@ elif 'browser' in str(sys.argv):
           setTimeout(doOne, 1000/60);
         }
 
-        function simulateKeyEvent(c) {
+        function keydown(c) {
           var event = document.createEvent("KeyboardEvent");
           event.initKeyEvent("keydown", true, true, window,
                              0, 0, 0, 0,
                              c, c);
           document.dispatchEvent(event);
-          var event2 = document.createEvent("KeyboardEvent");
-          event2.initKeyEvent("keyup", true, true, window,
+        }
+
+        function keyup(c) {
+          var event = document.createEvent("KeyboardEvent");
+          event.initKeyEvent("keyup", true, true, window,
                              0, 0, 0, 0,
                              c, c);
-          document.dispatchEvent(event2);
+          document.dispatchEvent(event);
         }
       ''')
       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', '-s', '''EXPORTED_FUNCTIONS=['_main', '_one']''']).communicate()
-      self.run_browser('page.html', '', '/report_result?510510')
+      self.run_browser('page.html', '', '/report_result?223092870')
 
     def test_sdl_text(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 19b0a3d6..7a304fc1 100644
--- a/tests/sdl_key.c
+++ b/tests/sdl_key.c
@@ -12,16 +12,30 @@ void one() {
       case SDL_KEYDOWN:
         break;
       case SDL_KEYUP:
+        // don't handle the modifier key events
+        if (event.key.keysym.sym == SDLK_LCTRL ||
+            event.key.keysym.sym == SDLK_LSHIFT ||
+            event.key.keysym.sym == SDLK_LALT) {
+          return;
+        }
+        if ((event.key.keysym.mod & KMOD_LCTRL) || (event.key.keysym.mod & KMOD_RCTRL)) {
+          result *= 2;
+        }
+        if ((event.key.keysym.mod & KMOD_LSHIFT) || (event.key.keysym.mod & KMOD_RSHIFT)) {
+          result *= 3;
+        }
+        if ((event.key.keysym.mod & KMOD_LALT) || (event.key.keysym.mod & KMOD_RALT)) {
+          result *= 5;
+        }
         switch (event.key.keysym.sym) {
-          case SDLK_RIGHT: printf("right\n"); result *= 2; break;
-          case SDLK_LEFT: printf("left\n"); result *= 3; break;
-          case SDLK_DOWN: printf("down\n"); result *= 5; break;
-          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;
+          case SDLK_RIGHT: printf("right\n"); result *= 7; break;
+          case SDLK_LEFT: printf("left\n"); result *= 11; break;
+          case SDLK_DOWN: printf("down\n"); result *= 13; break;
+          case SDLK_UP: printf("up\n"); result *= 17; break;
+          case SDLK_a: printf("a\n"); result *= 19; break;
           default: {
             if (event.key.keysym.scancode == SDL_SCANCODE_B) {
-              printf("b scancode\n"); result *= 17; break;
+              printf("b scancode\n"); result *= 23; break;
             }
             printf("unknown key: sym %d scancode %d\n", event.key.keysym.sym, event.key.keysym.scancode);
             REPORT_RESULT();
@@ -40,14 +54,13 @@ int main(int argc, char **argv) {
   SDL_Init(SDL_INIT_VIDEO);
   SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE);
 
-  emscripten_run_script("simulateKeyEvent(38)"); // up
-  emscripten_run_script("simulateKeyEvent(40)"); // down
-  emscripten_run_script("simulateKeyEvent(37)"); // left
-  emscripten_run_script("simulateKeyEvent(39)"); // right
-  emscripten_run_script("simulateKeyEvent(32)"); // space
-  emscripten_run_script("simulateKeyEvent(65)"); // a
-  emscripten_run_script("simulateKeyEvent(66)"); // b
-  emscripten_run_script("simulateKeyEvent(100)"); // trigger the end
+  emscripten_run_script("keydown(1250);keydown(38);keyup(38);keyup(1250);"); // alt, up
+  emscripten_run_script("keydown(1248);keydown(1249);keydown(40);keyup(40);keyup(1249);keyup(1248);"); // ctrl, shift, down
+  emscripten_run_script("keydown(37);keyup(37);"); // left
+  emscripten_run_script("keydown(39);keyup(39);"); // right
+  emscripten_run_script("keydown(65);keyup(65);"); // a
+  emscripten_run_script("keydown(66);keyup(66);"); // b
+  emscripten_run_script("keydown(100);keyup(100);"); // trigger the end
 
   if (argc == 1337) one(); // keep it alive