Fix controller input lingering when unfocused (#210)

UnleashedRecomp/hid/driver/sdl_hid.cpp

@@ -68,7 +68,7 @@ public:
 
     bool CanPoll()
     {
-        return controller && (GameWindow::s_isFocused || Config::AllowBackgroundInput);
+        return controller;
     }
 
     void PollAxis()

UnleashedRecomp/hid/hid.cpp

@@ -1,4 +1,6 @@
 #include "hid.h"
+#include <ui/game_window.h>
+#include <user/config.h>
 
 hid::EInputDevice hid::g_inputDevice;
 hid::EInputDevice hid::g_inputDeviceController;
@@ -11,6 +13,11 @@ void hid::SetProhibitedButtons(uint16_t wButtons)
     hid::g_prohibitedButtons = wButtons;
 }
 
+bool hid::IsInputAllowed()
+{
+    return GameWindow::s_isFocused || Config::AllowBackgroundInput;
+}
+
 bool hid::IsInputDeviceController()
 {
     return hid::g_inputDevice != hid::EInputDevice::Keyboard &&

UnleashedRecomp/hid/hid.h

@@ -41,6 +41,7 @@ namespace hid
     uint32_t SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration);
     uint32_t GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps);
 
+    bool IsInputAllowed();
     bool IsInputDeviceController();
     std::string GetInputDeviceName();
 }

UnleashedRecomp/kernel/xam.cpp

@@ -405,7 +405,8 @@ uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_STATE* st
 {
     memset(state, 0, sizeof(*state));
 
-    uint32_t result = hid::GetState(userIndex, state);
+    if (hid::IsInputAllowed())
+        hid::GetState(userIndex, state);
 
     if (GameWindow::s_isFocused)
     {

UnleashedRecomp/patches/input_patches.cpp

@@ -123,6 +123,9 @@ public:
 
     void OnSDLEvent(SDL_Event* event) override
     {
+        if (!hid::IsInputAllowed())
+            return;
+
         switch (event->type)
         {
 #ifdef UI_KBM_SUPPORT

UnleashedRecomp/ui/installer_wizard.cpp

@@ -159,18 +159,18 @@ class SDLEventListenerForInstaller : public SDLEventListener
 public:
     void OnSDLEvent(SDL_Event *event) override
     {
+        if (!InstallerWizard::s_isVisible || !g_currentMessagePrompt.empty() || g_currentPickerVisible || !hid::IsInputAllowed())
+            return;
+
         constexpr float AxisValueRange = 32767.0f;
         constexpr float AxisTapRange = 0.5f;
-        if (!InstallerWizard::s_isVisible || !g_currentMessagePrompt.empty() || g_currentPickerVisible)
-        {
-            return;
-        }
-
         int newCursorIndex = -1;
         ImVec2 tapDirection = {};
+
         switch (event->type)
         {
             case SDL_KEYDOWN:
+            {
                 switch (event->key.keysym.scancode)
                 {
                     case SDL_SCANCODE_LEFT:
@@ -188,7 +188,10 @@ public:
                 }
 
                 break;
+            }
+
             case SDL_CONTROLLERBUTTONDOWN:
+            {
                 switch (event->cbutton.button)
                 {
                     case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
@@ -209,6 +212,8 @@ public:
                 }
 
                 break;
+            }
+
             case SDL_CONTROLLERAXISMOTION:
             {
                 if (event->caxis.axis < 2)
@@ -227,29 +232,27 @@ public:
 
                 break;
             }
+
             case SDL_MOUSEBUTTONDOWN:
             case SDL_MOUSEMOTION:
             {
                 for (size_t i = 0; i < g_currentCursorRects.size(); i++)
                 {
                     auto &currentRect = g_currentCursorRects[i];
+
                     if (ImGui::IsMouseHoveringRect(currentRect.first, currentRect.second, false))
                     {
                         newCursorIndex = int(i);
 
                         if (event->type == SDL_MOUSEBUTTONDOWN && event->button.button == SDL_BUTTON_LEFT)
-                    {
                             g_currentCursorAccepted = true;
-                    }
 
                         break;
                     }
                 }
 
                 if (newCursorIndex < 0)
-            {
                     g_currentCursorIndex = -1;
-            }
 
                 break;
             }
@@ -300,9 +303,7 @@ public:
         if (newCursorIndex >= 0)
         {
             if (g_currentCursorIndex != newCursorIndex)
-            {
                 Game_PlaySound("sys_worldmap_cursor");
-            }
 
             g_currentCursorIndex = newCursorIndex;
         }

UnleashedRecomp/ui/message_window.cpp

@@ -53,7 +53,7 @@ class SDLEventListenerForMessageWindow : public SDLEventListener
 public:
     void OnSDLEvent(SDL_Event* event) override
     {
-        if (App::s_isInit || !MessageWindow::s_isVisible)
+        if (App::s_isInit || !MessageWindow::s_isVisible || !hid::IsInputAllowed())
             return;
 
         constexpr float axisValueRange = 32767.0f;