Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-05-04 19:24:48 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

First step towards configurable keyboard mappings (#464)

Browse source 
* Configurable keyboard mappings

* Cleanup

* Cleanup

* Biggest mistake of my career

* format

* Fix naming convention

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
This commit is contained in:
Paris Oplopoios 2024-03-21 15:54:18 +02:00 • committed by GitHub
parent 5488e9ca7c
commit 3270cfe602
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 162 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

132
src/panda_sdl/frontend_sdl.cpp
View file

@ -2,7 +2,7 @@
#include <glad/gl.h>
FrontendSDL::FrontendSDL() {
FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMappings()) {
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) < 0) {
Helpers::panic("Failed to initialize SDL2");
}
@ -92,95 +92,71 @@ void FrontendSDL::run() {
programRunning = false;
return;
case SDL_KEYDOWN:
case SDL_KEYDOWN: {
if (emu.romType == ROMType::None) break;
switch (event.key.keysym.sym) {
case SDLK_l: hid.pressKey(Keys::A); break;
case SDLK_k: hid.pressKey(Keys::B); break;
case SDLK_o: hid.pressKey(Keys::X); break;
case SDLK_i: hid.pressKey(Keys::Y); break;
case SDLK_q: hid.pressKey(Keys::L); break;
case SDLK_p: hid.pressKey(Keys::R); break;
case SDLK_RIGHT: hid.pressKey(Keys::Right); break;
case SDLK_LEFT: hid.pressKey(Keys::Left); break;
case SDLK_UP: hid.pressKey(Keys::Up); break;
case SDLK_DOWN: hid.pressKey(Keys::Down); break;
case SDLK_w:
hid.setCirclepadY(0x9C);
keyboardAnalogY = true;
break;
case SDLK_a:
hid.setCirclepadX(-0x9C);
keyboardAnalogX = true;
break;
case SDLK_s:
hid.setCirclepadY(-0x9C);
keyboardAnalogY = true;
break;
case SDLK_d:
hid.setCirclepadX(0x9C);
keyboardAnalogX = true;
break;
case SDLK_RETURN: hid.pressKey(Keys::Start); break;
case SDLK_BACKSPACE: hid.pressKey(Keys::Select); break;
// Use the F4 button as a hot-key to pause or resume the emulator
// We can't use the audio play/pause buttons because it's annoying
case SDLK_F4: {
emu.togglePause();
break;
u32 key = getMapping(event.key.keysym.scancode);
if (key != HID::Keys::Null) {
switch (key) {
case HID::Keys::CirclePadRight:
hid.setCirclepadX(0x9C);
keyboardAnalogX = true;
break;
case HID::Keys::CirclePadLeft:
hid.setCirclepadX(-0x9C);
keyboardAnalogX = true;
break;
case HID::Keys::CirclePadUp:
hid.setCirclepadY(0x9C);
keyboardAnalogY = true;
break;
case HID::Keys::CirclePadDown:
hid.setCirclepadY(-0x9C);
keyboardAnalogY = true;
break;
default: hid.pressKey(key); break;
}
} else {
switch (event.key.keysym.sym) {
// Use the F4 button as a hot-key to pause or resume the emulator
// We can't use the audio play/pause buttons because it's annoying
case SDLK_F4: {
emu.togglePause();
break;
}
// Use F5 as a reset button
case SDLK_F5: {
emu.reset(Emulator::ReloadOption::Reload);
break;
// Use F5 as a reset button
case SDLK_F5: {
emu.reset(Emulator::ReloadOption::Reload);
break;
}
}
}
break;
}
case SDL_KEYUP:
case SDL_KEYUP: {
if (emu.romType == ROMType::None) break;
switch (event.key.keysym.sym) {
case SDLK_l: hid.releaseKey(Keys::A); break;
case SDLK_k: hid.releaseKey(Keys::B); break;
case SDLK_o: hid.releaseKey(Keys::X); break;
case SDLK_i: hid.releaseKey(Keys::Y); break;
case SDLK_q: hid.releaseKey(Keys::L); break;
case SDLK_p: hid.releaseKey(Keys::R); break;
case SDLK_RIGHT: hid.releaseKey(Keys::Right); break;
case SDLK_LEFT: hid.releaseKey(Keys::Left); break;
case SDLK_UP: hid.releaseKey(Keys::Up); break;
case SDLK_DOWN: hid.releaseKey(Keys::Down); break;
// Err this is probably not ideal
case SDLK_w:
case SDLK_s:
hid.setCirclepadY(0);
keyboardAnalogY = false;
break;
case SDLK_a:
case SDLK_d:
hid.setCirclepadX(0);
keyboardAnalogX = false;
break;
case SDLK_RETURN: hid.releaseKey(Keys::Start); break;
case SDLK_BACKSPACE: hid.releaseKey(Keys::Select); break;
u32 key = getMapping(event.key.keysym.scancode);
if (key != HID::Keys::Null) {
switch (key) {
// Err this is probably not ideal
case HID::Keys::CirclePadRight:
case HID::Keys::CirclePadLeft:
hid.setCirclepadX(0);
keyboardAnalogX = false;
break;
case HID::Keys::CirclePadUp:
case HID::Keys::CirclePadDown:
hid.setCirclepadY(0);
keyboardAnalogY = false;
break;
default: hid.releaseKey(key); break;
}
}
break;
}
case SDL_MOUSEBUTTONDOWN:
if (emu.romType == ROMType::None) break;

25
src/panda_sdl/mappings.cpp Normal file
View file

@ -0,0 +1,25 @@
#include "input_mappings.hpp"
#include <SDL.h>
InputMappings InputMappings::defaultKeyboardMappings() {
InputMappings mappings;
mappings.setMapping(SDLK_l, HID::Keys::A);
mappings.setMapping(SDLK_k, HID::Keys::B);
mappings.setMapping(SDLK_o, HID::Keys::X);
mappings.setMapping(SDLK_i, HID::Keys::Y);
mappings.setMapping(SDLK_q, HID::Keys::L);
mappings.setMapping(SDLK_p, HID::Keys::R);
mappings.setMapping(SDLK_UP, HID::Keys::Up);
mappings.setMapping(SDLK_DOWN, HID::Keys::Down);
mappings.setMapping(SDLK_RIGHT, HID::Keys::Right);
mappings.setMapping(SDLK_LEFT, HID::Keys::Left);
mappings.setMapping(SDLK_RETURN, HID::Keys::Start);
mappings.setMapping(SDLK_BACKSPACE, HID::Keys::Select);
mappings.setMapping(SDLK_w, HID::Keys::CirclePadUp);
mappings.setMapping(SDLK_s, HID::Keys::CirclePadDown);
mappings.setMapping(SDLK_d, HID::Keys::CirclePadRight);
mappings.setMapping(SDLK_a, HID::Keys::CirclePadLeft);
return mappings;
}