diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-31 13:02:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 13:02:35 +0200 |
| commit | 1cee89467b355b8b5b8e42d71ff5a6983b100d07 (patch) | |
| tree | 8e096a0137fb0fc308d05cfab8106ec690419d18 /platform | |
| parent | 13d785241c1905e193186e39b9ba12699cce583c (diff) | |
| parent | 8fe2ecf56581019e7f688200490637846d8bb3b7 (diff) | |
Merge pull request #40591 from madmiraal/fix-24526
Update Linux gamepad detection to match SDL.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linuxbsd/joypad_linux.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/platform/linuxbsd/joypad_linux.cpp b/platform/linuxbsd/joypad_linux.cpp index 5edaf35c50..fda1358dfd 100644 --- a/platform/linuxbsd/joypad_linux.cpp +++ b/platform/linuxbsd/joypad_linux.cpp @@ -311,16 +311,9 @@ void JoypadLinux::open_joypad(const char *p_path) { return; } - //check if the device supports basic gamepad events, prevents certain keyboards from - //being detected as joypads + // Check if the device supports basic gamepad events if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) && - (test_bit(ABS_X, absbit) || test_bit(ABS_Y, absbit) || test_bit(ABS_HAT0X, absbit) || - test_bit(ABS_GAS, absbit) || test_bit(ABS_RUDDER, absbit)) && - (test_bit(BTN_A, keybit) || test_bit(BTN_THUMBL, keybit) || - test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_1, keybit))) && - !(test_bit(EV_ABS, evbit) && - test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit) && - test_bit(ABS_RX, absbit) && test_bit(ABS_RY, absbit))) { + test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit))) { close(fd); return; } |