Skip to content
Permalink
Browse files
Added general remapping of controller manufacturer
  • Loading branch information
slouken committed Dec 14, 2019
1 parent b51d7f3 commit 0352814a8aa9b6fa990398bdc7780d2c375cb08b
Showing with 24 additions and 7 deletions.
  1. +13 −0 src/joystick/SDL_joystick.c
  2. +3 −0 src/joystick/SDL_joystick_c.h
  3. +8 −7 src/joystick/hidapi/SDL_hidapijoystick.c
@@ -1164,6 +1164,19 @@ void SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint16 *vendor, Uint16 *prod
}
}

const char *
SDL_GetCustomJoystickManufacturer(const char *manufacturer)
{
if (manufacturer) {
if (SDL_strcmp(manufacturer, "Performance Designed Products") == 0) {
return "PDP";
} else if (SDL_strcmp(manufacturer, "HORI CO.,LTD") == 0) {
return "HORI";
}
}
return manufacturer;
}

const char *
SDL_GetCustomJoystickName(Uint16 vendor, Uint16 product)
{
@@ -52,6 +52,9 @@ extern int SDL_JoystickGetDeviceIndexFromInstanceID(SDL_JoystickID instance_id);
/* Function to extract information from an SDL joystick GUID */
extern void SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint16 *vendor, Uint16 *product, Uint16 *version);

/* Function to get a custom name for a controller manufacturer, if it's available */
extern const char *SDL_GetCustomJoystickManufacturer(const char *manufacturer);

/* Function to get a custom name for a controller, if it's available */
extern const char *SDL_GetCustomJoystickName(Uint16 vendor, Uint16 product);

@@ -610,6 +610,7 @@ HIDAPI_AddDevice(struct hid_device_info *info)
}
}
if (!device->name && info->manufacturer_string && info->product_string) {
const char *manufacturer_remapped;
char *manufacturer_string = SDL_iconv_string("UTF-8", "WCHAR_T", (char*)info->manufacturer_string, (SDL_wcslen(info->manufacturer_string)+1)*sizeof(wchar_t));
char *product_string = SDL_iconv_string("UTF-8", "WCHAR_T", (char*)info->product_string, (SDL_wcslen(info->product_string)+1)*sizeof(wchar_t));
if (!manufacturer_string && !product_string) {
@@ -621,15 +622,15 @@ HIDAPI_AddDevice(struct hid_device_info *info)
product_string = SDL_iconv_string("UTF-8", "UCS-4-INTERNAL", (char*)info->product_string, (SDL_wcslen(info->product_string)+1)*sizeof(wchar_t));
}
}
if (manufacturer_string && product_string) {
size_t name_size;

if (SDL_strcmp(manufacturer_string, "Performance Designed Products") == 0) {
/* Shorten this so controller names are more manageable */
SDL_memcpy(manufacturer_string, "PDP", 4);
}
manufacturer_remapped = SDL_GetCustomJoystickManufacturer(manufacturer_string);
if (manufacturer_remapped != manufacturer_string) {
SDL_free(manufacturer_string);
manufacturer_string = SDL_strdup(manufacturer_remapped);
}

name_size = (SDL_strlen(manufacturer_string) + 1 + SDL_strlen(product_string) + 1);
if (manufacturer_string && product_string) {
size_t name_size = (SDL_strlen(manufacturer_string) + 1 + SDL_strlen(product_string) + 1);
device->name = (char *)SDL_malloc(name_size);
if (device->name) {
if (SDL_strncasecmp(manufacturer_string, product_string, SDL_strlen(manufacturer_string)) == 0) {

0 comments on commit 0352814

Please sign in to comment.