proxy input events

5 files changed, 191 insertions, 1 deletions

diff --git a/src/postamble.js b/src/postamble.js
index df844121..d3212767 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -10,8 +10,8 @@ ExitStatus.prototype = new Error();
 ExitStatus.prototype.constructor = ExitStatus;
 
 var initialStackTop;
-
 var preloadStartTime = null;
+var calledMain = false;
 
 Module['callMain'] = Module.callMain = function callMain(args) {
   assert(runDependencies == 0, 'cannot call main when async dependencies remain! (listen on __ATMAIN__)');
@@ -70,6 +70,8 @@ Module['callMain'] = Module.callMain = function callMain(args) {
     } else {
       throw e;
     }
+  } finally {
+    calledMain = true;
   }
 }
 
diff --git a/src/proxyClient.js b/src/proxyClient.js
index bbf3e278..41f6a501 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -41,3 +41,31 @@ worker.onmessage = function(event) {
   }
 };
 
+function cloneEvent(event) {
+  var ret = {};
+  for (var x in event) {
+    if (x == x.toUpperCase()) continue;
+    var prop = event[x];
+    if (typeof prop === 'number' || typeof prop === 'string') ret[x] = prop;
+  }
+  return ret;
+};
+
+['keydown', 'keyup', 'keypress', 'blur', 'visibilitychange'].forEach(function(event) {
+  document.addEventListener(event, function(event) {
+    worker.postMessage({ target: 'document', event: cloneEvent(event) });
+  });
+});
+
+['unload'].forEach(function(event) {
+  window.addEventListener(event, function(event) {
+    worker.postMessage({ target: 'window', event: cloneEvent(event) });
+  });
+});
+
+['mousedown', 'mouseup', 'mousemove', 'DOMMouseScroll', 'mousewheel', 'mouseout'].forEach(function(event) {
+  Module.canvas.addEventListener(event, function(event) {
+    worker.postMessage({ target: 'canvas', event: cloneEvent(event) });
+  }, true);
+});
+
diff --git a/src/proxyWorker.js b/src/proxyWorker.js
index 5cdc4455..8d641b0d 100644
--- a/src/proxyWorker.js
+++ b/src/proxyWorker.js
@@ -6,6 +6,16 @@ function EventListener() {
     if (!this.listeners[event]) this.listeners[event] = [];
     this.listeners[event].push(func);
   };
+
+  this.fireEvent = function(event) {
+    event.preventDefault = function(){};
+
+    if (event.type in this.listeners) {
+      this.listeners[event.type].forEach(function(listener) {
+        listener(event);
+      });
+    }
+  };
 };
 
 var window = this;
@@ -75,3 +85,44 @@ Module.printErr = function(x) {
   postMessage({ target: 'stderr', content: x });
 };
 
+// buffer messages until the program starts to run
+
+var messageBuffer = null;
+
+function messageResender() {
+  if (calledMain) {
+    assert(messageBuffer && messageBuffer.length > 0);
+    messageBuffer.forEach(function(message) {
+      onmessage(message);
+    });
+    messageBuffer = null;
+  } else {
+    setTimeout(messageResender, 100);
+  }
+}
+
+onmessage = function(message) {
+  if (!calledMain) {
+    if (!messageBuffer) {
+      messageBuffer = [];
+      setTimeout(messageResender, 100);
+    }
+    messageBuffer.push(message);
+  }
+  switch (message.data.target) {
+    case 'document': {
+      document.fireEvent(message.data.event);
+      break;
+    }
+    case 'window': {
+      window.fireEvent(message.data.event);
+      break;
+    }
+    case 'canvas': {
+      Module.canvas.fireEvent(message.data.event);
+      break;
+    }
+    default: throw 'wha? ' + message.data.target;
+  }
+};
+
diff --git a/tests/sdl_key_proxy.c b/tests/sdl_key_proxy.c
new file mode 100644
index 00000000..bc233f29
--- /dev/null
+++ b/tests/sdl_key_proxy.c
@@ -0,0 +1,63 @@
+#include <stdio.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include <emscripten.h>
+
+int result = 1;
+
+void one() {
+  SDL_Event event;
+  while (SDL_PollEvent(&event)) {
+    printf("got event %d\n", event.type);
+    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");
+    }
+  }
+}
+
+int main(int argc, char **argv) {
+  printf("main\n");
+  SDL_Init(SDL_INIT_VIDEO);
+  SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE);
+
+  if (argc == 1337) one(); // keep it alive
+
+  return 0;
+}
+
diff --git a/tests/test_browser.py b/tests/test_browser.py
index 01bd189b..e6fd6544 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -680,6 +680,52 @@ window.close = function() {
     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?223092870')
 
+  def test_sdl_key_proxy(self):
+    open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
+      var Module = {};
+      Module.postRun = function() {
+        function doOne() {
+          Module._one();
+          setTimeout(doOne, 1000/60);
+        }
+        setTimeout(doOne, 1000/60);
+      }
+    ''')
+
+    def post():
+      html = open('test.html').read()
+      html = html.replace('</body>', '''
+<script>
+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);
+}
+
+keydown(1250);keydown(38);keyup(38);keyup(1250); // alt, up
+keydown(1248);keydown(1249);keydown(40);keyup(40);keyup(1249);keyup(1248); // ctrl, shift, down
+keydown(37);keyup(37); // left
+keydown(39);keyup(39); // right
+keydown(65);keyup(65); // a
+keydown(66);keyup(66); // b
+keydown(100);keyup(100); // trigger the end
+
+</script>
+</body>''')
+      open('test.html', 'w').write(html)
+
+    self.btest('sdl_key_proxy.c', '223092870', args=['--proxy-to-worker', '--pre-js', 'pre.js', '-s', '''EXPORTED_FUNCTIONS=['_main', '_one']'''], manual_reference=True, post_build=post)
+
   def test_sdl_text(self):
     open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
       Module.postRun = function() {