Merge pull request #1507 from ToadKing/sdl-alpha-keys

SDL alpha keys fix

2 files changed, 17 insertions, 1 deletions

diff --git a/tests/sdl_pumpevents.c b/tests/sdl_pumpevents.c
index 64becaad..e765d285 100644
--- a/tests/sdl_pumpevents.c
+++ b/tests/sdl_pumpevents.c
@@ -40,6 +40,20 @@ int loop2()
    return r;
 }
 
+int alphakey()
+{
+   unsigned i;
+   int r = 0;
+
+   SDL_PumpEvents();
+
+   const Uint8 *keys = SDL_GetKeyState(NULL);
+   if (keys[SDLK_a])
+      r = 4;
+
+   return r;
+}
+
 int main(int argc, char *argv[])
 {
    SDL_Init(SDL_INIT_EVERYTHING);
@@ -49,6 +63,8 @@ int main(int argc, char *argv[])
    result += loop1();
    emscripten_run_script("keydown(39);"); // right
    result += loop2();
+   emscripten_run_script("keydown(65);"); // A
+   result += alphakey();
    REPORT_RESULT();
    return 0;
 }
diff --git a/tests/test_browser.py b/tests/test_browser.py
index 4b42eedd..1c9cbfad 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -805,7 +805,7 @@ If manually bisecting:
         document.dispatchEvent(event);
       }
     ''')
-    self.btest('sdl_pumpevents.c', expected='3', args=['--pre-js', 'pre.js'])
+    self.btest('sdl_pumpevents.c', expected='7', args=['--pre-js', 'pre.js'])
 
   def test_sdl_audio(self):
     shutil.copyfile(path_from_root('tests', 'sounds', 'alarmvictory_1.ogg'), os.path.join(self.get_dir(), 'sound.ogg'))