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 v1

sdl_support_linux_gamepad_spec_v1.patch (text/plain), 24.30 KB, created by Jan Bujak on 2020-05-26 20:18:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Bujak

Created: 2020-05-26 20:18:52 UTC

Size: 24.30 KB

patch

obsolete

>diff -r a8f431812db7 src/joystick/SDL_gamecontroller.c
>--- a/src/joystick/SDL_gamecontroller.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/SDL_gamecontroller.c	Tue May 26 21:43:23 2020 +0200
>@@ -1089,6 +1089,91 @@
>     return mapping;
> }
> 
>+static void SDL_PrivateAppendToMappingString(char *mapping_string,
>+                                             size_t mapping_string_len,
>+                                             const char *input_name,
>+                                             SDL_InputMapping *mapping)
>+{
>+    char buffer[16];
>+    if (mapping->kind == EMappingKind_None) {
>+        return;
>+    }
>+
>+    SDL_strlcat(mapping_string, input_name, mapping_string_len);
>+    SDL_strlcat(mapping_string, ":", mapping_string_len);
>+    switch (mapping->kind) {
>+        case EMappingKind_Button:
>+            SDL_snprintf(buffer, sizeof(buffer), "b%i", mapping->target);
>+            break;
>+        case EMappingKind_Axis:
>+            SDL_snprintf(buffer, sizeof(buffer), "a%i", mapping->target);
>+            break;
>+        case EMappingKind_Hat:
>+            SDL_snprintf(buffer, sizeof(buffer), "h%i.%i", mapping->target >> 4, mapping->target & 0x0F);
>+            break;
>+        default:
>+            SDL_assert(SDL_FALSE);
>+    }
>+
>+    SDL_strlcat(mapping_string, buffer, mapping_string_len);
>+    SDL_strlcat(mapping_string, ",", mapping_string_len);
>+}
>+
>+static ControllerMapping_t *SDL_PrivateGenerateAutomaticControllerMapping(const char *name,
>+                                                                          SDL_JoystickGUID guid,
>+                                                                          SDL_GamepadMapping *raw_map)
>+{
>+    SDL_bool existing;
>+    char name_string[128];
>+    char mapping[1024];
>+
>+    /* Remove any commas in the name */
>+    SDL_strlcpy(name_string, name, sizeof(name_string));
>+    {
>+        char *spot;
>+        for (spot = name_string; *spot; ++spot) {
>+            if (*spot == ',') {
>+                *spot = ' ';
>+            }
>+        }
>+    }
>+    SDL_snprintf(mapping, sizeof(mapping), "none,%s,", name_string);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "a", &raw_map->a);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "b", &raw_map->b);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "x", &raw_map->x);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "y", &raw_map->y);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "back", &raw_map->back);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "guide", &raw_map->guide);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "start", &raw_map->start);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "leftstick", &raw_map->leftstick);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "rightstick", &raw_map->rightstick);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "leftshoulder", &raw_map->leftshoulder);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "rightshoulder", &raw_map->rightshoulder);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "dpup", &raw_map->dpup);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "dpdown", &raw_map->dpdown);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "dpleft", &raw_map->dpleft);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "dpright", &raw_map->dpright);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "leftx", &raw_map->leftx);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "lefty", &raw_map->lefty);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "rightx", &raw_map->rightx);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "righty", &raw_map->righty);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "lefttrigger", &raw_map->lefttrigger);
>+    SDL_PrivateAppendToMappingString(mapping, sizeof(mapping), "righttrigger", &raw_map->righttrigger);
>+
>+    /* Remove trailing comma */
>+    {
>+        int pos = (int)SDL_strlen(mapping) - 1;
>+        if (pos >= 0) {
>+            if (mapping[pos] == ',') {
>+                mapping[pos] = '\0';
>+            }
>+        }
>+    }
>+
>+    return SDL_PrivateAddMappingForGUID(guid, mapping,
>+                      &existing, SDL_CONTROLLER_MAPPING_PRIORITY_DEFAULT);
>+}
>+
> static ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index)
> {
>     const char *name;
>@@ -1106,6 +1191,13 @@
>     name = SDL_JoystickNameForIndex(device_index);
>     guid = SDL_JoystickGetDeviceGUID(device_index);
>     mapping = SDL_PrivateGetControllerMappingForNameAndGUID(name, guid);
>+    if (!mapping) {
>+        SDL_GamepadMapping raw_map;
>+        if (SDL_PrivateJoystickGetAutoGamepadMapping(device_index, &raw_map)) {
>+            mapping = SDL_PrivateGenerateAutomaticControllerMapping(name, guid, &raw_map);
>+        }
>+    }
>+
>     SDL_UnlockJoysticks();
>     return mapping;
> }
>diff -r a8f431812db7 src/joystick/SDL_joystick.c
>--- a/src/joystick/SDL_joystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/SDL_joystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -584,6 +584,21 @@
>     return valid;
> }
> 
>+SDL_bool
>+SDL_PrivateJoystickGetAutoGamepadMapping(int device_index, SDL_GamepadMapping * out)
>+{
>+    SDL_JoystickDriver *driver;
>+    SDL_bool is_ok = SDL_FALSE;
>+
>+    SDL_LockJoysticks();
>+    if (SDL_GetDriverAndJoystickIndex(device_index, &driver, &device_index)) {
>+        is_ok = driver->GetGamepadMapping(device_index, out);
>+    }
>+    SDL_UnlockJoysticks();
>+
>+    return is_ok;
>+}
>+
> /*
>  * Get the number of multi-dimensional axis controls on a joystick
>  */
>diff -r a8f431812db7 src/joystick/SDL_joystick_c.h
>--- a/src/joystick/SDL_joystick_c.h	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/SDL_joystick_c.h	Tue May 26 21:43:23 2020 +0200
>@@ -111,6 +111,49 @@
> /* Internal sanity checking functions */
> extern SDL_bool SDL_PrivateJoystickValid(SDL_Joystick * joystick);
> 
>+typedef enum
>+{
>+    EMappingKind_None = 0,
>+    EMappingKind_Button = 1,
>+    EMappingKind_Axis = 2,
>+    EMappingKind_Hat = 3
>+} EMappingKind;
>+
>+typedef struct _SDL_InputMapping
>+{
>+    EMappingKind kind;
>+    Uint8 target;
>+} SDL_InputMapping;
>+
>+typedef struct _SDL_GamepadMapping
>+{
>+    SDL_InputMapping a;
>+    SDL_InputMapping b;
>+    SDL_InputMapping x;
>+    SDL_InputMapping y;
>+    SDL_InputMapping back;
>+    SDL_InputMapping guide;
>+    SDL_InputMapping start;
>+    SDL_InputMapping leftstick;
>+    SDL_InputMapping rightstick;
>+    SDL_InputMapping leftshoulder;
>+    SDL_InputMapping rightshoulder;
>+    SDL_InputMapping dpup;
>+    SDL_InputMapping dpdown;
>+    SDL_InputMapping dpleft;
>+    SDL_InputMapping dpright;
>+    SDL_InputMapping leftx;
>+    SDL_InputMapping lefty;
>+    SDL_InputMapping rightx;
>+    SDL_InputMapping righty;
>+    SDL_InputMapping lefttrigger;
>+    SDL_InputMapping righttrigger;
>+} SDL_GamepadMapping;
>+
>+/* Function to get autodetected gamepad controller mapping from the driver */
>+extern SDL_bool SDL_PrivateJoystickGetAutoGamepadMapping(int device_index,
>+                                                         SDL_GamepadMapping *out);
>+
> #endif /* SDL_joystick_c_h_ */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -r a8f431812db7 src/joystick/SDL_sysjoystick.h
>--- a/src/joystick/SDL_sysjoystick.h	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/SDL_sysjoystick.h	Tue May 26 21:43:23 2020 +0200
>@@ -136,6 +136,9 @@
>     /* Function to perform any system-specific joystick related cleanup */
>     void (*Quit)(void);
> 
>+    /* Function to get the autodetected controller mapping; returns false if there isn't any. */
>+    SDL_bool (*GetGamepadMapping)(int device_index, SDL_GamepadMapping * out);
>+
> } SDL_JoystickDriver;
> 
> /* Windows and Mac OSX has a limit of MAX_DWORD / 1000, Linux kernel has a limit of 0xFFFF */
>diff -r a8f431812db7 src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/android/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -693,6 +693,12 @@
> #endif /* 0 */
> }
> 
>+static SDL_bool
>+ANDROID_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_ANDROID_JoystickDriver =
> {
>     ANDROID_JoystickInit,
>@@ -708,6 +714,7 @@
>     ANDROID_JoystickUpdate,
>     ANDROID_JoystickClose,
>     ANDROID_JoystickQuit,
>+    ANDROID_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_ANDROID */
>diff -r a8f431812db7 src/joystick/bsd/SDL_sysjoystick.c
>--- a/src/joystick/bsd/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/bsd/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -762,6 +762,12 @@
>     return SDL_Unsupported();
> }
> 
>+static SDL_bool
>+BSD_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_BSD_JoystickDriver =
> {
>     BSD_JoystickInit,
>@@ -777,6 +783,7 @@
>     BSD_JoystickUpdate,
>     BSD_JoystickClose,
>     BSD_JoystickQuit,
>+    BSD_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_USBHID */
>diff -r a8f431812db7 src/joystick/darwin/SDL_sysjoystick.c
>--- a/src/joystick/darwin/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/darwin/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -1051,6 +1051,12 @@
>     }
> }
> 
>+static SDL_bool
>+DARWIN_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_DARWIN_JoystickDriver =
> {
>     DARWIN_JoystickInit,
>@@ -1066,6 +1072,7 @@
>     DARWIN_JoystickUpdate,
>     DARWIN_JoystickClose,
>     DARWIN_JoystickQuit,
>+    DARWIN_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_IOKIT */
>diff -r a8f431812db7 src/joystick/dummy/SDL_sysjoystick.c
>--- a/src/joystick/dummy/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/dummy/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -104,6 +104,12 @@
> {
> }
> 
>+static SDL_bool
>+DUMMY_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_DUMMY_JoystickDriver =
> {
>     DUMMY_JoystickInit,
>@@ -119,6 +125,7 @@
>     DUMMY_JoystickUpdate,
>     DUMMY_JoystickClose,
>     DUMMY_JoystickQuit,
>+    DUMMY_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
>diff -r a8f431812db7 src/joystick/emscripten/SDL_sysjoystick.c
>--- a/src/joystick/emscripten/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/emscripten/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -403,6 +403,12 @@
>     return SDL_Unsupported();
> }
> 
>+static SDL_bool
>+EMSCRIPTEN_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_EMSCRIPTEN_JoystickDriver =
> {
>     EMSCRIPTEN_JoystickInit,
>@@ -418,6 +424,7 @@
>     EMSCRIPTEN_JoystickUpdate,
>     EMSCRIPTEN_JoystickClose,
>     EMSCRIPTEN_JoystickQuit,
>+    EMSCRIPTEN_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_EMSCRIPTEN */
>diff -r a8f431812db7 src/joystick/haiku/SDL_haikujoystick.cc
>--- a/src/joystick/haiku/SDL_haikujoystick.cc	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/haiku/SDL_haikujoystick.cc	Tue May 26 21:43:23 2020 +0200
>@@ -259,6 +259,12 @@
>         return SDL_Unsupported();
>     }
> 
>+    static SDL_bool
>+    HAIKU_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+    {
>+        return SDL_FALSE;
>+    }
>+
>     SDL_JoystickDriver SDL_HAIKU_JoystickDriver =
>     {
>         HAIKU_JoystickInit,
>@@ -274,6 +280,7 @@
>         HAIKU_JoystickUpdate,
>         HAIKU_JoystickClose,
>         HAIKU_JoystickQuit,
>+        HAIKU_JoystickGetGamepadMapping
>     };
> 
> }                              // extern "C"
>diff -r a8f431812db7 src/joystick/hidapi/SDL_hidapijoystick.c
>--- a/src/joystick/hidapi/SDL_hidapijoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/hidapi/SDL_hidapijoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -1101,6 +1101,12 @@
>     initialized = SDL_FALSE;
> }
> 
>+static SDL_bool
>+HIDAPI_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_HIDAPI_JoystickDriver =
> {
>     HIDAPI_JoystickInit,
>@@ -1116,6 +1122,7 @@
>     HIDAPI_JoystickUpdate,
>     HIDAPI_JoystickClose,
>     HIDAPI_JoystickQuit,
>+    HIDAPI_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_HIDAPI */
>diff -r a8f431812db7 src/joystick/iphoneos/SDL_sysjoystick.m
>--- a/src/joystick/iphoneos/SDL_sysjoystick.m	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/iphoneos/SDL_sysjoystick.m	Tue May 26 21:43:23 2020 +0200
>@@ -843,6 +843,12 @@
>     numjoysticks = 0;
> }
> 
>+static SDL_bool
>+IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_IOS_JoystickDriver =
> {
>     IOS_JoystickInit,
>@@ -858,6 +864,7 @@
>     IOS_JoystickUpdate,
>     IOS_JoystickClose,
>     IOS_JoystickQuit,
>+    IOS_JoystickGetGamepadMapping
> };
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -r a8f431812db7 src/joystick/linux/SDL_sysjoystick.c
>--- a/src/joystick/linux/SDL_sysjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/linux/SDL_sysjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -656,6 +656,7 @@
>                 printf("Joystick has button: 0x%x\n", i);
> #endif
>                 joystick->hwdata->key_map[i] = joystick->nbuttons;
>+                joystick->hwdata->has_key[i] = SDL_TRUE;
>                 ++joystick->nbuttons;
>             }
>         }
>@@ -665,6 +666,7 @@
>                 printf("Joystick has button: 0x%x\n", i);
> #endif
>                 joystick->hwdata->key_map[i] = joystick->nbuttons;
>+                joystick->hwdata->has_key[i] = SDL_TRUE;
>                 ++joystick->nbuttons;
>             }
>         }
>@@ -687,6 +689,7 @@
>                        absinfo.fuzz, absinfo.flat);
> #endif /* DEBUG_INPUT_EVENTS */
>                 joystick->hwdata->abs_map[i] = joystick->naxes;
>+                joystick->hwdata->has_abs[i] = SDL_TRUE;
>                 if (absinfo.minimum == absinfo.maximum) {
>                     joystick->hwdata->abs_correct[i].used = 0;
>                 } else {
>@@ -721,6 +724,7 @@
>                        absinfo.fuzz, absinfo.flat);
> #endif /* DEBUG_INPUT_EVENTS */
>                 joystick->hwdata->hats_indices[hat_index] = joystick->nhats++;
>+                joystick->hwdata->has_hat[hat_index] = SDL_TRUE;
>             }
>         }
>         if (test_bit(REL_X, relbit) || test_bit(REL_Y, relbit)) {
>@@ -1100,6 +1104,181 @@
>     SDL_QuitSteamControllers();
> }
> 
>+/*
>+   This is based on the Linux Gamepad Specification
>+   available at: https://www.kernel.org/doc/html/v4.15/input/gamepad.html
>+ */
>+static SDL_bool
>+LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    SDL_Joystick * joystick;
>+
>+    joystick = (SDL_Joystick *) SDL_calloc(sizeof(*joystick), 1);
>+    if (joystick == NULL) {
>+        SDL_OutOfMemory();
>+        return SDL_FALSE;
>+    }
>+
>+    /* We temporarily open the device to check how it's configured. */
>+    if (LINUX_JoystickOpen(joystick, device_index) < 0) {
>+        SDL_free(joystick);
>+        return SDL_FALSE;
>+    }
>+
>+    if (!joystick->hwdata->has_key[BTN_GAMEPAD]) {
>+        /* Not a gamepad according to the specs. */
>+        LINUX_JoystickClose(joystick);
>+        SDL_free(joystick);
>+        return SDL_FALSE;
>+    }
>+
>+    /* We have a gamepad; start filling out the mappings. */
>+    memset(out, 0, sizeof(SDL_GamepadMapping));
>+
>+    if (joystick->hwdata->has_key[BTN_SOUTH]) {
>+        out->a.kind = EMappingKind_Button;
>+        out->a.target = joystick->hwdata->key_map[BTN_SOUTH];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_EAST]) {
>+        out->b.kind = EMappingKind_Button;
>+        out->b.target = joystick->hwdata->key_map[BTN_EAST];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_NORTH]) {
>+        out->y.kind = EMappingKind_Button;
>+        out->y.target = joystick->hwdata->key_map[BTN_NORTH];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_WEST]) {
>+        out->x.kind = EMappingKind_Button;
>+        out->x.target = joystick->hwdata->key_map[BTN_WEST];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_SELECT]) {
>+        out->back.kind = EMappingKind_Button;
>+        out->back.target = joystick->hwdata->key_map[BTN_SELECT];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_START]) {
>+        out->start.kind = EMappingKind_Button;
>+        out->start.target = joystick->hwdata->key_map[BTN_START];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_THUMBL]) {
>+        out->leftstick.kind = EMappingKind_Button;
>+        out->leftstick.target = joystick->hwdata->key_map[BTN_THUMBL];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_THUMBR]) {
>+        out->rightstick.kind = EMappingKind_Button;
>+        out->rightstick.target = joystick->hwdata->key_map[BTN_THUMBR];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_MODE]) {
>+        out->guide.kind = EMappingKind_Button;
>+        out->guide.target = joystick->hwdata->key_map[BTN_MODE];
>+    }
>+
>+    /*
>+       According to the specs the D-Pad, the shoulder buttons and the triggers
>+       can be digital, or analog, or both at the same time.
>+     */
>+
>+    /* Prefer digital shoulder buttons, but settle for analog if missing. */
>+    if (joystick->hwdata->has_key[BTN_TL]) {
>+        out->leftshoulder.kind = EMappingKind_Button;
>+        out->leftshoulder.target = joystick->hwdata->key_map[BTN_TL];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_TR]) {
>+        out->rightshoulder.kind = EMappingKind_Button;
>+        out->rightshoulder.target = joystick->hwdata->key_map[BTN_TR];
>+    }
>+
>+    if (joystick->hwdata->has_hat[1] && /* Check if ABS_HAT1{X, Y} is available. */
>+       (!joystick->hwdata->has_key[BTN_TL] || !joystick->hwdata->has_key[BTN_TR])) {
>+        int hat = joystick->hwdata->hats_indices[1] << 4;
>+        out->leftshoulder.kind = EMappingKind_Hat;
>+        out->rightshoulder.kind = EMappingKind_Hat;
>+        out->leftshoulder.target = hat | 0x4;
>+        out->rightshoulder.target = hat | 0x2;
>+    }
>+
>+    /* Prefer analog triggers, but settle for digital if missing. */
>+    if (joystick->hwdata->has_hat[2]) { /* Check if ABS_HAT2{X,Y} is available. */
>+        int hat = joystick->hwdata->hats_indices[2] << 4;
>+        out->lefttrigger.kind = EMappingKind_Hat;
>+        out->righttrigger.kind = EMappingKind_Hat;
>+        out->lefttrigger.target = hat | 0x4;
>+        out->righttrigger.target = hat | 0x2;
>+    } else {
>+        if (joystick->hwdata->has_key[BTN_TL2]) {
>+            out->lefttrigger.kind = EMappingKind_Button;
>+            out->lefttrigger.target = joystick->hwdata->key_map[BTN_TL2];
>+        }
>+
>+        if (joystick->hwdata->has_key[BTN_TR2]) {
>+            out->righttrigger.kind = EMappingKind_Button;
>+            out->righttrigger.target = joystick->hwdata->key_map[BTN_TR2];
>+        }
>+    }
>+
>+    /* Prefer digital D-Pad, but settle for analog if missing. */
>+    if (joystick->hwdata->has_key[BTN_DPAD_UP]) {
>+        out->dpup.kind = EMappingKind_Button;
>+        out->dpup.target = joystick->hwdata->key_map[BTN_DPAD_UP];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_DPAD_DOWN]) {
>+        out->dpdown.kind = EMappingKind_Button;
>+        out->dpdown.target = joystick->hwdata->key_map[BTN_DPAD_DOWN];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_DPAD_LEFT]) {
>+        out->dpleft.kind = EMappingKind_Button;
>+        out->dpleft.target = joystick->hwdata->key_map[BTN_DPAD_LEFT];
>+    }
>+
>+    if (joystick->hwdata->has_key[BTN_DPAD_RIGHT]) {
>+        out->dpright.kind = EMappingKind_Button;
>+        out->dpright.target = joystick->hwdata->key_map[BTN_DPAD_RIGHT];
>+    }
>+
>+    if (joystick->hwdata->has_hat[0] && /* Check if ABS_HAT0{X,Y} is available. */
>+       (!joystick->hwdata->has_key[BTN_DPAD_LEFT] || !joystick->hwdata->has_key[BTN_DPAD_RIGHT] ||
>+        !joystick->hwdata->has_key[BTN_DPAD_UP] || !joystick->hwdata->has_key[BTN_DPAD_DOWN])) {
>+       int hat = joystick->hwdata->hats_indices[0] << 4;
>+       out->dpleft.kind = EMappingKind_Hat;
>+       out->dpright.kind = EMappingKind_Hat;
>+       out->dpup.kind = EMappingKind_Hat;
>+       out->dpdown.kind = EMappingKind_Hat;
>+       out->dpleft.target = hat | 0x8;
>+       out->dpright.target = hat | 0x2;
>+       out->dpup.target = hat | 0x1;
>+       out->dpdown.target = hat | 0x4;
>+    }
>+
>+    if (joystick->hwdata->has_abs[ABS_X] && joystick->hwdata->has_abs[ABS_Y]) {
>+        out->leftx.kind = EMappingKind_Axis;
>+        out->lefty.kind = EMappingKind_Axis;
>+        out->leftx.target = joystick->hwdata->abs_map[ABS_X];
>+        out->lefty.target = joystick->hwdata->abs_map[ABS_Y];
>+    }
>+
>+    if (joystick->hwdata->has_abs[ABS_RX] && joystick->hwdata->has_abs[ABS_RY]) {
>+        out->rightx.kind = EMappingKind_Axis;
>+        out->righty.kind = EMappingKind_Axis;
>+        out->rightx.target = joystick->hwdata->abs_map[ABS_RX];
>+        out->righty.target = joystick->hwdata->abs_map[ABS_RY];
>+    }
>+
>+    LINUX_JoystickClose(joystick);
>+    SDL_free(joystick);
>+
>+    return SDL_TRUE;
>+}
>+
> SDL_JoystickDriver SDL_LINUX_JoystickDriver =
> {
>     LINUX_JoystickInit,
>@@ -1115,6 +1294,7 @@
>     LINUX_JoystickUpdate,
>     LINUX_JoystickClose,
>     LINUX_JoystickQuit,
>+    LINUX_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_LINUX */
>diff -r a8f431812db7 src/joystick/linux/SDL_sysjoystick_c.h
>--- a/src/joystick/linux/SDL_sysjoystick_c.h	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/linux/SDL_sysjoystick_c.h	Tue May 26 21:43:23 2020 +0200
>@@ -53,6 +53,9 @@
>     /* Support for the Linux 2.4 unified input interface */
>     Uint8 key_map[KEY_MAX];
>     Uint8 abs_map[ABS_MAX];
>+    SDL_bool has_key[KEY_MAX];
>+    SDL_bool has_abs[ABS_MAX];
>+
>     struct axis_correct
>     {
>         int used;
>@@ -65,6 +68,7 @@
>     SDL_bool m_bSteamController;
>     /* 4 = (ABS_HAT3X-ABS_HAT0X)/2 (see input-event-codes.h in kernel) */
>     int hats_indices[4];
>+    SDL_bool has_hat[4];
> 
>     /* Set when gamepad is pending removal due to ENODEV read error */
>     SDL_bool gone;
>diff -r a8f431812db7 src/joystick/virtual/SDL_virtualjoystick.c
>--- a/src/joystick/virtual/SDL_virtualjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/virtual/SDL_virtualjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -391,6 +391,11 @@
>     }
> }
> 
>+static SDL_bool
>+VIRTUAL_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
> 
> SDL_JoystickDriver SDL_VIRTUAL_JoystickDriver =
> {
>@@ -407,6 +412,7 @@
>     VIRTUAL_JoystickUpdate,
>     VIRTUAL_JoystickClose,
>     VIRTUAL_JoystickQuit,
>+    VIRTUAL_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_VIRTUAL || SDL_JOYSTICK_DISABLED */
>diff -r a8f431812db7 src/joystick/windows/SDL_rawinputjoystick.c
>--- a/src/joystick/windows/SDL_rawinputjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/windows/SDL_rawinputjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -725,6 +725,11 @@
>     SDL_RAWINPUT_inited = SDL_FALSE;
> }
> 
>+static SDL_bool
>+RAWINPUT_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
> 
> SDL_JoystickDriver SDL_RAWINPUT_JoystickDriver =
> {
>@@ -741,6 +746,7 @@
>     RAWINPUT_JoystickUpdate,
>     RAWINPUT_JoystickClose,
>     RAWINPUT_JoystickQuit,
>+    RAWINPUT_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_RAWINPUT */
>diff -r a8f431812db7 src/joystick/windows/SDL_windows_gaming_input.c
>--- a/src/joystick/windows/SDL_windows_gaming_input.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/windows/SDL_windows_gaming_input.c	Tue May 26 21:43:23 2020 +0200
>@@ -699,6 +699,12 @@
>     WIN_CoUninitialize();
> }
> 
>+static SDL_bool
>+WGI_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_WGI_JoystickDriver =
> {
>     WGI_JoystickInit,
>@@ -714,6 +720,7 @@
>     WGI_JoystickUpdate,
>     WGI_JoystickClose,
>     WGI_JoystickQuit,
>+    WGI_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_WGI */
>diff -r a8f431812db7 src/joystick/windows/SDL_windowsjoystick.c
>--- a/src/joystick/windows/SDL_windowsjoystick.c	Mon May 25 14:10:51 2020 -0700
>+++ b/src/joystick/windows/SDL_windowsjoystick.c	Tue May 26 21:43:23 2020 +0200
>@@ -555,6 +555,12 @@
>     s_bDeviceRemoved = SDL_FALSE;
> }
> 
>+static SDL_bool
>+WINDOWS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
>+{
>+    return SDL_FALSE;
>+}
>+
> SDL_JoystickDriver SDL_WINDOWS_JoystickDriver =
> {
>     WINDOWS_JoystickInit,
>@@ -570,6 +576,7 @@
>     WINDOWS_JoystickUpdate,
>     WINDOWS_JoystickClose,
>     WINDOWS_JoystickQuit,
>+    WINDOWS_JoystickGetGamepadMapping
> };
> 
> #endif /* SDL_JOYSTICK_DINPUT || SDL_JOYSTICK_XINPUT */

Actions: View | Diff

Attachments on bug 5161: 4358

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.