Merge pull request #12815 from Dentomologist/enable_hotkeys_and_controllers_for_focused_tas_input

TAS Input: Enable emulator hotkeys and controller input when TAS Input window has focus

1 files changed, 11 insertions, 1 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 3c6a82dcd8..8d7f7c7ada 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -179,7 +179,8 @@ void KeyboardMouse::UpdateCursorInput()
   const auto win_height = std::max(rect.bottom - rect.top, 1l);
 
   POINT point = {};
-  if (g_controller_interface.IsMouseCenteringRequested() && Host_RendererHasFocus())
+  if (g_controller_interface.IsMouseCenteringRequested() &&
+      (Host_RendererHasFocus() || Host_TASInputHasFocus()))
   {
     point.x = win_width / 2;
     point.y = win_height / 2;
@@ -189,6 +190,15 @@ void KeyboardMouse::UpdateCursorInput()
     SetCursorPos(screen_point.x, screen_point.y);
     g_controller_interface.SetMouseCenteringRequested(false);
   }
+  else if (Host_TASInputHasFocus())
+  {
+    // When a TAS Input window has focus and "Enable Controller Input" is checked most types of
+    // input should be read normally as if the render window had focus instead. The cursor is an
+    // exception, as otherwise using the mouse to set any control in the TAS Input window will also
+    // update the Wii IR value (or any other input controlled by the cursor).
+
+    return;
+  }
   else
   {
     GetCursorPos(&point);