Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #18491 from hrydgard/autoconfigure-pad-nonwindows

Browse Source 
SDL: Filter duplicate axis events. Fix autoconfigure to not use Xinput on non-Windows
This commit is contained in:
Henrik Rydgård 2023-12-08 18:15:15 +01:00 committed by GitHub
commit c9d5b72683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/KeyMap.cpp
View File

@ -822,8 +822,12 @@ void AutoConfForPad(const std::string &name) {
SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_PAD, false);
}
#else
// TODO: Should actually check for XInput?
if (name.find("Xbox") != std::string::npos) {
#if PPSSPP_PLATFORM(WINDOWS)
const bool platformSupportsXinput = true;
#else
const bool platformSupportsXinput = false;
#endif
if (platformSupportsXinput && name.find("Xbox") != std::string::npos) {
SetDefaultKeyMap(DEFAULT_MAPPING_XINPUT, false);
} else {
SetDefaultKeyMap(DEFAULT_MAPPING_PAD, false);

15
Windows/DinputDevice.cpp
View File

@ -204,12 +204,13 @@ DinputDevice::~DinputDevice() {
}
void SendNativeAxis(InputDeviceID deviceId, int value, int &lastValue, InputAxis axisId) {
AxisInput axis;
axis.deviceId = deviceId;
axis.axisId = axisId;
axis.value = (float)value * (1.0f / 10000.0f); // Convert axis to normalised float
NativeAxis(&axis, 1);
if (value != lastValue) {
AxisInput axis;
axis.deviceId = deviceId;
axis.axisId = axisId;
axis.value = (float)value * (1.0f / 10000.0f); // Convert axis to normalised float
NativeAxis(&axis, 1);
}
lastValue = value;
}
@ -286,7 +287,7 @@ void DinputDevice::ApplyButtons(DIJOYSTATE2 &state) {
// Now the POV hat, which can technically go in any degree but usually does not.
if (LOWORD(state.rgdwPOV[0]) != lastPOV_[0]) {
KeyInput dpad[4];
KeyInput dpad[4]{};
for (int i = 0; i < 4; ++i) {
dpad[i].deviceId = DEVICE_ID_PAD_0 + pDevNum;
dpad[i].flags = KEY_UP;