asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #40591 from madmiraal/fix-24526

Browse source 
Update Linux gamepad detection to match SDL.
This commit is contained in:
Rémi Verschelde 2020-07-31 13:02:35 +02:00 committed by GitHub
commit 1cee89467b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/linuxbsd/joypad_linux.cpp
View file

@ -311,16 +311,9 @@ void JoypadLinux::open_joypad(const char *p_path) {
return; return;
} }
//check if the device supports basic gamepad events, prevents certain keyboards from // Check if the device supports basic gamepad events
//being detected as joypads
if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) && 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_X, absbit) && test_bit(ABS_Y, 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))) {
close(fd); close(fd);
return; return;
} }