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

Add warning for invalid mappings

Browse Source
This commit is contained in:
Iwan Timmer
2017-08-06 22:31:19 +02:00
parent 1b8ac983e5
commit c1c0e54345
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/input/evdev.c
View File

@@ -103,15 +103,21 @@ static int evdev_get_map_key(int* map, int length, int value) {
return -1;
}
static void evdev_init_parms(struct input_device *dev, struct input_abs_parms *parms, int code) {
static bool evdev_init_parms(struct input_device *dev, struct input_abs_parms *parms, int code) {
int abs = evdev_get_map_key(dev->abs_map, ABS_MAX, code);
parms->flat = libevdev_get_abs_flat(dev->dev, abs);
parms->min = libevdev_get_abs_minimum(dev->dev, abs);
parms->max = libevdev_get_abs_maximum(dev->dev, abs);
parms->avg = (parms->min+parms->max)/2;
parms->range = parms->max - parms->avg;
parms->diff = parms->max - parms->min;
if (abs >= 0) {
parms->flat = libevdev_get_abs_flat(dev->dev, abs);
parms->min = libevdev_get_abs_minimum(dev->dev, abs);
parms->max = libevdev_get_abs_maximum(dev->dev, abs);
if (parms->flat == 0 && parms->min == 0 && parms->max == 0)
return false;
parms->avg = (parms->min+parms->max)/2;
parms->range = parms->max - parms->avg;
parms->diff = parms->max - parms->min;
}
return true;
}
static void evdev_remove(int devindex) {
@@ -512,12 +518,14 @@ void evdev_create(const char* device, struct mapping* mappings, bool verbose) {
devices[dev].controllerId = -1;
if (devices[dev].map != NULL) {
evdev_init_parms(&devices[dev], &(devices[dev].xParms), devices[dev].map->abs_leftx);
evdev_init_parms(&devices[dev], &(devices[dev].yParms), devices[dev].map->abs_lefty);
evdev_init_parms(&devices[dev], &(devices[dev].zParms), devices[dev].map->abs_lefttrigger);
evdev_init_parms(&devices[dev], &(devices[dev].rxParms), devices[dev].map->abs_rightx);
evdev_init_parms(&devices[dev], &(devices[dev].ryParms), devices[dev].map->abs_righty);
evdev_init_parms(&devices[dev], &(devices[dev].rzParms), devices[dev].map->abs_righttrigger);
bool valid = evdev_init_parms(&devices[dev], &(devices[dev].xParms), devices[dev].map->abs_leftx);
valid &= evdev_init_parms(&devices[dev], &(devices[dev].yParms), devices[dev].map->abs_lefty);
valid &= evdev_init_parms(&devices[dev], &(devices[dev].zParms), devices[dev].map->abs_lefttrigger);
valid &= evdev_init_parms(&devices[dev], &(devices[dev].rxParms), devices[dev].map->abs_rightx);
valid &= evdev_init_parms(&devices[dev], &(devices[dev].ryParms), devices[dev].map->abs_righty);
valid &= evdev_init_parms(&devices[dev], &(devices[dev].rzParms), devices[dev].map->abs_righttrigger);
if (!valid)
fprintf(stderr, "Mapping for %s (%s) on %s is incorrect\n", name, str_guid, device);
}
if (grabbingDevices) {