ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1282 from reicast/baka/evdev_warnnotconfigured 

evdev: Print a warning if a key is not configured
This commit is contained in:
Abandoned Cart 2018-08-22 18:14:18 -04:00 committed by GitHub
parent fda672d66b 369ecf2db2
commit 97c5b9e490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/linux-dist/evdev.cpp
View File

@ -118,12 +118,13 @@
strstr(keycode.c_str(), "BTN_") != NULL || strstr(keycode.c_str(), "BTN_") != NULL ||
strstr(keycode.c_str(), "ABS_") != NULL) strstr(keycode.c_str(), "ABS_") != NULL)
{ {
if(libevdev_available) if (libevdev_available)
{ {
int type = ((strstr(keycode.c_str(), "ABS_") != NULL) ? EV_ABS : EV_KEY); int type = ((strstr(keycode.c_str(), "ABS_") != NULL) ? EV_ABS : EV_KEY);
code = libevdev_event_code_from_name(type, keycode.c_str()); code = libevdev_event_code_from_name(type, keycode.c_str());
} }
if(code < 0)
if (code < 0)
{ {
printf("evdev: failed to find keycode for '%s'\n", keycode.c_str()); printf("evdev: failed to find keycode for '%s'\n", keycode.c_str());
} }
@ -131,27 +132,34 @@
{ {
printf("%s = %s (%d)\n", dc_key.c_str(), keycode.c_str(), code); printf("%s = %s (%d)\n", dc_key.c_str(), keycode.c_str(), code);
} }
return code; }
else
{
code = cfg->get_int(section, dc_key, -1);
if(code >= 0)
{
char* name = NULL;
if (libevdev_available)
{
int type = ((strstr(dc_key.c_str(), "axis_") != NULL) ? EV_ABS : EV_KEY);
name = (char*)libevdev_event_code_get_name(type, code);
}
if (name != NULL)
{
printf("%s = %s (%d)\n", dc_key.c_str(), name, code);
}
else
{
printf("%s = %d\n", dc_key.c_str(), code);
}
}
} }
code = cfg->get_int(section, dc_key, -1); if (code < 0)
if(code >= 0) printf("WARNING: %s/%s not configured!\n", section.c_str(), dc_key.c_str());
{
char* name = NULL;
if(libevdev_available)
{
int type = ((strstr(dc_key.c_str(), "axis_") != NULL) ? EV_ABS : EV_KEY);
name = (char*)libevdev_event_code_get_name(type, code);
}
if (name != NULL)
{
printf("%s = %s (%d)\n", dc_key.c_str(), name, code);
}
else
{
printf("%s = %d\n", dc_key.c_str(), code);
}
}
return code; return code;
} }