From b9cffba14d58e67b4609ba21dc70593639ed5a15 Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Fri, 3 Jan 2025 21:16:43 +0000 Subject: [PATCH] xam: disable keyboard input if left alt is down This prevents the game from receiving erroneous inputs when trying to do ALT+ENTER. --- UnleashedRecomp/kernel/xam.cpp | 6 +++--- UnleashedRecomp/ui/game_window.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UnleashedRecomp/kernel/xam.cpp b/UnleashedRecomp/kernel/xam.cpp index 6136ee8..450430b 100644 --- a/UnleashedRecomp/kernel/xam.cpp +++ b/UnleashedRecomp/kernel/xam.cpp @@ -406,10 +406,10 @@ SWA_API uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_S uint32_t result = hid::GetState(userIndex, state); - if (GameWindow::s_isFocused) - { - auto keyboardState = SDL_GetKeyboardState(NULL); + auto keyboardState = SDL_GetKeyboardState(NULL); + if (GameWindow::s_isFocused && !keyboardState[SDL_SCANCODE_LALT]) + { if (keyboardState[SDL_SCANCODE_W]) state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_Y; if (keyboardState[SDL_SCANCODE_A]) diff --git a/UnleashedRecomp/ui/game_window.cpp b/UnleashedRecomp/ui/game_window.cpp index 2edcefa..6677ca4 100644 --- a/UnleashedRecomp/ui/game_window.cpp +++ b/UnleashedRecomp/ui/game_window.cpp @@ -185,7 +185,7 @@ void GameWindow::Init(const char* sdlVideoDriver) { // Try matching the current window size with a known configuration. if (def->Value < 0) - def->Value = GameWindow::FindNearestDisplayMode(); + def->Value = FindNearestDisplayMode(); }; Config::WindowSize.ApplyCallback = [](ConfigDef* def)