diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 241 |
1 files changed, 124 insertions, 117 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 633ce40a5f..55643ece5f 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -2,35 +2,35 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/Thread.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" +#include "Common/Thread.h" #ifdef CIFACE_USE_XINPUT - #include "InputCommon/ControllerInterface/XInput/XInput.h" +#include "InputCommon/ControllerInterface/XInput/XInput.h" #endif #ifdef CIFACE_USE_DINPUT - #include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "InputCommon/ControllerInterface/DInput/DInput.h" #endif #ifdef CIFACE_USE_XLIB - #include "InputCommon/ControllerInterface/Xlib/Xlib.h" - #ifdef CIFACE_USE_X11_XINPUT2 - #include "InputCommon/ControllerInterface/Xlib/XInput2.h" - #endif +#include "InputCommon/ControllerInterface/Xlib/Xlib.h" +#ifdef CIFACE_USE_X11_XINPUT2 +#include "InputCommon/ControllerInterface/Xlib/XInput2.h" +#endif #endif #ifdef CIFACE_USE_OSX - #include "InputCommon/ControllerInterface/OSX/OSX.h" +#include "InputCommon/ControllerInterface/OSX/OSX.h" #endif #ifdef CIFACE_USE_SDL - #include "InputCommon/ControllerInterface/SDL/SDL.h" +#include "InputCommon/ControllerInterface/SDL/SDL.h" #endif #ifdef CIFACE_USE_ANDROID - #include "InputCommon/ControllerInterface/Android/Android.h" +#include "InputCommon/ControllerInterface/Android/Android.h" #endif #ifdef CIFACE_USE_EVDEV - #include "InputCommon/ControllerInterface/evdev/evdev.h" +#include "InputCommon/ControllerInterface/evdev/evdev.h" #endif #ifdef CIFACE_USE_PIPES - #include "InputCommon/ControllerInterface/Pipes/Pipes.h" +#include "InputCommon/ControllerInterface/Pipes/Pipes.h" #endif using namespace ciface::ExpressionParser; @@ -49,49 +49,49 @@ ControllerInterface g_controller_interface; // void ControllerInterface::Initialize(void* const hwnd) { - if (m_is_init) - return; + if (m_is_init) + return; - m_hwnd = hwnd; + m_hwnd = hwnd; #ifdef CIFACE_USE_DINPUT - ciface::DInput::Init(m_devices, (HWND)hwnd); + ciface::DInput::Init(m_devices, (HWND)hwnd); #endif #ifdef CIFACE_USE_XINPUT - ciface::XInput::Init(m_devices); + ciface::XInput::Init(m_devices); #endif #ifdef CIFACE_USE_XLIB - ciface::Xlib::Init(m_devices, hwnd); - #ifdef CIFACE_USE_X11_XINPUT2 - ciface::XInput2::Init(m_devices, hwnd); - #endif + ciface::Xlib::Init(m_devices, hwnd); +#ifdef CIFACE_USE_X11_XINPUT2 + ciface::XInput2::Init(m_devices, hwnd); +#endif #endif #ifdef CIFACE_USE_OSX - ciface::OSX::Init(m_devices, hwnd); + ciface::OSX::Init(m_devices, hwnd); #endif #ifdef CIFACE_USE_SDL - ciface::SDL::Init(m_devices); + ciface::SDL::Init(m_devices); #endif #ifdef CIFACE_USE_ANDROID - ciface::Android::Init(m_devices); + ciface::Android::Init(m_devices); #endif #ifdef CIFACE_USE_EVDEV - ciface::evdev::Init(m_devices); + ciface::evdev::Init(m_devices); #endif #ifdef CIFACE_USE_PIPES - ciface::Pipes::Init(m_devices); + ciface::Pipes::Init(m_devices); #endif - m_is_init = true; + m_is_init = true; } void ControllerInterface::Reinitialize() { - if (!m_is_init) - return; + if (!m_is_init) + return; - Shutdown(); - Initialize(m_hwnd); + Shutdown(); + Initialize(m_hwnd); } // @@ -101,42 +101,42 @@ void ControllerInterface::Reinitialize() // void ControllerInterface::Shutdown() { - if (!m_is_init) - return; + if (!m_is_init) + return; - for (ciface::Core::Device* d : m_devices) - { - // Set outputs to ZERO before destroying device - for (ciface::Core::Device::Output* o : d->Outputs()) - o->SetState(0); + for (ciface::Core::Device* d : m_devices) + { + // Set outputs to ZERO before destroying device + for (ciface::Core::Device::Output* o : d->Outputs()) + o->SetState(0); - // Delete device - delete d; - } + // Delete device + delete d; + } - m_devices.clear(); + m_devices.clear(); #ifdef CIFACE_USE_XINPUT - ciface::XInput::DeInit(); + ciface::XInput::DeInit(); #endif #ifdef CIFACE_USE_DINPUT - // nothing needed +// nothing needed #endif #ifdef CIFACE_USE_XLIB - // nothing needed +// nothing needed #endif #ifdef CIFACE_USE_OSX - ciface::OSX::DeInit(); + ciface::OSX::DeInit(); #endif #ifdef CIFACE_USE_SDL - // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up - SDL_Quit(); + // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up + SDL_Quit(); #endif #ifdef CIFACE_USE_ANDROID - // nothing needed +// nothing needed #endif - m_is_init = false; + m_is_init = false; } // @@ -146,8 +146,8 @@ void ControllerInterface::Shutdown() // void ControllerInterface::UpdateInput() { - for (ciface::Core::Device* d : m_devices) - d->UpdateInput(); + for (ciface::Core::Device* d : m_devices) + d->UpdateInput(); } // @@ -156,26 +156,27 @@ void ControllerInterface::UpdateInput() // Gets the state of an input reference // override function for ControlReference::State ... // -ControlState ControllerInterface::InputReference::State( const ControlState ignore ) +ControlState ControllerInterface::InputReference::State(const ControlState ignore) { - if (parsed_expression) - return parsed_expression->GetValue() * range; - else - return 0.0; + if (parsed_expression) + return parsed_expression->GetValue() * range; + else + return 0.0; } // // OutputReference :: State // // Set the state of all binded outputs -// overrides ControlReference::State .. combined them so I could make the GUI simple / inputs == same as outputs one list +// overrides ControlReference::State .. combined them so I could make the GUI simple / inputs == +// same as outputs one list // I was lazy and it works so watever // ControlState ControllerInterface::OutputReference::State(const ControlState state) { - if (parsed_expression) - parsed_expression->SetValue(state); - return 0.0; + if (parsed_expression) + parsed_expression->SetValue(state); + return 0.0; } // @@ -184,14 +185,14 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat // Updates a controlreference's binded devices/controls // need to call this to re-parse a control reference's expression after changing it // -void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref - , const ciface::Core::DeviceQualifier& default_device) const +void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref, + const ciface::Core::DeviceQualifier& default_device) const { - delete ref->parsed_expression; - ref->parsed_expression = nullptr; + delete ref->parsed_expression; + ref->parsed_expression = nullptr; - ControlFinder finder(*this, default_device, ref->is_input); - ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression); + ControlFinder finder(*this, default_device, ref->is_input); + ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression); } // @@ -204,71 +205,77 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* // upon input, return pointer to detected Control // else return nullptr // -ciface::Core::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, ciface::Core::Device* const device) +ciface::Core::Device::Control* +ControllerInterface::InputReference::Detect(const unsigned int ms, + ciface::Core::Device* const device) { - unsigned int time = 0; - std::vector<bool> states(device->Inputs().size()); + unsigned int time = 0; + std::vector<bool> states(device->Inputs().size()); - if (device->Inputs().size() == 0) - return nullptr; + if (device->Inputs().size() == 0) + return nullptr; - // get starting state of all inputs, - // so we can ignore those that were activated at time of Detect start - std::vector<ciface::Core::Device::Input*>::const_iterator - i = device->Inputs().begin(), - e = device->Inputs().end(); - for (std::vector<bool>::iterator state = states.begin(); i != e; ++i) - *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); + // get starting state of all inputs, + // so we can ignore those that were activated at time of Detect start + std::vector<ciface::Core::Device::Input *>::const_iterator i = device->Inputs().begin(), + e = device->Inputs().end(); + for (std::vector<bool>::iterator state = states.begin(); i != e; ++i) + *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); - while (time < ms) - { - device->UpdateInput(); - i = device->Inputs().begin(); - for (std::vector<bool>::iterator state = states.begin(); i != e; ++i,++state) - { - // detected an input - if ((*i)->IsDetectable() && (*i)->GetState() > INPUT_DETECT_THRESHOLD) - { - // input was released at some point during Detect call - // return the detected input - if (false == *state) - return *i; - } - else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD)) - { - *state = false; - } - } - Common::SleepCurrentThread(10); time += 10; - } + while (time < ms) + { + device->UpdateInput(); + i = device->Inputs().begin(); + for (std::vector<bool>::iterator state = states.begin(); i != e; ++i, ++state) + { + // detected an input + if ((*i)->IsDetectable() && (*i)->GetState() > INPUT_DETECT_THRESHOLD) + { + // input was released at some point during Detect call + // return the detected input + if (false == *state) + return *i; + } + else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD)) + { + *state = false; + } + } + Common::SleepCurrentThread(10); + time += 10; + } - // no input was detected - return nullptr; + // no input was detected + return nullptr; } // // OutputReference :: Detect // -// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI. -// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy +// Totally different from the inputReference detect / I have them combined so it was simpler to make +// the GUI. +// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and +// it was easy // // set all binded outputs to <range> power for x milliseconds return false // -ciface::Core::Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, ciface::Core::Device* const device) +ciface::Core::Device::Control* +ControllerInterface::OutputReference::Detect(const unsigned int ms, + ciface::Core::Device* const device) { - // ignore device + // ignore device - // don't hang if we don't even have any controls mapped - if (BoundCount() > 0) - { - State(1); - unsigned int slept = 0; + // don't hang if we don't even have any controls mapped + if (BoundCount() > 0) + { + State(1); + unsigned int slept = 0; - // this loop is to make stuff like flashing keyboard LEDs work - while (ms > (slept += 10)) - Common::SleepCurrentThread(10); + // this loop is to make stuff like flashing keyboard LEDs work + while (ms > (slept += 10)) + Common::SleepCurrentThread(10); - State(0); - } - return nullptr; + State(0); + } + return nullptr; } |