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] Also parse data[12] with dpad values on the xb1s controller

xbox360.patch (text/plain), 1.88 KB, created by Bart van der Werf on 2020-10-21 10:37:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bart van der Werf

Created: 2020-10-21 10:37:22 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360.c b/src/joystick/hidapi/SDL_hidapi_xbox360.c
>index 629a52a..4db81c4 100644
>--- a/src/joystick/hidapi/SDL_hidapi_xbox360.c
>+++ b/src/joystick/hidapi/SDL_hidapi_xbox360.c
>@@ -827,7 +827,7 @@ HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev,
>         SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_START, (data[10] & 0x80) ? SDL_PRESSED : SDL_RELEASED);
>     }
> 
>-    if (ctx->last_state[11] != data[11]) {
>+    if (ctx->last_state[11] != data[11] || ctx->last_state[12] != data[12]) {
>         SDL_bool dpad_up = SDL_FALSE;
>         SDL_bool dpad_down = SDL_FALSE;
>         SDL_bool dpad_left = SDL_FALSE;
>@@ -868,6 +868,40 @@ HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev,
>         default:
>             break;
>         }
>+        
>+        switch (data[12] & 0x0F) {
>+        case 1:
>+            dpad_up = SDL_TRUE;
>+            break;
>+        case 2:
>+            dpad_up = SDL_TRUE;
>+            dpad_right = SDL_TRUE;
>+            break;
>+        case 3:
>+            dpad_right = SDL_TRUE;
>+            break;
>+        case 4:
>+            dpad_right = SDL_TRUE;
>+            dpad_down = SDL_TRUE;
>+            break;
>+        case 5:
>+            dpad_down = SDL_TRUE;
>+            break;
>+        case 6:
>+            dpad_left = SDL_TRUE;
>+            dpad_down = SDL_TRUE;
>+            break;
>+        case 7:
>+            dpad_left = SDL_TRUE;
>+            break;
>+        case 8:
>+            dpad_up = SDL_TRUE;
>+            dpad_left = SDL_TRUE;
>+            break;
>+        default:
>+            break;
>+        }
>+
>         SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_DOWN, dpad_down);
>         SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_UP, dpad_up);
>         SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, dpad_right);

Actions: View | Diff

Attachments on bug 5324: 4482 | 4483

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.