Add test for emscripten_SDL_SetEventHandler.

2 files changed, 77 insertions, 65 deletions

diff --git a/tests/sdl_key.c b/tests/sdl_key.c
index 7a304fc1..9c78694b 100644
--- a/tests/sdl_key.c
+++ b/tests/sdl_key.c
@@ -5,55 +5,68 @@
 
 int result = 1;
 
+int SDLCALL EventHandler(void *userdata, SDL_Event *event) {
+  switch(event->type) {
+    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 0;
+      }
+      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 *= 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 *= 23; break;
+          }
+          printf("unknown key: sym %d scancode %d\n", event->key.keysym.sym, event->key.keysym.scancode);
+          REPORT_RESULT();
+          emscripten_run_script("throw 'done'"); // comment this out to leave event handling active. Use the following to log DOM keys:
+                                                 // addEventListener('keyup', function(event) { console.log(event->keyCode) }, true)
+        }
+      }
+      break;
+    default: /* Report an unhandled event */
+      printf("I don't know what this event is (type=%d)!\n", event->type);
+  }
+  return 0;
+}
+
 void one() {
+#ifndef TEST_EMSCRIPTEN_SDL_SETEVENTHANDLER
   SDL_Event event;
   while (SDL_PollEvent(&event)) {
-    switch(event.type) {
-      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 *= 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 *= 23; break;
-            }
-            printf("unknown key: sym %d scancode %d\n", event.key.keysym.sym, event.key.keysym.scancode);
-            REPORT_RESULT();
-            emscripten_run_script("throw 'done'"); // comment this out to leave event handling active. Use the following to log DOM keys:
-                                                   // addEventListener('keyup', function(event) { console.log(event.keyCode) }, true)
-          }
-        }
-        break;
-      default: /* Report an unhandled event */
-        printf("I don't know what this event is!\n");
-    }
+    EventHandler(0, &event);
   }
+#endif
 }
 
 int main(int argc, char **argv) {
   SDL_Init(SDL_INIT_VIDEO);
   SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE);
 
+#ifdef TEST_EMSCRIPTEN_SDL_SETEVENTHANDLER
+  emscripten_SDL_SetEventHandler(EventHandler, 0);
+#else
+  if (argc == 1337) one(); // keep it alive
+#endif
+
   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
@@ -62,8 +75,6 @@ int main(int argc, char **argv) {
   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
-
   return 0;
 }
 
diff --git a/tests/test_browser.py b/tests/test_browser.py
index c8e07b25..b3406c24 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -748,35 +748,36 @@ window.close = function() {
     self.btest('sdl_canvas_alpha.c', reference='sdl_canvas_alpha.png', reference_slack=9)
 
   def test_sdl_key(self):
-    open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
-      Module.postRun = function() {
-        function doOne() {
-          Module._one();
+    for defines in [[], ['-DTEST_EMSCRIPTEN_SDL_SETEVENTHANDLER']]:
+      open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
+        Module.postRun = function() {
+          function doOne() {
+            Module._one();
+            setTimeout(doOne, 1000/60);
+          }
           setTimeout(doOne, 1000/60);
         }
-        setTimeout(doOne, 1000/60);
-      }
 
-      function keydown(c) {
-        var event = document.createEvent("KeyboardEvent");
-        event.initKeyEvent("keydown", true, true, window,
-                           0, 0, 0, 0,
-                           c, c);
-        document.dispatchEvent(event);
-      }
+        function keydown(c) {
+          var event = document.createEvent("KeyboardEvent");
+          event.initKeyEvent("keydown", true, true, window,
+                             0, 0, 0, 0,
+                             c, c);
+          document.dispatchEvent(event);
+        }
 
-      function keyup(c) {
-        var event = document.createEvent("KeyboardEvent");
-        event.initKeyEvent("keyup", true, true, window,
-                           0, 0, 0, 0,
-                           c, c);
-        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()))
+        function keyup(c) {
+          var event = document.createEvent("KeyboardEvent");
+          event.initKeyEvent("keyup", true, true, window,
+                             0, 0, 0, 0,
+                             c, c);
+          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']''', '-s', 'NO_EXIT_RUNTIME=1']).communicate()
-    self.run_browser('page.html', '', '/report_result?223092870')
+      Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'sdl_key.c'), '-o', 'page.html'] + defines + ['--pre-js', 'pre.js', '-s', '''EXPORTED_FUNCTIONS=['_main', '_one']''', '-s', 'NO_EXIT_RUNTIME=1']).communicate()
+      self.run_browser('page.html', '', '/report_result?223092870')
 
   def test_sdl_key_proxy(self):
     open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''