moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-02-16 10:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix over-counting of evdev gamepads on stream start

Browse Source
This commit is contained in:
Cameron Gutman
2021-07-25 18:33:52 -05:00
parent 45c1a504e9
commit 4dd6ab97df
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/input/evdev.c
View File

@@ -628,12 +628,28 @@ void evdev_create(const char* device, struct mapping* mappings, bool verbose, in
bool is_mouse = libevdev_has_event_type(evdev, EV_REL) || libevdev_has_event_code(evdev, EV_KEY, BTN_LEFT);
bool is_touchscreen = libevdev_has_event_code(evdev, EV_KEY, BTN_TOUCH);
if (mappings == NULL && !(is_keyboard || is_mouse || is_touchscreen)) {
// The gamepad classification logic comes from SDL
bool is_gamepad =
libevdev_has_event_code(evdev, EV_ABS, ABS_X) &&
libevdev_has_event_code(evdev, EV_ABS, ABS_Y) &&
(libevdev_has_event_code(evdev, EV_KEY, BTN_TRIGGER) ||
libevdev_has_event_code(evdev, EV_KEY, BTN_A) ||
libevdev_has_event_code(evdev, EV_KEY, BTN_1) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_RX) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_RY) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_RZ) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_THROTTLE) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_RUDDER) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_WHEEL) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_GAS) ||
libevdev_has_event_code(evdev, EV_ABS, ABS_BRAKE));
if (mappings == NULL && is_gamepad) {
fprintf(stderr, "No mapping available for %s (%s) on %s\n", name, str_guid, device);
mappings = default_mapping;
}
if (!is_keyboard && !is_mouse && !is_touchscreen)
if (is_gamepad)
evdev_gamepads++;
int dev = numDevices;