From 30a679c320c270f1ebd6328231f64aa760a1655a Mon Sep 17 00:00:00 2001
From: lemon-sherbet <tfefqwe@protonmail.com>
Date: Sun, 20 Sep 2020 11:31:58 +0200
Subject: [PATCH] fix keyboard input only working for one frame with controller
 plugged in

---
 emscripten-shell.html |  8 ++++----
 sdl12main.c           | 32 ++++++++++----------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/emscripten-shell.html b/emscripten-shell.html
index 6722c0e..f1ea138 100644
--- a/emscripten-shell.html
+++ b/emscripten-shell.html
@@ -51,10 +51,10 @@
     <div class="emscripten">
       <p>Experimental <a href="https://emscripten.org/">emscripten</a> build of <a href="https://github.com/lemon-sherbet/ccleste">ccleste</a>. <br>
         <ul>
-          <li>Jump with Z/C</li>
-          <li>Dash with X/V</li>
-          <li>Move with arrow keys</li>
-          <li>Escape to pause</li>
+          <li>Jump with Z/C/Gamepad A</li>
+          <li>Dash with X/V/Gamepad B</li>
+          <li>Move with arrow keys/Gamepad d-pad/Gamepad left stick</li>
+          <li>Escape/Gamepad start to pause</li>
           <li>Shift+S to save state</li>
           <li>Shift+D to load state</li>
           <li>Hold F9 to reset</li>
diff --git a/sdl12main.c b/sdl12main.c
index 6f96b13..31a3e05 100644
--- a/sdl12main.c
+++ b/sdl12main.c
@@ -394,6 +394,7 @@ static void mainLoop(void) {
 		}
 	} else reset_input_timer = 0;
 
+	buttons_state = 0;
 
 #if SDL_MAJOR_VERSION >= 2
 	SDL_GameControllerUpdate();
@@ -454,31 +455,18 @@ static void mainLoop(void) {
 					) {
 				enable_screenshake = !enable_screenshake;
 				OSDset("screenshake: %s", enable_screenshake ? "on" : "off");
-			}
-			//else: fallthrough
-		}
-		case SDL_KEYUP: {
-			int down = ev.type == SDL_KEYDOWN;
-			int b = -1;
-			switch (ev.key.keysym.sym) {
-				case SDLK_LEFT:  b = 0; break;
-				case SDLK_RIGHT: b = 1; break;
-				case SDLK_UP:    b = 2; break;
-				case SDLK_DOWN:  b = 3; break;
-				case SDLK_z: case SDLK_c: case SDLK_n: case SDLK_a:
-					b = 4; break;
-				case SDLK_x: case SDLK_v: case SDLK_m: case SDLK_b:
-					b = 5; break;
-				default: break;
-			}
-			if (!TAS && b >= 0) {
-				if (down) buttons_state |=  (1<<b);
-				else      buttons_state &= ~(1<<b);
-			}
+			} break;
 		}
 	}
 
-	if (TAS && !paused) {
+	if (!TAS) {
+		if (kbstate[SDLK_LEFT])  buttons_state |= (1<<0);
+		if (kbstate[SDLK_RIGHT]) buttons_state |= (1<<1);
+		if (kbstate[SDLK_UP])    buttons_state |= (1<<2);
+		if (kbstate[SDLK_DOWN])  buttons_state |= (1<<3);
+		if (kbstate[SDLK_z] || kbstate[SDLK_c] || kbstate[SDLK_n] || kbstate[SDLK_a]) buttons_state |= (1<<4);
+		if (kbstate[SDLK_x] || kbstate[SDLK_v] || kbstate[SDLK_m] || kbstate[SDLK_b]) buttons_state |= (1<<5);
+	} else if (TAS && !paused) {
 		static int t = 0;
 		t++;
 		if (t==1) buttons_state = 1<<4;