Core/Host: Allow frontends to block inputs

dolphin-emu · Mar 21, 2019 · 61350b3 · 61350b3
1 parent 0a3279a
commit 61350b3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 2 deletions.
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
@@ -94,6 +94,10 @@ void Host_NotifyMapLoaded()
 void Host_RefreshDSPDebuggerWindow()
 {
 }
+bool Host_UIBlocksControllerState()
+{
+  return false;
+}
 
 void Host_Message(HostMessageID id)
 {

diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h
@@ -33,6 +33,7 @@ enum class HostMessageID
 };
 
 bool Host_UINeedsControllerState();
+bool Host_UIBlocksControllerState();
 bool Host_RendererHasFocus();
 bool Host_RendererIsFullscreen();
 void Host_Message(HostMessageID id);

diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -52,6 +52,11 @@ void Host_RefreshDSPDebuggerWindow()
 {
 }
 
+bool Host_UIBlocksControllerState()
+{
+  return false;
+}
+
 static Common::Event s_update_main_frame_event;
 void Host_Message(HostMessageID id)
 {

diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp
@@ -151,6 +151,12 @@ bool Host_UINeedsControllerState()
 {
   return Settings::Instance().IsControllerStateNeeded();
 }
+
+bool Host_UIBlocksControllerState()
+{
+  return ImGui::GetCurrentContext() && ImGui::GetIO().WantCaptureKeyboard;
+}
+
 void Host_RefreshDSPDebuggerWindow()
 {
 }
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -14,8 +14,9 @@ using namespace ciface::ExpressionParser;
 
 bool ControlReference::InputGateOn()
 {
-  return SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
-         Host_UINeedsControllerState();
+  return (SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
+          Host_UINeedsControllerState()) &&
+         !Host_UIBlocksControllerState();
 }
 
 //

diff --git a/Source/UnitTests/StubHost.cpp b/Source/UnitTests/StubHost.cpp
@@ -35,6 +35,10 @@ bool Host_UINeedsControllerState()
 {
   return false;
 }
+bool Host_UIBlocksControllerState()
+{
+  return false;
+}
 bool Host_RendererHasFocus()
 {
   return false;