catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore old keybindings for Windows and Linux.

This commit is contained in:
squidbus 2024-07-17 04:01:28 -07:00 committed by TheTurtle
parent 426d82d07b
commit cf03743631
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sdl_window.cpp
View File

@ -105,6 +105,20 @@ void WindowSDL::onResize() {
void WindowSDL::onKeyPress(const SDL_Event* event) { void WindowSDL::onKeyPress(const SDL_Event* event) {
using Libraries::Pad::OrbisPadButtonDataOffset; using Libraries::Pad::OrbisPadButtonDataOffset;
#ifdef __APPLE__
// Use keys that are more friendly for keyboards without a keypad.
// Once there are key binding options this won't be necessary.
constexpr SDL_Keycode CrossKey = SDLK_N;
constexpr SDL_Keycode CircleKey = SDLK_B;
constexpr SDL_Keycode SquareKey = SDLK_V;
constexpr SDL_Keycode TriangleKey = SDLK_C;
#else
constexpr SDL_Keycode CrossKey = SDLK_KP_2;
constexpr SDL_Keycode CircleKey = SDLK_KP_6;
constexpr SDL_Keycode SquareKey = SDLK_KP_4;
constexpr SDL_Keycode TriangleKey = SDLK_KP_8;
#endif
u32 button = 0; u32 button = 0;
Input::Axis axis = Input::Axis::AxisMax; Input::Axis axis = Input::Axis::AxisMax;
int axisvalue = 0; int axisvalue = 0;
@ -122,16 +136,16 @@ void WindowSDL::onKeyPress(const SDL_Event* event) {
case SDLK_RIGHT: case SDLK_RIGHT:
button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_RIGHT; button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_RIGHT;
break; break;
case SDLK_C: case TriangleKey:
button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_TRIANGLE; button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_TRIANGLE;
break; break;
case SDLK_B: case CircleKey:
button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_CIRCLE; button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_CIRCLE;
break; break;
case SDLK_N: case CrossKey:
button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_CROSS; button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_CROSS;
break; break;
case SDLK_V: case SquareKey:
button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_SQUARE; button = OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_SQUARE;
break; break;
case SDLK_RETURN: case SDLK_RETURN: