diff options
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 194 |
1 files changed, 22 insertions, 172 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 8c1a044860..00b4b2c07d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -9,22 +9,21 @@ #include "Common.h" #include "Thread.h" +#include "ExpressionParser.h" +#include "Device.h" // enable disable sources #ifdef _WIN32 #define CIFACE_USE_XINPUT - #define CIFACE_USE_DINPUT_JOYSTICK - #define CIFACE_USE_DINPUT_KBM #define CIFACE_USE_DINPUT -//#ifndef CIFACE_USE_DINPUT_JOYSTICK -// enable SDL 1.2 in addition to DirectInput on windows, -// to support a few gamepads that aren't behaving with DInput #define CIFACE_USE_SDL -//#endif #endif #if defined(HAVE_X11) && HAVE_X11 #define CIFACE_USE_XLIB #define CIFACE_USE_SDL + #if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2 + #define CIFACE_USE_X11_XINPUT2 + #endif #endif #if defined(__APPLE__) #define CIFACE_USE_OSX @@ -32,9 +31,8 @@ #ifdef ANDROID #define CIFACE_USE_ANDROID #endif - -// idk in case I wanted to change it to double or something, idk what's best -typedef float ControlState; + +using namespace ciface::Core; // // ControllerInterface @@ -42,148 +40,10 @@ typedef float ControlState; // some crazy shit I made to control different device inputs and outputs // from lots of different sources, hopefully more easily // -class ControllerInterface +class ControllerInterface : public DeviceContainer { public: - // Forward declarations - class DeviceQualifier; - - // - // Device - // - // a device class - // - class Device - { - public: - class Input; - class Output; - - // - // Control - // - // control includes inputs and outputs - // - class Control // input or output - { - public: - virtual std::string GetName() const = 0; - virtual ~Control() {} - - virtual Input* ToInput() { return NULL; } - virtual Output* ToOutput() { return NULL; } - }; - - // - // Input - // - // an input on a device - // - class Input : public Control - { - public: - // things like absolute axes/ absolute mouse position will override this - virtual bool IsDetectable() { return true; } - - virtual ControlState GetState() const = 0; - - Input* ToInput() { return this; } - }; - - // - // Output - // - // an output on a device - // - class Output : public Control - { - public: - virtual ~Output() {} - - virtual void SetState(ControlState state) = 0; - - Output* ToOutput() { return this; } - }; - - virtual ~Device(); - - virtual std::string GetName() const = 0; - virtual int GetId() const = 0; - virtual std::string GetSource() const = 0; - virtual bool UpdateInput() = 0; - virtual bool UpdateOutput() = 0; - - virtual void ClearInputState(); - - const std::vector<Input*>& Inputs() const { return m_inputs; } - const std::vector<Output*>& Outputs() const { return m_outputs; } - - Input* FindInput(const std::string& name) const; - Output* FindOutput(const std::string& name) const; - - protected: - void AddInput(Input* const i); - void AddOutput(Output* const o); - - class FullAnalogSurface : public Input - { - public: - FullAnalogSurface(Input* low, Input* high) - : m_low(*low), m_high(*high) - {} - - ControlState GetState() const - { - return (1 + m_high.GetState() - m_low.GetState()) / 2; - } - - std::string GetName() const - { - return m_low.GetName() + *m_high.GetName().rbegin(); - } - - private: - Input& m_low; - Input& m_high; - }; - - void AddAnalogInputs(Input* low, Input* high) - { - AddInput(low); - AddInput(high); - AddInput(new FullAnalogSurface(low, high)); - AddInput(new FullAnalogSurface(high, low)); - } - - private: - std::vector<Input*> m_inputs; - std::vector<Output*> m_outputs; - }; - - // - // DeviceQualifier - // - // device qualifier used to match devices - // currently has ( source, id, name ) properties which match a device - // - class DeviceQualifier - { - public: - DeviceQualifier() : cid(-1) {} - DeviceQualifier(const std::string& _source, const int _id, const std::string& _name) - : source(_source), cid(_id), name(_name) {} - void FromDevice(const Device* const dev); - void FromString(const std::string& str); - std::string ToString() const; - bool operator==(const DeviceQualifier& devq) const; - bool operator==(const Device* const dev) const; - - std::string source; - int cid; - std::string name; - }; - // // ControlReference // @@ -197,30 +57,29 @@ public: class ControlReference { friend class ControllerInterface; - public: - virtual ~ControlReference() {} - virtual ControlState State(const ControlState state = 0) = 0; virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0; - size_t BoundCount() const { return m_controls.size(); } - ControlState range; + ControlState range; std::string expression; const bool is_input; + ciface::ExpressionParser::ExpressionParseStatus parse_error; - protected: - ControlReference(const bool _is_input) : range(1), is_input(_is_input) {} - - struct DeviceControl - { - DeviceControl() : control(NULL), mode(0) {} + virtual ~ControlReference() { + delete parsed_expression; + } - Device::Control* control; - int mode; - }; + int BoundCount() { + if (parsed_expression) + return parsed_expression->num_controls; + else + return 0; + } - std::vector<DeviceControl> m_controls; + protected: + ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {} + ciface::ExpressionParser::Expression *parsed_expression; }; // @@ -260,22 +119,13 @@ public: bool UpdateInput(const bool force = false); bool UpdateOutput(const bool force = false); - Device::Input* FindInput(const std::string& name, const Device* def_dev) const; - Device::Output* FindOutput(const std::string& name, const Device* def_dev) const; - - const std::vector<Device*>& Devices() const { return m_devices; } - Device* FindDevice(const DeviceQualifier& devq) const; - std::recursive_mutex update_lock; private: bool m_is_init; - std::vector<Device*> m_devices; void* m_hwnd; }; -typedef std::vector<ControllerInterface::Device*> DeviceList; - extern ControllerInterface g_controller_interface; #endif |