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, 10 insertions, 3 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index e4b717e3af..057d774c5b 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -391,9 +391,16 @@ Core::DeviceRemoval KeyboardMouse::UpdateInput()
   m_state.axis.z += delta_z;
   m_state.axis.z /= SCROLL_AXIS_DECAY;
 
-  const bool should_center_mouse =
-      g_controller_interface.IsMouseCenteringRequested() && Host_RendererHasFocus();
-  if (update_mouse || should_center_mouse)
+  const bool should_center_mouse = g_controller_interface.IsMouseCenteringRequested() &&
+                                   (Host_RendererHasFocus() || 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).
+  const bool should_update_mouse = update_mouse && !Host_TASInputHasFocus();
+
+  if (should_update_mouse || should_center_mouse)
     UpdateCursor(should_center_mouse);
 
   if (update_keyboard)