Commit 828a0a4a10ca26a41576c98cfdf78158a04d60e3
2021-11-11T07:13:29
Fixed mapping for PS4 controller when using the classic Joystick interface on Linux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 188d05a..a5e80d6 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -1573,6 +1573,7 @@ LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
SDL_OutOfMemory();
return SDL_FALSE;
}
+ SDL_memcpy(&joystick->guid, &item->guid, sizeof(item->guid));
joystick->hwdata = (struct joystick_hwdata *)
SDL_calloc(1, sizeof(*joystick->hwdata));
@@ -1611,14 +1612,27 @@ LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
out->b.target = joystick->hwdata->key_map[BTN_B];
}
- if (joystick->hwdata->has_key[BTN_X]) {
- out->x.kind = EMappingKind_Button;
- out->x.target = joystick->hwdata->key_map[BTN_X];
- }
+ /* Xbox controllers use BTN_X and BTN_Y, and PS4 controllers use BTN_WEST and BTN_NORTH */
+ if (SDL_JoystickGetVendor(joystick) == USB_VENDOR_SONY) {
+ if (joystick->hwdata->has_key[BTN_WEST]) {
+ out->x.kind = EMappingKind_Button;
+ out->x.target = joystick->hwdata->key_map[BTN_WEST];
+ }
- if (joystick->hwdata->has_key[BTN_Y]) {
- out->y.kind = EMappingKind_Button;
- out->y.target = joystick->hwdata->key_map[BTN_Y];
+ if (joystick->hwdata->has_key[BTN_NORTH]) {
+ out->y.kind = EMappingKind_Button;
+ out->y.target = joystick->hwdata->key_map[BTN_NORTH];
+ }
+ } else {
+ if (joystick->hwdata->has_key[BTN_X]) {
+ out->x.kind = EMappingKind_Button;
+ out->x.target = joystick->hwdata->key_map[BTN_X];
+ }
+
+ if (joystick->hwdata->has_key[BTN_Y]) {
+ out->y.kind = EMappingKind_Button;
+ out->y.target = joystick->hwdata->key_map[BTN_Y];
+ }
}
if (joystick->hwdata->has_key[BTN_SELECT]) {