4 files changed, 19 insertions, 4 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index ab10f455..ef15088e 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -325,7 +325,7 @@ function JSify(data, functionsOnly) {
 
     // NOTE: This is the only place that could potentially create static
     //       allocations in a shared library.
-    if (typeof constant === 'object') {
+    if (typeof constant !== 'string') {
       constant = makePointer(constant, null, allocator, item.type, index);
     }
 
diff --git a/src/library.js b/src/library.js
index 22fffb88..4f57c324 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3510,11 +3510,18 @@ LibraryManager.library = {
     return ret;
   },
 
+  emscripten_memcpy_big: function(dest, src, num) {
+    HEAPU8.set(HEAPU8.subarray(src, src+num), dest);
+    return dest;
+  },
+
   memcpy__asm: true,
   memcpy__sig: 'iiii',
+  memcpy__deps: ['emscripten_memcpy_big'],
   memcpy: function(dest, src, num) {
     dest = dest|0; src = src|0; num = num|0;
     var ret = 0;
+    if ((num|0) >= 4096) return _emscripten_memcpy_big(dest|0, src|0, num|0)|0;
     ret = dest|0;
     if ((dest&3) == (src&3)) {
       while (dest & 3) {
diff --git a/src/library_browser.js b/src/library_browser.js
index 458a8dd2..5d53b867 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -13,6 +13,7 @@ mergeInto(LibraryManager.library, {
   $Browser: {
     mainLoop: {
       scheduler: null,
+      method: '',
       shouldPause: false,
       paused: false,
       queue: [],
@@ -784,6 +785,11 @@ mergeInto(LibraryManager.library, {
       GL.newRenderingFrameStarted();
 #endif
 
+      if (Browser.mainLoop.method === 'timeout' && Module.ctx) {
+        Module.printErr('Looks like you are rendering without using requestAnimationFrame for the main loop. You should use 0 for the frame rate in emscripten_set_main_loop in order to use requestAnimationFrame, as that can greatly improve your frame rates!');
+        Browser.mainLoop.method = ''; // just warn once per call to set main loop
+      }
+
       if (Module['preMainLoop']) {
         Module['preMainLoop']();
       }
@@ -814,11 +820,13 @@ mergeInto(LibraryManager.library, {
     if (fps && fps > 0) {
       Browser.mainLoop.scheduler = function Browser_mainLoop_scheduler() {
         setTimeout(Browser.mainLoop.runner, 1000/fps); // doing this each time means that on exception, we stop
-      }
+      };
+      Browser.mainLoop.method = 'timeout';
     } else {
       Browser.mainLoop.scheduler = function Browser_mainLoop_scheduler() {
         Browser.requestAnimationFrame(Browser.mainLoop.runner);
-      }
+      };
+      Browser.mainLoop.method = 'rAF';
     }
     Browser.mainLoop.scheduler();
 
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 04e8fc18..caba9b74 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -406,7 +406,7 @@ var LibrarySDL = {
           // won't fire. However, it's fine (and in some cases necessary) to
           // preventDefault for keys that don't generate a character. Otherwise,
           // preventDefault is the right thing to do in general.
-          if (event.type !== 'keydown' || (event.keyCode === 8 /* backspace */ || event.keyCode === 9 /* tab */)) {
+          if (event.type !== 'keydown' || (!SDL.unicode && !SDL.textInput) || (event.keyCode === 8 /* backspace */ || event.keyCode === 9 /* tab */)) {
             event.preventDefault();
           }