We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch

sdl_duplicate.patch (text/plain), 2.15 KB, created by Jasem Mutlaq on 2020-05-15 00:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jasem Mutlaq

Created: 2020-05-15 00:25:33 UTC

Size: 2.15 KB

patch

obsolete

>diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
>index e2bce51cf..fbbba7f7d 100644
>--- a/src/joystick/SDL_joystick.c
>+++ b/src/joystick/SDL_joystick.c
>@@ -1790,6 +1790,7 @@ static SDL_bool SDL_IsJoystickProductFlightStick(Uint32 vidpid)
>     static Uint32 flightstick_joysticks[] = {
>         MAKE_VIDPID(0x044f, 0x0402),    /* HOTAS Warthog Joystick */
>         MAKE_VIDPID(0x0738, 0x2221),    /* Saitek Pro Flight X-56 Rhino Stick */
>+        MAKE_VIDPID(0x044f, 0xb10a),    /* ThrustMaster, Inc. T.16000M Joystick */
>     };
>     int i;
> 
>diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
>index 28bccd8ea..8f65511c0 100644
>--- a/src/joystick/linux/SDL_sysjoystick.c
>+++ b/src/joystick/linux/SDL_sysjoystick.c
>@@ -124,6 +124,8 @@ IsJoystick(int fd, char **name_return, SDL_JoystickGUID *guid)
>     Uint16 *guid16 = (Uint16 *)guid->data;
>     char *name;
>     char product_string[128];
>+    SDL_joylist_item *item = NULL;
>+    int index = 0;
> 
> #if !SDL_USE_LIBUDEV
>     /* When udev is enabled we only get joystick devices here, so there's no need to test them */
>@@ -193,6 +195,31 @@ IsJoystick(int fd, char **name_return, SDL_JoystickGUID *guid)
>         SDL_free(name);
>         return 0;
>     }
>+
>+    /* If we have duplicate joystick names, append index name for the next joystick */
>+    /* Check to make sure it's not already in list. */
>+    for (item = SDL_joylist; item != NULL; item = item->next) {
>+        size_t name_len = strlen(name),
>+               item_len = strlen(item->name);
>+
>+        /* Check if the current joystick name starts in any previous names */
>+        if (item_len >= name_len && memcmp(name, item->name, name_len) == 0)
>+            index++;
>+    }
>+
>+    if (index > 0)
>+    {
>+        int len = SDL_strlen(name) + 3;
>+        char * new_name = (char *)SDL_malloc(len);
>+        if (new_name) {
>+            SDL_snprintf(new_name, len, "%s %d", name, index + 1);
>+            /* guid needs to be updated to uniquely identify this device */
>+            guid->data[15] = index+1;
>+            SDL_free(name);
>+            name = new_name;
>+        }
>+    }
>+
>     *name_return = name;
>     return 1;
> }

Actions: View | Diff

Attachments on bug 5137: 4340

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.