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] Map hats indices to the correct hwdata_hat element

steam_controller_fix.patch (text/plain), 1.83 KB, created by Matteo Beniamino on 2019-02-03 09:11:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matteo Beniamino

Created: 2019-02-03 09:11:30 UTC

Size: 1.83 KB

patch

obsolete

>diff -r 1fc2169984ad src/joystick/linux/SDL_sysjoystick.c
>--- a/src/joystick/linux/SDL_sysjoystick.c	Thu Jan 31 19:52:47 2019 -0400
>+++ b/src/joystick/linux/SDL_sysjoystick.c	Sun Feb 03 10:04:57 2019 +0100
>@@ -609,17 +609,18 @@
>         for (i = ABS_HAT0X; i <= ABS_HAT3Y; i += 2) {
>             if (test_bit(i, absbit) || test_bit(i + 1, absbit)) {
>                 struct input_absinfo absinfo;
>+                int hat_index = (i - ABS_HAT0X) / 2;
> 
>                 if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) {
>                     continue;
>                 }
> #ifdef DEBUG_INPUT_EVENTS
>-                printf("Joystick has hat %d\n", (i - ABS_HAT0X) / 2);
>+                printf("Joystick has hat %d\n", hat_index);
>                 printf("Values = { %d, %d, %d, %d, %d }\n",
>                        absinfo.value, absinfo.minimum, absinfo.maximum,
>                        absinfo.fuzz, absinfo.flat);
> #endif /* DEBUG_INPUT_EVENTS */
>-                ++joystick->nhats;
>+                joystick->hwdata->hats_indices[joystick->nhats++] = hat_index;
>             }
>         }
>         if (test_bit(REL_X, relbit) || test_bit(REL_Y, relbit)) {
>@@ -762,7 +763,7 @@
>         {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN}
>     };
> 
>-    the_hat = &stick->hwdata->hats[hat];
>+    the_hat = &stick->hwdata->hats[stick->hwdata->hats_indices[hat]];
>     if (value < 0) {
>         value = 0;
>     } else if (value == 0) {
>diff -r 1fc2169984ad src/joystick/linux/SDL_sysjoystick_c.h
>--- a/src/joystick/linux/SDL_sysjoystick_c.h	Thu Jan 31 19:52:47 2019 -0400
>+++ b/src/joystick/linux/SDL_sysjoystick_c.h	Sun Feb 03 10:04:57 2019 +0100
>@@ -62,6 +62,8 @@
> 
>     /* Steam Controller support */
>     SDL_bool m_bSteamController;
>+    /* 4 = (ABS_HAT3X-ABS_HAT0X)/2 (see input-event-codes.h in kernel) */
>+    int hats_indices[4];
> };
> 
> #endif /* SDL_sysjoystick_c_h_ */

Actions: View | Diff

Attachments on bug 4486: 3592 | 3593 | 3594 | 3823

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.