Merge branch 'incoming'

Conflicts:
	AUTHORS

1 files changed, 11 insertions, 3 deletions

diff --git a/src/library_sdl.js b/src/library_sdl.js
index cfab6410..e02e1e62 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -607,9 +607,11 @@ var LibrarySDL = {
   SDL_Init: function(what) {
     SDL.startTime = Date.now();
     // capture all key events. we just keep down and up, but also capture press to prevent default actions
-    document.onkeydown = SDL.receiveEvent;
-    document.onkeyup = SDL.receiveEvent;
-    document.onkeypress = SDL.receiveEvent;
+    if (!Module['doNotCaptureKeyboard']) {
+      document.onkeydown = SDL.receiveEvent;
+      document.onkeyup = SDL.receiveEvent;
+      document.onkeypress = SDL.receiveEvent;
+    }
     window.onunload = SDL.receiveEvent;
     SDL.keyboardState = _malloc(0x10000);
     _memset(SDL.keyboardState, 0, 0x10000);
@@ -1077,7 +1079,9 @@ var LibrarySDL = {
     }
     var surf = SDL.makeSurface(raw.width, raw.height, 0, false, 'load:' + filename);
     var surfData = SDL.surfaces[surf];
+    surfData.ctx.globalCompositeOperation = "copy";
     surfData.ctx.drawImage(raw, 0, 0, raw.width, raw.height, 0, 0, raw.width, raw.height);
+    surfData.ctx.globalCompositeOperation = "source-over";
     // XXX SDL does not specify that loaded images must have available pixel data, in fact
     //     there are cases where you just want to blit them, so you just need the hardware
     //     accelerated version. However, code everywhere seems to assume that the pixels
@@ -1176,6 +1180,10 @@ var LibrarySDL = {
 
   // SDL Mixer
 
+  Mix_Init: function(flags) {
+    return 8; /* MIX_INIT_OGG */
+  },
+
   Mix_OpenAudio: function(frequency, format, channels, chunksize) {
     SDL.allocateChannels(32);
     // Just record the values for a later call to Mix_QuickLoad_RAW