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

Merge pull request #1182 from baka0815/custom_cfg 

evdev: Allow for custom <device>.cfg files in the /mappings/ directory.
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2018-06-14 20:48:04 +02:00 committed by GitHub
parent f34d4e9917 3d43505504
commit 68ee2828bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,9 @@
if(custom_mapping_fname != NULL) if(custom_mapping_fname != NULL)
{ {
// custom mapping defined in config, use that
mapping_fname = custom_mapping_fname; mapping_fname = custom_mapping_fname;
printf("evdev: user defined custom mapping found (%s)\n", custom_mapping_fname);
} }
else else
{ {
@ -232,27 +234,47 @@
#elif defined(TARGET_GCW0) #elif defined(TARGET_GCW0)
mapping_fname = "controller_gcwz.cfg"; mapping_fname = "controller_gcwz.cfg";
#else #else
if (strcmp(name, "Microsoft X-Box 360 pad") == 0 || // check if a config file name <device>.cfg exists in the /mappings/ directory
strcmp(name, "Xbox 360 Wireless Receiver") == 0 || char* name_cfg = (char*)malloc(strlen(name)+4);
strcmp(name, "Xbox 360 Wireless Receiver (XBOX)") == 0) strcpy(name_cfg, name);
{ strcat(name_cfg, ".cfg");
mapping_fname = "controller_xpad.cfg";
size_t size_needed = snprintf(NULL, 0, EVDEV_MAPPING_PATH, name_cfg) + 1;
char* mapping_path = (char*)malloc(size_needed);
sprintf(mapping_path, EVDEV_MAPPING_PATH, name_cfg);
string dir = get_readonly_data_path(mapping_path);
free(mapping_path);
if (file_exists(dir)) {
printf("evdev: found a named mapping for the device (%s)\n", name_cfg);
mapping_fname = name_cfg;
} }
else if (strstr(name, "Xbox Gamepad (userspace driver)") != NULL) else {
{ free(name_cfg);
mapping_fname = "controller_xboxdrv.cfg";
} if (strcmp(name, "Microsoft X-Box 360 pad") == 0 ||
else if (strstr(name, "keyboard") != NULL || strcmp(name, "Xbox 360 Wireless Receiver") == 0 ||
strstr(name, "Keyboard") != NULL) strcmp(name, "Xbox 360 Wireless Receiver (XBOX)") == 0)
{ {
mapping_fname = "keyboard.cfg"; mapping_fname = "controller_xpad.cfg";
} }
else else if (strstr(name, "Xbox Gamepad (userspace driver)") != NULL)
{ {
mapping_fname = "controller_generic.cfg"; mapping_fname = "controller_xboxdrv.cfg";
}
else if (strstr(name, "keyboard") != NULL ||
strstr(name, "Keyboard") != NULL)
{
mapping_fname = "keyboard.cfg";
}
else
{
mapping_fname = "controller_generic.cfg";
}
} }
#endif #endif
} }
if(loaded_mappings.count(string(mapping_fname)) == 0) if(loaded_mappings.count(string(mapping_fname)) == 0)
{ {
FILE* mapping_fd = NULL; FILE* mapping_fd = NULL;
@ -270,7 +292,7 @@
mapping_fd = fopen(get_readonly_data_path(mapping_path).c_str(), "r"); mapping_fd = fopen(get_readonly_data_path(mapping_path).c_str(), "r");
free(mapping_path); free(mapping_path);
} }
if(mapping_fd != NULL) if(mapping_fd != NULL)
{ {
printf("evdev: reading mapping file: '%s'\n", mapping_fname); printf("evdev: reading mapping file: '%s'\n", mapping_fname);

1
core/stdclass.h
View File

@ -261,6 +261,7 @@ string get_writable_config_path(const string& filename);
string get_writable_data_path(const string& filename); string get_writable_data_path(const string& filename);
string get_readonly_config_path(const string& filename); string get_readonly_config_path(const string& filename);
string get_readonly_data_path(const string& filename); string get_readonly_data_path(const string& filename);
bool file_exists(const string& filename);
class VArray2 class VArray2