Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 17:45:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

filterTrigger: generalize for more controllers

Browse source 
* Filter axes 2/5 for all devices, but only if LeftTrigger or RightTrigger is being configured. This should fix compatibility with XBox 360 and other generic controllers that use these axes for triggers, but won't affect other controllers using these axes for analog sticks, etc.
* Improve third-party PS3 detection (some Shanwan controllers have a grave accent in place of 'm' for 'Gamepad').
This commit is contained in:
Conn O'Griofa 2019-04-11 02:52:21 +01:00
parent 289d89aad1
commit 93fdfaa9c2
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
es-core/src/guis/GuiInputConfig.cpp
View file

@ -133,9 +133,8 @@ GuiInputConfig::GuiInputConfig(Window* window, InputConfig* target, bool reconfi
return false; return false;
} }
// apply filtering for quirks related to trigger mapping
// filter for input quirks specific to Sony DualShock 3 if(filterTrigger(input, config, i))
if(filterTrigger(input, config))
return false; return false;
// we are configuring // we are configuring
@ -337,20 +336,25 @@ void GuiInputConfig::clearAssignment(int inputId)
mTargetConfig->unmapInput(GUI_INPUT_CONFIG_LIST[inputId].name); mTargetConfig->unmapInput(GUI_INPUT_CONFIG_LIST[inputId].name);
} }
bool GuiInputConfig::filterTrigger(Input input, InputConfig* config) bool GuiInputConfig::filterTrigger(Input input, InputConfig* config, int inputId)
{ {
#if defined(__linux__) #if defined(__linux__)
// match PlayStation joystick with 6 axes only // match PlayStation joystick with 6 axes only
if((strstr(config->getDeviceName().c_str(), "PLAYSTATION") != NULL \ if((strstr(config->getDeviceName().c_str(), "PLAYSTATION") != NULL \
|| strstr(config->getDeviceName().c_str(), "PS3 Game") != NULL \ || strstr(config->getDeviceName().c_str(), "PS3 Ga") != NULL \
|| strstr(config->getDeviceName().c_str(), "PS(R) Game") != NULL) \ || strstr(config->getDeviceName().c_str(), "PS(R) Ga") != NULL) \
&& InputManager::getInstance()->getAxisCountByDevice(config->getDeviceId()) == 6) && InputManager::getInstance()->getAxisCountByDevice(config->getDeviceId()) == 6)
{ {
// digital triggers are unwanted // digital triggers are unwanted
if (input.type == TYPE_BUTTON && (input.id == 6 || input.id == 7)) if (input.type == TYPE_BUTTON && (input.id == 6 || input.id == 7))
return true; return true;
// ignore analog values < 0 }
if (input.type == TYPE_AXIS && (input.id == 2 || input.id == 5) && input.value < 0)
// ignore negative pole for axes 2/5 only when triggers are being configured
if((mSkipAxis || strstr(GUI_INPUT_CONFIG_LIST[inputId].name, "Trigger") != NULL) \
&& input.type == TYPE_AXIS && (input.id == 2 || input.id == 5) && input.value < 0)
{
mSkipAxis = true;
return true; return true;
} }
#endif #endif

3
es-core/src/guis/GuiInputConfig.h
View file

@ -28,7 +28,7 @@ private:
bool assign(Input input, int inputId); bool assign(Input input, int inputId);
void clearAssignment(int inputId); void clearAssignment(int inputId);
bool filterTrigger(Input input, InputConfig* config); bool filterTrigger(Input input, InputConfig* config, int inputId);
void rowDone(); void rowDone();
@ -50,6 +50,7 @@ private:
Input mHeldInput; Input mHeldInput;
int mHeldTime; int mHeldTime;
int mHeldInputId; int mHeldInputId;
bool mSkipAxis;
BusyComponent mBusyAnim; BusyComponent mBusyAnim;
}; };