From f015c99a5193400a9798616c0a265e5c66916c55 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 25 Oct 2019 19:33:59 -0500 Subject: ControllerInterface: Add platform consistent names for modifier keys. --- Source/Core/InputCommon/ControllerInterface/Device.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h') diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 43e61e53fd..495c64cbde 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -147,6 +147,23 @@ protected: AddInput(new FullAnalogSurface(high, low)); } + class CombinedInput final : public Input + { + public: + using Inputs = std::pair; + + CombinedInput(std::string name, const Inputs& inputs); + ControlState GetState() const override; + std::string GetName() const override; + bool IsDetectable() override; + + private: + const std::string m_name; + const std::pair m_inputs; + }; + + void AddCombinedInput(std::string name, const std::pair& inputs); + private: int m_id; std::vector m_inputs; -- cgit v1.2.3