From d5f29beb8fb0fcb5ef53ab818c3ab3f00758d634 Mon Sep 17 00:00:00 2001 From: lif <> Date: Sun, 3 Mar 2024 02:39:46 -0800 Subject: [PATCH] key input --- main.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 6fd2918..c455547 100644 --- a/main.c +++ b/main.c @@ -2,6 +2,7 @@ #include "SDL3/SDL_blendmode.h" #include "SDL3/SDL_error.h" #include "SDL3/SDL_init.h" +#include "SDL3/SDL_keycode.h" #include "SDL3/SDL_log.h" #include "SDL3/SDL_main.h" #include "SDL3/SDL_pixels.h" @@ -41,6 +42,7 @@ static SDL_Surface* filtered[NUM_CHANNELS] = { NULL, NULL, NULL }; static SDL_Surface* screens[NUM_CHANNELS] = { NULL, NULL, NULL }; static struct mCore* cores[NUM_CHANNELS] = { NULL, NULL, NULL }; +static unsigned keys = 0; enum mColorFormat pixfmt_sdl_to_mgba(uint32_t sdl_fmt) { switch (sdl_fmt) { @@ -340,12 +342,32 @@ int SDL_AppEvent(const SDL_Event *event) { switch (event->type) { case SDL_EVENT_KEY_DOWN: { const SDL_Keycode sym = event->key.keysym.sym; - if (sym == SDLK_ESCAPE || sym == SDLK_AC_BACK) { - SDL_Log("Key : Escape!"); - return 1; - } else if (sym == SDLK_SPACE) { - FlipCamera(); - return 0; + switch (sym) { + case SDLK_ESCAPE: case SDLK_AC_BACK: return 1; + case SDLK_SPACE: FlipCamera(); break; + case SDLK_UP: keys |= 0x40; break; + case SDLK_DOWN: keys |= 0x80; break; + case SDLK_LEFT: keys |= 0x20; break; + case SDLK_RIGHT: keys |= 0x10; break; + case SDLK_a: case SDLK_z: keys |= 1; break; + case SDLK_b: case SDLK_x: keys |= 2; break; + case SDLK_RETURN: keys |= 8; break; + case SDLK_BACKSPACE: keys |= 4; break; + } + break; + } + + case SDL_EVENT_KEY_UP: { + const SDL_Keycode sym = event->key.keysym.sym; + switch (sym) { + case SDLK_UP: keys &= ~0x40; break; + case SDLK_DOWN: keys &= ~0x80; break; + case SDLK_LEFT: keys &= ~0x20; break; + case SDLK_RIGHT: keys &= ~0x10; break; + case SDLK_a: case SDLK_z: keys &= ~1; break; + case SDLK_b: case SDLK_x: keys &= ~2; break; + case SDLK_RETURN: keys &= ~8; break; + case SDLK_BACKSPACE: keys &= ~4; break; } break; } @@ -417,8 +439,13 @@ int SDL_AppIterate(void) { if (since_last_present < FRAMESKIP_LIMIT) { for (i = 0; i < NUM_CHANNELS; i++) { struct mCore* core = cores[i]; + core->setKeys(core, keys); core->runFrame(core); } + /*hack*/ + if (keys && since_last_present < FRAMESKIP_LIMIT - 8) { + since_last_present = FRAMESKIP_LIMIT - 8; + } } if (!texture_updated) {