summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Device.cpp
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-07-11 10:53:51 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-07-11 13:38:52 -0400
commit74f308338195ac6c78008def5a6a4342c8b824af (patch)
tree6b2b065a3baf274b0881cc1899fb2ede6bff4845 /Source/Core/InputCommon/ControllerInterface/Device.cpp
parent5abc028ace035479e46d545bf8231db5531a3d9f (diff)
ControllerInterface: Gate the input based on our new background input setting
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Device.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp
index e1383efc9d..61057c8162 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@@ -5,6 +5,12 @@
#include <sstream>
#include <string>
+// For InputGateOn()
+// This is a really bad layering violation, but it's the cleanest
+// place I could find to put it.
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+
#include "InputCommon/ControllerInterface/Device.h"
namespace ciface
@@ -74,6 +80,16 @@ void Device::ClearInputState()
// kinda slow but, w/e, should only happen when user unplugs a device while playing
}
+bool Device::Control::InputGateOn()
+{
+ if (SConfig::GetInstance().m_BackgroundInput)
+ return true;
+ else if (Host_RendererHasFocus())
+ return true;
+ else
+ return false;
+}
+
//
// DeviceQualifier :: ToString
//