diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index e2e37789c7..29b0e388d3 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -11,38 +11,23 @@ ControllerEmu::~ControllerEmu() { // control groups - std::vector::const_iterator - i = groups.begin(), - e = groups.end(); - for (; i!=e; ++i) - delete *i; + for (ControlGroup* cg : groups) + delete cg; } ControllerEmu::ControlGroup::~ControlGroup() { - // controls - std::vector::const_iterator - ci = controls.begin(), - ce = controls.end(); - for (; ci!=ce; ++ci) - delete *ci; + for (Control* c : controls) + delete c; - // settings - std::vector::const_iterator - si = settings.begin(), - se = settings.end(); - for (; si!=se; ++si) - delete *si; + for (Setting* s : settings) + delete s; } ControllerEmu::Extension::~Extension() { - // attachments - std::vector::const_iterator - ai = attachments.begin(), - ae = attachments.end(); - for (; ai!=ae; ++ai) - delete *ai; + for (ControllerEmu* ai : attachments) + delete ai; } ControllerEmu::ControlGroup::Control::~Control() { @@ -51,52 +36,31 @@ ControllerEmu::ControlGroup::Control::~Control() void ControllerEmu::UpdateReferences(ControllerInterface& devi) { - std::vector::const_iterator - i = groups.begin(), - e = groups.end(); - for (; i!=e; ++i) + for (ControlGroup* cg : groups) { - std::vector::const_iterator - ci = (*i)->controls.begin(), - ce = (*i)->controls.end(); - for (; ci!=ce; ++ci) - devi.UpdateReference((*ci)->control_ref, default_device); + for (ControlGroup::Control* control : cg->controls) + devi.UpdateReference(control->control_ref, default_device); // extension - if (GROUP_TYPE_EXTENSION == (*i)->type) + if (GROUP_TYPE_EXTENSION == cg->type) { - std::vector::const_iterator - ai = ((Extension*)*i)->attachments.begin(), - ae = ((Extension*)*i)->attachments.end(); - for (; ai!=ae; ++ai) - (*ai)->UpdateReferences(devi); + for (ControllerEmu* ai : ((Extension*)cg)->attachments) + ai->UpdateReferences(devi); } } } void ControllerEmu::UpdateDefaultDevice() { - std::vector::const_iterator - i = groups.begin(), - e = groups.end(); - for (; i!=e; ++i) + for (ControlGroup* cg : groups) { - //std::vector::const_iterator - //ci = (*i)->controls.begin(), - //ce = (*i)->controls.end(); - //for (; ci!=ce; ++ci) - //(*ci)->control_ref->device_qualifier = default_device; - // extension - if (GROUP_TYPE_EXTENSION == (*i)->type) + if (GROUP_TYPE_EXTENSION == cg->type) { - std::vector::const_iterator - ai = ((Extension*)*i)->attachments.begin(), - ae = ((Extension*)*i)->attachments.end(); - for (; ai!=ae; ++ai) + for (ControllerEmu* ai : ((Extension*)cg)->attachments) { - (*ai)->default_device = default_device; - (*ai)->UpdateDefaultDevice(); + ai->default_device = default_device; + ai->UpdateDefaultDevice(); } } } @@ -107,50 +71,43 @@ void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::s std::string group(base + name); group += "/"; // settings - std::vector::const_iterator - si = settings.begin(), - se = settings.end(); - for (; si!=se; ++si) + for (Setting* s : settings) { - sec->Get((group+(*si)->name).c_str(), &(*si)->value, (*si)->default_value*100); - (*si)->value /= 100; + sec->Get((group + s->name).c_str(), &s->value, s->default_value * 100); + s->value /= 100; } // controls - std::vector::const_iterator - ci = controls.begin(), - ce = controls.end(); - for (; ci!=ce; ++ci) + for (Control* c : controls) { // control expression - sec->Get((group + (*ci)->name).c_str(), &(*ci)->control_ref->expression, ""); + sec->Get((group + c->name).c_str(), &c->control_ref->expression, ""); // range - sec->Get((group+(*ci)->name+"/Range").c_str(), &(*ci)->control_ref->range, 100.0f); - (*ci)->control_ref->range /= 100; + sec->Get((group + c->name + "/Range").c_str(), &c->control_ref->range, 100.0f); + c->control_ref->range /= 100; } // extensions if (GROUP_TYPE_EXTENSION == type) { - Extension* const ex = ((Extension*)this); + Extension* const ext = ((Extension*)this); - ex->switch_extension = 0; + ext->switch_extension = 0; unsigned int n = 0; std::string extname; sec->Get((base + name).c_str(), &extname, ""); - std::vector::const_iterator - ai = ((Extension*)this)->attachments.begin(), - ae = ((Extension*)this)->attachments.end(); - for (; ai!=ae; ++ai,++n) + for (ControllerEmu* ai : ext->attachments) { - (*ai)->default_device.FromString(defdev); - (*ai)->LoadConfig(sec, base + (*ai)->GetName() + "/"); + ai->default_device.FromString(defdev); + ai->LoadConfig(sec, base + ai->GetName() + "/"); - if ((*ai)->GetName() == extname) - ex->switch_extension = n; + if (ai->GetName() == extname) + ext->switch_extension = n; + + n++; } } } @@ -163,10 +120,9 @@ void ControllerEmu::LoadConfig(IniFile::Section *sec, const std::string& base) sec->Get((base + "Device").c_str(), &defdev, ""); default_device.FromString(defdev); } - std::vector::const_iterator i = groups.begin(), - e = groups.end(); - for (; i!=e; ++i) - (*i)->LoadConfig(sec, defdev, base); + + for (ControlGroup* cg : groups) + cg->LoadConfig(sec, defdev, base); } void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base) @@ -174,23 +130,17 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s std::string group(base + name); group += "/"; // settings - std::vector::const_iterator - si = settings.begin(), - se = settings.end(); - for (; si!=se; ++si) - sec->Set((group+(*si)->name).c_str(), (*si)->value*100.0f, (*si)->default_value*100.0f); + for (Setting* s : settings) + sec->Set((group + s->name).c_str(), s->value*100.0f, s->default_value*100.0f); // controls - std::vector::const_iterator - ci = controls.begin(), - ce = controls.end(); - for (; ci!=ce; ++ci) + for (Control* c : controls) { // control expression - sec->Set((group+(*ci)->name).c_str(), (*ci)->control_ref->expression, ""); + sec->Set((group + c->name).c_str(), c->control_ref->expression, ""); // range - sec->Set((group+(*ci)->name+"/Range").c_str(), (*ci)->control_ref->range*100.0f, 100.0f); + sec->Set((group + c->name + "/Range").c_str(), c->control_ref->range*100.0f, 100.0f); } // extensions @@ -199,11 +149,8 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s Extension* const ext = ((Extension*)this); sec->Set((base + name).c_str(), ext->attachments[ext->switch_extension]->GetName(), "None"); - std::vector::const_iterator - ai = ((Extension*)this)->attachments.begin(), - ae = ((Extension*)this)->attachments.end(); - for (; ai!=ae; ++ai) - (*ai)->SaveConfig(sec, base + (*ai)->GetName() + "/"); + for (ControllerEmu* ai : ext->attachments) + ai->SaveConfig(sec, base + ai->GetName() + "/"); } } @@ -213,10 +160,8 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base) if (base.empty()) sec->Set((/*std::string(" ") +*/ base + "Device").c_str(), defdev, ""); - std::vector::const_iterator i = groups.begin(), - e = groups.end(); - for (; i!=e; ++i) - (*i)->SaveConfig(sec, defdev, base); + for (ControlGroup* cg : groups) + cg->SaveConfig(sec, defdev, base); } ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK) diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index 750aa692c4..b8f67ab833 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -42,7 +42,7 @@ enum SETTING_SQUARE, }; -const char * const named_directions[] = +const char* const named_directions[] = { "Up", "Down", @@ -61,13 +61,13 @@ public: class Control { protected: - Control(ControllerInterface::ControlReference* const _ref, const char * const _name) + Control(ControllerInterface::ControlReference* const _ref, const char* const _name) : control_ref(_ref), name(_name){} public: virtual ~Control(); - ControllerInterface::ControlReference* const control_ref; - const char * const name; + ControllerInterface::ControlReference* const control_ref; + const char* const name; }; @@ -75,7 +75,7 @@ public: { public: - Input(const char * const _name) + Input(const char* const _name) : Control(new ControllerInterface::InputReference, _name) {} }; @@ -84,7 +84,7 @@ public: { public: - Output(const char * const _name) + Output(const char* const _name) : Control(new ControllerInterface::OutputReference, _name) {} }; @@ -94,17 +94,17 @@ public: public: Setting(const char* const _name, const ControlState def_value - , const unsigned int _low = 0, const unsigned int _high = 100 ) + , const unsigned int _low = 0, const unsigned int _high = 100) : name(_name) , value(def_value) , default_value(def_value) , low(_low) , high(_high){} - const char* const name; - ControlState value; - const ControlState default_value; - const unsigned int low, high; + const char* const name; + ControlState value; + const ControlState default_value; + const unsigned int low, high; }; ControlGroup(const char* const _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {} @@ -113,11 +113,11 @@ public: virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); - const char* const name; - const unsigned int type; + const char* const name; + const unsigned int type; - std::vector< Control* > controls; - std::vector< Setting* > settings; + std::vector controls; + std::vector settings; }; @@ -194,14 +194,12 @@ public: template void GetState(C* const buttons, const C* bitmasks) { - std::vector::iterator - i = controls.begin(), - e = controls.end(); - - for (; i!=e; ++i, ++bitmasks) + for (Control* control : controls) { - if ((*i)->control_ref->State() > settings[0]->value) // threshold + if (control->control_ref->State() > settings[0]->value) // threshold *buttons |= *bitmasks; + + bitmasks++; } } @@ -287,12 +285,13 @@ public: tmpf = ((state - (deadzone * sign(state))) / (1 - deadzone)); float &ax = m_swing[i >> 1]; - *axis++ = (C)((tmpf - ax) * range + base); + *axis++ = (C)((tmpf - ax) * range + base); ax = tmpf; } } + private: - float m_swing[3]; + float m_swing[3]; }; class Tilt : public ControlGroup @@ -370,8 +369,9 @@ public: *y = C(m_tilt[1] * angle * range + base); *x = C(m_tilt[0] * angle * range + base); } + private: - float m_tilt[2]; + float m_tilt[2]; }; class Cursor : public ControlGroup @@ -415,7 +415,7 @@ public: } } - float m_z; + float m_z; }; class Extension : public ControlGroup @@ -429,10 +429,10 @@ public: void GetState(u8* const data, const bool focus = true); - std::vector attachments; + std::vector attachments; - int switch_extension; - int active_extension; + int switch_extension; + int active_extension; }; virtual ~ControllerEmu(); @@ -447,9 +447,9 @@ public: void UpdateReferences(ControllerInterface& devi); - std::vector< ControlGroup* > groups; + std::vector groups; - DeviceQualifier default_device; + DeviceQualifier default_device; }; diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 66a7b1e56c..9eca17118d 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -38,9 +38,9 @@ const float INPUT_DETECT_THRESHOLD = 0.55f; ControllerInterface g_controller_interface; // -// Init +// Init // -// detect devices and inputs outputs / will make refresh function later +// Detect devices and inputs outputs / will make refresh function later // void ControllerInterface::Initialize() { @@ -79,31 +79,26 @@ if (GLWin.platform == EGL_PLATFORM_X11) { } // -// DeInit +// DeInit // -// remove all devices/ call library cleanup functions +// Remove all devices/ call library cleanup functions // void ControllerInterface::Shutdown() { - if (false == m_is_init) + if (!m_is_init) return; - std::vector::const_iterator - d = m_devices.begin(), - de = m_devices.end(); - for ( ;d != de; ++d ) + for (Device* d : m_devices) { - std::vector::const_iterator - o = (*d)->Outputs().begin(), - oe = (*d)->Outputs().end(); - // set outputs to ZERO before destroying device - for ( ;o!=oe; ++o) - (*o)->SetState(0); - // update output - (*d)->UpdateOutput(); + // Set outputs to ZERO before destroying device + for (Device::Output* o : d->Outputs()) + o->SetState(0); - //delete device - delete *d; + // Update output + d->UpdateOutput(); + + // Delete device + delete d; } m_devices.clear(); @@ -132,9 +127,9 @@ void ControllerInterface::Shutdown() } // -// SetHwnd +// SetHwnd // -// sets the hwnd used for some crap when initializing, use before calling Init +// Sets the hwnd used for some crap when initializing, use before calling Init // void ControllerInterface::SetHwnd( void* const hwnd ) { @@ -142,9 +137,9 @@ void ControllerInterface::SetHwnd( void* const hwnd ) } // -// UpdateInput +// UpdateInput // -// update input for all devices, return true if all devices returned successful +// Update input for all devices, return true if all devices returned successful // bool ControllerInterface::UpdateInput(const bool force) { @@ -153,16 +148,13 @@ bool ControllerInterface::UpdateInput(const bool force) if (force) lk.lock(); else if (!lk.try_lock()) - return false; + return false; size_t ok_count = 0; - std::vector::const_iterator - d = m_devices.begin(), - e = m_devices.end(); - for ( ;d != e; ++d ) + for (Device* d : m_devices) { - if ((*d)->UpdateInput()) + if (d->UpdateInput()) ++ok_count; //else // disabled. it might be causing problems @@ -173,9 +165,9 @@ bool ControllerInterface::UpdateInput(const bool force) } // -// UpdateOutput +// UpdateOutput // -// update output for all devices, return true if all devices returned successful +// Update output for all devices, return true if all devices returned successful // bool ControllerInterface::UpdateOutput(const bool force) { @@ -188,9 +180,9 @@ bool ControllerInterface::UpdateOutput(const bool force) size_t ok_count = 0; - for (auto d = m_devices.cbegin(); d != m_devices.cend(); ++d) + for (Device* d : m_devices) { - if ((*d)->UpdateOutput()) + if (d->UpdateOutput()) ++ok_count; } @@ -198,9 +190,9 @@ bool ControllerInterface::UpdateOutput(const bool force) } // -// InputReference :: State +// InputReference :: State // -// get the state of an input reference +// Gets the state of an input reference // override function for ControlReference::State ... // ControlState ControllerInterface::InputReference::State( const ControlState ignore ) @@ -212,11 +204,11 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno } // -// OutputReference :: State +// 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 -// i was lazy and it works so watever +// 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 +// I was lazy and it works so watever // ControlState ControllerInterface::OutputReference::State(const ControlState state) { @@ -226,9 +218,9 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat } // -// UpdateReference +// UpdateReference // -// updates a controlreference's binded devices/controls +// 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 @@ -242,9 +234,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* } // -// InputReference :: Detect +// InputReference :: Detect // -// wait for input on all binded devices +// Wait for input on all binded devices // supports not detecting inputs that were held down at the time of Detect start, // which is useful for those crazy flightsticks that have certain buttons that are always held down // or some crazy axes or something @@ -294,7 +286,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int } // -// OutputReference :: Detect +// 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 diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 4efb8941b7..5e0cd9db8b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -35,24 +35,24 @@ using namespace ciface::Core; // -// ControllerInterface +// ControllerInterface // -// some crazy shit I made to control different device inputs and outputs -// from lots of different sources, hopefully more easily +// Some crazy shit I made to control different device inputs and outputs +// from lots of different sources, hopefully more easily. // class ControllerInterface : public DeviceContainer { public: // - // ControlReference + // ControlReference // - // these are what you create to actually use the inputs, InputReference or OutputReference + // These are what you create to actually use the inputs, InputReference or OutputReference. // - // after being bound to devices and controls with ControllerInterface::UpdateReference, - // each one can link to multiple devices and controls - // when you change a ControlReference's expression, - // you must use ControllerInterface::UpdateReference on it to rebind controls + // After being bound to devices and controls with ControllerInterface::UpdateReference, + // each one can link to multiple devices and controls + // when you change a ControlReference's expression, + // you must use ControllerInterface::UpdateReference on it to rebind controls // class ControlReference { @@ -62,15 +62,17 @@ public: virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0; ControlState range; - std::string expression; - const bool is_input; + std::string expression; + const bool is_input; ciface::ExpressionParser::ExpressionParseStatus parse_error; - virtual ~ControlReference() { + virtual ~ControlReference() + { delete parsed_expression; } - int BoundCount() { + int BoundCount() + { if (parsed_expression) return parsed_expression->num_controls; else @@ -83,9 +85,9 @@ public: }; // - // InputReference + // InputReference // - // control reference for inputs + // Control reference for inputs // class InputReference : public ControlReference { @@ -96,9 +98,9 @@ public: }; // - // OutputReference + // OutputReference // - // control reference for outputs + // Control reference for outputs // class OutputReference : public ControlReference { @@ -122,8 +124,8 @@ public: std::recursive_mutex update_lock; private: - bool m_is_init; - void* m_hwnd; + bool m_is_init; + void* m_hwnd; }; extern ControllerInterface g_controller_interface; diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 7211559e93..a8d1ba53c8 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -49,81 +49,81 @@ void GetXInputGUIDS( std::vector& guids ) #define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } - IWbemLocator* pIWbemLocator = NULL; + IWbemLocator* pIWbemLocator = NULL; IEnumWbemClassObject* pEnumDevices = NULL; - IWbemClassObject* pDevices[20] = {0}; - IWbemServices* pIWbemServices = NULL; - BSTR bstrNamespace = NULL; - BSTR bstrDeviceID = NULL; - BSTR bstrClassName = NULL; - DWORD uReturned = 0; - VARIANT var; - HRESULT hr; + IWbemClassObject* pDevices[20] = {0}; + IWbemServices* pIWbemServices = NULL; + BSTR bstrNamespace = NULL; + BSTR bstrDeviceID = NULL; + BSTR bstrClassName = NULL; + DWORD uReturned = 0; + VARIANT var; + HRESULT hr; // CoInit if needed hr = CoInitialize(NULL); bool bCleanupCOM = SUCCEEDED(hr); // Create WMI - hr = CoCreateInstance( __uuidof(WbemLocator), - NULL, - CLSCTX_INPROC_SERVER, - __uuidof(IWbemLocator), - (LPVOID*) &pIWbemLocator); - if( FAILED(hr) || pIWbemLocator == NULL ) + hr = CoCreateInstance(__uuidof(WbemLocator), + NULL, + CLSCTX_INPROC_SERVER, + __uuidof(IWbemLocator), + (LPVOID*) &pIWbemLocator); + if (FAILED(hr) || pIWbemLocator == NULL) goto LCleanup; - bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup; - bstrClassName = SysAllocString( L"Win32_PNPEntity" ); if( bstrClassName == NULL ) goto LCleanup; - bstrDeviceID = SysAllocString( L"DeviceID" ); if( bstrDeviceID == NULL ) goto LCleanup; + bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2");if(bstrNamespace == NULL) goto LCleanup; + bstrClassName = SysAllocString(L"Win32_PNPEntity"); if(bstrClassName == NULL) goto LCleanup; + bstrDeviceID = SysAllocString(L"DeviceID"); if(bstrDeviceID == NULL) goto LCleanup; // Connect to WMI - hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices ); - if( FAILED(hr) || pIWbemServices == NULL ) + hr = pIWbemLocator->ConnectServer(bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices); + if (FAILED(hr) || pIWbemServices == NULL) goto LCleanup; // Switch security level to IMPERSONATE. - CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, - RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE); - hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); - if( FAILED(hr) || pEnumDevices == NULL ) + hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, NULL, &pEnumDevices); + if (FAILED(hr) || pEnumDevices == NULL) goto LCleanup; // Loop over all devices - while( true ) + while (true) { // Get 20 at a time - hr = pEnumDevices->Next( 10000, 20, pDevices, &uReturned ); - if( FAILED(hr) || uReturned == 0 ) + hr = pEnumDevices->Next(10000, 20, pDevices, &uReturned); + if (FAILED(hr) || uReturned == 0) break; - for( UINT iDevice=0; iDeviceGet( bstrDeviceID, 0L, &var, NULL, NULL ); - if( SUCCEEDED( hr ) && var.vt == VT_BSTR && var.bstrVal != NULL ) + hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL); + if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL) { // Check if the device ID contains "IG_". If it does, then it's an XInput device - // This information can not be found from DirectInput - if( wcsstr( var.bstrVal, L"IG_" ) ) + // This information can not be found from DirectInput + if (wcsstr(var.bstrVal, L"IG_")) { // If it does, then get the VID/PID from var.bstrVal DWORD dwPid = 0, dwVid = 0; - WCHAR* strVid = wcsstr( var.bstrVal, L"VID_" ); - if( strVid && swscanf( strVid, L"VID_%4X", &dwVid ) != 1 ) + WCHAR* strVid = wcsstr(var.bstrVal, L"VID_"); + if (strVid && swscanf(strVid, L"VID_%4X", &dwVid) != 1) dwVid = 0; - WCHAR* strPid = wcsstr( var.bstrVal, L"PID_" ); - if( strPid && swscanf( strPid, L"PID_%4X", &dwPid ) != 1 ) + WCHAR* strPid = wcsstr(var.bstrVal, L"PID_"); + if (strPid && swscanf(strPid, L"PID_%4X", &dwPid) != 1) dwPid = 0; // Compare the VID/PID to the DInput device - DWORD dwVidPid = MAKELONG( dwVid, dwPid ); - guids.push_back( dwVidPid ); + DWORD dwVidPid = MAKELONG(dwVid, dwPid); + guids.push_back(dwVidPid); //bIsXinputDevice = true; } } - SAFE_RELEASE( pDevices[iDevice] ); + SAFE_RELEASE(pDevices[iDevice]); } } @@ -134,13 +134,13 @@ LCleanup: SysFreeString(bstrDeviceID); if(bstrClassName) SysFreeString(bstrClassName); - for( UINT iDevice=0; iDevice<20; iDevice++ ) - SAFE_RELEASE( pDevices[iDevice] ); - SAFE_RELEASE( pEnumDevices ); - SAFE_RELEASE( pIWbemLocator ); - SAFE_RELEASE( pIWbemServices ); + for (UINT iDevice = 0; iDevice < 20; iDevice++) + SAFE_RELEASE(pDevices[iDevice]); + SAFE_RELEASE(pEnumDevices); + SAFE_RELEASE(pIWbemLocator); + SAFE_RELEASE(pIWbemServices); - if( bCleanupCOM ) + if (bCleanupCOM) CoUninitialize(); } @@ -156,17 +156,14 @@ void InitJoystick(IDirectInput8* const idi8, std::vector& devices std::vector xinput_guids; GetXInputGUIDS( xinput_guids ); - std::list::iterator - i = joysticks.begin(), - e = joysticks.end(); - for ( ; i!=e; ++i ) + for (DIDEVICEINSTANCE& joystick : joysticks) { // skip XInput Devices - if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() ) + if (std::find(xinput_guids.begin(), xinput_guids.end(), joystick.guidProduct.Data1) != xinput_guids.end()) continue; LPDIRECTINPUTDEVICE8 js_device; - if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL))) + if (SUCCEEDED(idi8->CreateDevice(joystick.guidInstance, &js_device, NULL))) { if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick))) { @@ -182,7 +179,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector& devices } } - Joystick* js = new Joystick(/*&*i, */js_device, name_counts[i->tszInstanceName]++); + Joystick* js = new Joystick(/*&*i, */js_device, name_counts[joystick.tszInstanceName]++); // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) devices.push_back(js); @@ -359,14 +356,11 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI Joystick::~Joystick() { // release the ff effect iface's - std::list::iterator - i = m_state_out.begin(), - e = m_state_out.end(); - for (; i!=e; ++i) + for (EffectState& state : m_state_out) { - i->iface->Stop(); - i->iface->Unload(); - i->iface->Release(); + state.iface->Stop(); + state.iface->Unload(); + state.iface->Release(); } m_device->Unacquire(); @@ -377,7 +371,7 @@ void Joystick::ClearInputState() { ZeroMemory(&m_state_in, sizeof(m_state_in)); // set hats to center - memset( m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV) ); + memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV)); } std::string Joystick::GetName() const @@ -449,26 +443,23 @@ bool Joystick::UpdateOutput() eff.dwSize = sizeof(DIEFFECT); eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; - std::list::iterator - i = m_state_out.begin(), - e = m_state_out.end(); - for (; i!=e; ++i) + for (EffectState& state : m_state_out) { - if (i->params) + if (state.params) { - if (i->size) + if (state.size) { - eff.cbTypeSpecificParams = i->size; - eff.lpvTypeSpecificParams = i->params; + eff.cbTypeSpecificParams = state.size; + eff.lpvTypeSpecificParams = state.params; // set params and start effect - ok_count += SUCCEEDED(i->iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START)); + ok_count += SUCCEEDED(state.iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START)); } else { - ok_count += SUCCEEDED(i->iface->Stop()); + ok_count += SUCCEEDED(state.iface->Stop()); } - i->params = NULL; + state.params = NULL; } else { @@ -540,6 +531,7 @@ ControlState Joystick::Hat::GetState() const // hat centered code from MSDN if (0xFFFF == LOWORD(m_hat)) return 0; + return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2); } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 20b38c8a69..6b6be58193 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -25,9 +25,9 @@ private: { EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {} - LPDIRECTINPUTEFFECT iface; - void* params; // null when force hasn't changed - u8 size; // zero when force should stop + LPDIRECTINPUTEFFECT iface; + void* params; // null when force hasn't changed + u8 size; // zero when force should stop }; class Button : public Input @@ -76,9 +76,9 @@ private: P params; const u8 m_index; }; - typedef Force ForceConstant; - typedef Force ForceRamp; - typedef Force ForcePeriodic; + typedef Force ForceConstant; + typedef Force ForceRamp; + typedef Force ForcePeriodic; public: bool UpdateInput(); @@ -94,13 +94,13 @@ public: std::string GetSource() const; private: - const LPDIRECTINPUTDEVICE8 m_device; - const unsigned int m_index; + const LPDIRECTINPUTDEVICE8 m_device; + const unsigned int m_index; - DIJOYSTATE m_state_in; - std::list m_state_out; + DIJOYSTATE m_state_in; + std::list m_state_out; - bool m_buffered; + bool m_buffered; }; } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 850ff27281..50f065f92f 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -5,11 +5,11 @@ // (lower would be more sensitive) user can lower sensitivity by setting range // seems decent here ( at 8 ), I don't think anyone would need more sensitive than this // and user can lower it much farther than they would want to with the range -#define MOUSE_AXIS_SENSITIVITY 8 +#define MOUSE_AXIS_SENSITIVITY 8 // if input hasn't been received for this many ms, mouse input will be skipped // otherwise it is just some crazy value -#define DROP_INPUT_TIME 250 +#define DROP_INPUT_TIME 250 namespace ciface { @@ -18,8 +18,8 @@ namespace DInput static const struct { - const BYTE code; - const char* const name; + const BYTE code; + const char* const name; } named_keys[] = { #include "NamedKeys.h" @@ -27,8 +27,8 @@ static const struct static const struct { - const BYTE code; - const char* const name; + const BYTE code; + const char* const name; } named_lights[] = { { VK_NUMLOCK, "NUM LOCK" }, diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 73398ca1b1..4973979052 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -21,8 +21,8 @@ class KeyboardMouse : public Core::Device private: struct State { - BYTE keyboard[256]; - DIMOUSESTATE2 mouse; + BYTE keyboard[256]; + DIMOUSESTATE2 mouse; struct { float x, y; @@ -98,13 +98,13 @@ public: std::string GetSource() const; private: - const LPDIRECTINPUTDEVICE8 m_kb_device; - const LPDIRECTINPUTDEVICE8 m_mo_device; + const LPDIRECTINPUTDEVICE8 m_kb_device; + const LPDIRECTINPUTDEVICE8 m_mo_device; - DWORD m_last_update; - State m_state_in; - unsigned char m_state_out[3]; // NUM CAPS SCROLL - bool m_current_state_out[3]; // NUM CAPS SCROLL + DWORD m_last_update; + State m_state_in; + unsigned char m_state_out[3]; // NUM CAPS SCROLL + bool m_current_state_out[3]; // NUM CAPS SCROLL }; } diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 965ecfc817..1a7295c2c5 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -10,29 +10,19 @@ namespace Core { // -// Device :: ~Device +// Device :: ~Device // // Destructor, delete all inputs/outputs on device destruction // Device::~Device() { - { // delete inputs - std::vector::iterator - i = m_inputs.begin(), - e = m_inputs.end(); - for ( ;i!=e; ++i) - delete *i; - } + for (Device::Input* input : m_inputs) + delete input; - { // delete outputs - std::vector::iterator - o = m_outputs.begin(), - e = m_outputs.end(); - for ( ;o!=e; ++o) - delete *o; - } + for (Device::Output* output: m_outputs) + delete output; } void Device::AddInput(Device::Input* const i) @@ -47,30 +37,28 @@ void Device::AddOutput(Device::Output* const o) Device::Input* Device::FindInput(const std::string &name) const { - std::vector::const_iterator - it = m_inputs.begin(), - itend = m_inputs.end(); - for (; it != itend; ++it) - if ((*it)->GetName() == name) - return *it; + for (Input* input : m_inputs) + { + if (input->GetName() == name) + return input; + } return NULL; } Device::Output* Device::FindOutput(const std::string &name) const { - std::vector::const_iterator - it = m_outputs.begin(), - itend = m_outputs.end(); - for (; it != itend; ++it) - if ((*it)->GetName() == name) - return *it; + for (Output* output : m_outputs) + { + if (output->GetName() == name) + return output; + } return NULL; } // -// Device :: ClearInputState +// Device :: ClearInputState // // Device classes should override this function // ControllerInterface will call this when the device returns failure during UpdateInput @@ -84,26 +72,28 @@ void Device::ClearInputState() } // -// DeviceQualifier :: ToString +// DeviceQualifier :: ToString // -// get string from a device qualifier / serialize +// Get string from a device qualifier / serialize // std::string DeviceQualifier::ToString() const { if (source.empty() && (cid < 0) && name.empty()) return ""; + std::ostringstream ss; ss << source << '/'; - if ( cid > -1 ) + if (cid > -1) ss << cid; ss << '/' << name; + return ss.str(); } // -// DeviceQualifier :: FromString +// DeviceQualifier :: FromString // -// set a device qualifier from a string / unserialize +// Set a device qualifier from a string / unserialize // void DeviceQualifier::FromString(const std::string& str) { @@ -119,9 +109,9 @@ void DeviceQualifier::FromString(const std::string& str) } // -// DeviceQualifier :: FromDevice +// DeviceQualifier :: FromDevice // -// set a device qualifier from a device +// Set a device qualifier from a device // void DeviceQualifier::FromDevice(const Device* const dev) { @@ -136,6 +126,7 @@ bool DeviceQualifier::operator==(const Device* const dev) const if (dev->GetName() == name) if (dev->GetSource() == source) return true; + return false; } @@ -151,12 +142,11 @@ bool DeviceQualifier::operator==(const DeviceQualifier& devq) const Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const { - std::vector::const_iterator - di = m_devices.begin(), - de = m_devices.end(); - for (; di!=de; ++di) - if (devq == *di) - return *di; + for (Device* d : m_devices) + { + if (devq == d) + return d; + } return NULL; } @@ -170,12 +160,9 @@ Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* return inp; } - std::vector::const_iterator - di = m_devices.begin(), - de = m_devices.end(); - for (; di != de; ++di) + for (Device* d : m_devices) { - Device::Input* const i = (*di)->FindInput(name); + Device::Input* const i = d->FindInput(name); if (i) return i; diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index a7c26b867d..a2cdc7cf01 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -19,9 +19,9 @@ namespace Core class DeviceQualifier; // -// Device +// Device // -// a device class +// A device class // class Device { @@ -30,11 +30,11 @@ public: class Output; // - // Control + // Control // - // control includes inputs and outputs + // Control includes inputs and outputs // - class Control // input or output + class Control // input or output { public: virtual std::string GetName() const = 0; @@ -45,9 +45,9 @@ public: }; // - // Input + // Input // - // an input on a device + // An input on a device // class Input : public Control { @@ -61,9 +61,9 @@ public: }; // - // Output + // Output // - // an output on a device + // An output on a device // class Output : public Control { @@ -126,15 +126,15 @@ protected: } private: - std::vector m_inputs; - std::vector m_outputs; + std::vector m_inputs; + std::vector m_outputs; }; // -// DeviceQualifier +// DeviceQualifier // -// device qualifier used to match devices -// currently has ( source, id, name ) properties which match a device +// Device qualifier used to match devices. +// Currently has ( source, id, name ) properties which match a device // class DeviceQualifier { @@ -148,9 +148,9 @@ public: bool operator==(const DeviceQualifier& devq) const; bool operator==(const Device* const dev) const; - std::string source; - int cid; - std::string name; + std::string source; + int cid; + std::string name; }; class DeviceContainer diff --git a/Source/Core/InputCommon/GCPadStatus.h b/Source/Core/InputCommon/GCPadStatus.h index 94abef01e2..7c1bcbc738 100644 --- a/Source/Core/InputCommon/GCPadStatus.h +++ b/Source/Core/InputCommon/GCPadStatus.h @@ -27,16 +27,16 @@ typedef struct { - unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits - unsigned char stickX; // 0 <= stickX <= 255 - unsigned char stickY; // 0 <= stickY <= 255 - unsigned char substickX; // 0 <= substickX <= 255 - unsigned char substickY; // 0 <= substickY <= 255 - unsigned char triggerLeft; // 0 <= triggerLeft <= 255 - unsigned char triggerRight; // 0 <= triggerRight <= 255 - unsigned char analogA; // 0 <= analogA <= 255 - unsigned char analogB; // 0 <= analogB <= 255 - signed char err; // one of PAD_ERR_* number + unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits + unsigned char stickX; // 0 <= stickX <= 255 + unsigned char stickY; // 0 <= stickY <= 255 + unsigned char substickX; // 0 <= substickX <= 255 + unsigned char substickY; // 0 <= substickY <= 255 + unsigned char triggerLeft; // 0 <= triggerLeft <= 255 + unsigned char triggerRight; // 0 <= triggerRight <= 255 + unsigned char analogA; // 0 <= analogA <= 255 + unsigned char analogB; // 0 <= analogB <= 255 + signed char err; // one of PAD_ERR_* number } SPADStatus; #endif diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index d627d047ad..41f18c8403 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -10,10 +10,8 @@ InputPlugin::~InputPlugin() { // delete pads - std::vector::const_iterator i = controllers.begin(), - e = controllers.end(); - for ( ; i != e; ++i ) - delete *i; + for (ControllerEmu* pad : controllers) + delete pad; } bool InputPlugin::LoadConfig(bool isGC) @@ -58,25 +56,26 @@ bool InputPlugin::LoadConfig(bool isGC) if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) { - std::vector< ControllerEmu* >::const_iterator - i = controllers.begin(), - e = controllers.end(); - for (int n = 0; i!=e; ++i, ++n) + int n = 0; + for (ControllerEmu* pad : controllers) { - // load settings from ini + // Load settings from ini if (useProfile[n]) { IniFile profile_ini; profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); - (*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); + pad->LoadConfig(profile_ini.GetOrCreateSection("Profile")); } else { - (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + pad->LoadConfig(inifile.GetOrCreateSection(pad->GetName().c_str())); } - // update refs - (*i)->UpdateReferences(g_controller_interface); + // Update refs + pad->UpdateReferences(g_controller_interface); + + // Next profile + n++; } return true; } @@ -95,10 +94,8 @@ void InputPlugin::SaveConfig() IniFile inifile; inifile.Load(ini_filename); - std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), - e = controllers.end(); - for ( ; i!=e; ++i ) - (*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + for (ControllerEmu* pad : controllers) + pad->SaveConfig(inifile.GetOrCreateSection(pad->GetName().c_str())); inifile.Save(ini_filename); } diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index f6d563fa11..1abed6bb2c 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -30,13 +30,13 @@ public: bool LoadConfig(bool isGC); void SaveConfig(); - std::vector< ControllerEmu* > controllers; + std::vector controllers; - std::recursive_mutex controls_lock; // for changing any control references + std::recursive_mutex controls_lock; // for changing any control references - const char * const ini_name; - const char * const gui_name; - const char * const profile_name; + const char* const ini_name; + const char* const gui_name; + const char* const profile_name; }; #endif