InputManager: Always call SetHook()/RemoveHook() on core thread

Author: stenzek

src/core/fullscreenui_settings.cpp

@@ -424,7 +424,7 @@ void FullscreenUI::InputBindingDialog::Start(SettingsInterface* bsi, InputBindin
 
   const bool game_settings = IsEditingGameSettings(bsi);
 
-  InputManager::SetHook([this, game_settings](InputBindingKey key, float value) -> InputInterceptHook::CallbackResult {
+  auto input_hook = [this, game_settings](InputBindingKey key, float value) -> InputInterceptHook::CallbackResult {
     // holding the settings lock here will protect the input binding list
     const auto lock = Core::GetSettingsLock();
 
@@ -501,15 +501,18 @@ void FullscreenUI::InputBindingDialog::Start(SettingsInterface* bsi, InputBindin
     }
 
     return default_action;
-  });
+  };
+
+  Host::RunOnCoreThread(
+    [input_hook = std::move(input_hook)]() mutable { InputManager::SetHook(std::move(input_hook)); });
 }
 
 void FullscreenUI::InputBindingDialog::ClearState()
 {
   PopupDialog::ClearState();
 
   if (m_binding_type != InputBindingInfo::Type::Unknown)
-    InputManager::RemoveHook();
+    Host::RunOnCoreThread(&InputManager::RemoveHook);
 
   m_binding_type = InputBindingInfo::Type::Unknown;
   m_binding_section = {};

src/duckstation-qt/inputbindingdialog.cpp

@@ -9,6 +9,7 @@
 
 #include "core/core.h"
 
+#include "common/assert.h"
 #include "common/bitutils.h"
 
 #include "fmt/format.h"
@@ -20,6 +21,8 @@
 
 #include "moc_inputbindingdialog.cpp"
 
+InputBindingDialog* InputBindingDialog::s_current_hook_dialog = nullptr;
+
 InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo::Type bind_type,
                                        std::string section_name, std::string key_name,
                                        std::vector<std::string> bindings, QWidget* parent)
@@ -403,13 +406,21 @@ void InputBindingDialog::onResetSensitivityClicked()
 
 void InputBindingDialog::hookInputManager()
 {
-  InputManager::SetHook([this](InputBindingKey key, float value) {
-    QMetaObject::invokeMethod(this, &InputBindingDialog::inputManagerHookCallback, Qt::QueuedConnection, key, value);
-    return InputInterceptHook::CallbackResult::StopProcessingEvent;
+  DebugAssert(!s_current_hook_dialog);
+  s_current_hook_dialog = this;
+  Host::RunOnCoreThread([]() {
+    InputManager::SetHook([](InputBindingKey key, float value) {
+      Host::RunOnUIThread([key, value]() {
+        if (s_current_hook_dialog)
+          s_current_hook_dialog->inputManagerHookCallback(key, value);
+      });
+      return InputInterceptHook::CallbackResult::StopProcessingEvent;
+    });
   });
 }
 
 void InputBindingDialog::unhookInputManager()
 {
-  InputManager::RemoveHook();
+  s_current_hook_dialog = nullptr;
+  Host::RunOnCoreThread(&InputManager::RemoveHook);
 }

src/duckstation-qt/inputbindingdialog.h

@@ -71,4 +71,6 @@ class InputBindingDialog : public QDialog
   QPoint m_input_listen_start_position{};
   bool m_mouse_mapping_enabled = false;
   bool m_sensor_mapping_enabled = false;
+
+  static InputBindingDialog* s_current_hook_dialog;
 };

src/duckstation-qt/inputbindingwidgets.cpp

@@ -10,6 +10,7 @@
 #include "core/core.h"
 #include "core/host.h"
 
+#include "common/assert.h"
 #include "common/bitutils.h"
 #include "common/log.h"
 #include "common/string_util.h"
@@ -26,6 +27,8 @@
 
 LOG_CHANNEL(Host);
 
+InputBindingWidget* InputBindingWidget::s_current_hook_widget = nullptr;
+
 InputBindingWidget::InputBindingWidget(QWidget* parent) : QPushButton(parent)
 {
   connect(this, &QPushButton::clicked, this, &InputBindingWidget::onClicked);
@@ -442,15 +445,23 @@ void InputBindingWidget::inputManagerHookCallback(InputBindingKey key, float val
 
 void InputBindingWidget::hookInputManager()
 {
-  InputManager::SetHook([this](InputBindingKey key, float value) {
-    QMetaObject::invokeMethod(this, &InputBindingWidget::inputManagerHookCallback, Qt::QueuedConnection, key, value);
-    return InputInterceptHook::CallbackResult::StopProcessingEvent;
+  DebugAssert(!s_current_hook_widget);
+  s_current_hook_widget = this;
+  Host::RunOnCoreThread([]() {
+    InputManager::SetHook([](InputBindingKey key, float value) {
+      Host::RunOnUIThread([key, value]() {
+        if (s_current_hook_widget)
+          s_current_hook_widget->inputManagerHookCallback(key, value);
+      });
+      return InputInterceptHook::CallbackResult::StopProcessingEvent;
+    });
   });
 }
 
 void InputBindingWidget::unhookInputManager()
 {
-  InputManager::RemoveHook();
+  s_current_hook_widget = nullptr;
+  Host::RunOnCoreThread(&InputManager::RemoveHook);
 }
 
 void InputBindingWidget::openDialog()

src/duckstation-qt/inputbindingwidgets.h

@@ -77,4 +77,6 @@ class InputBindingWidget : public QPushButton
   QPoint m_input_listen_start_position{};
   bool m_mouse_mapping_enabled = false;
   bool m_sensor_mapping_enabled = false;
+
+  static InputBindingWidget* s_current_hook_widget;
 };