Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ba79a143
Commit
ba79a143
authored
May 07, 2019
by
Andrew Eikum
Committed by
Alexandre Julliard
May 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winebus.sys: Report SDL controller buttons in the right order.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
564e7b4d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
bus_sdl.c
dlls/winebus.sys/bus_sdl.c
+4
-4
hid.c
dlls/xinput1_3/hid.c
+4
-5
No files found.
dlls/winebus.sys/bus_sdl.c
View file @
ba79a143
...
@@ -808,10 +808,10 @@ static BOOL set_mapped_report_from_event(SDL_Event *event)
...
@@ -808,10 +808,10 @@ static BOOL set_mapped_report_from_event(SDL_Event *event)
case
SDL_CONTROLLER_BUTTON_Y
:
usage
=
3
;
break
;
case
SDL_CONTROLLER_BUTTON_Y
:
usage
=
3
;
break
;
case
SDL_CONTROLLER_BUTTON_LEFTSHOULDER
:
usage
=
4
;
break
;
case
SDL_CONTROLLER_BUTTON_LEFTSHOULDER
:
usage
=
4
;
break
;
case
SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
:
usage
=
5
;
break
;
case
SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
:
usage
=
5
;
break
;
case
SDL_CONTROLLER_BUTTON_
LEFTSTI
CK
:
usage
=
6
;
break
;
case
SDL_CONTROLLER_BUTTON_
BA
CK
:
usage
=
6
;
break
;
case
SDL_CONTROLLER_BUTTON_
RIGHTSTICK
:
usage
=
7
;
break
;
case
SDL_CONTROLLER_BUTTON_
START
:
usage
=
7
;
break
;
case
SDL_CONTROLLER_BUTTON_
START
:
usage
=
8
;
break
;
case
SDL_CONTROLLER_BUTTON_
LEFTSTICK
:
usage
=
8
;
break
;
case
SDL_CONTROLLER_BUTTON_
BA
CK
:
usage
=
9
;
break
;
case
SDL_CONTROLLER_BUTTON_
RIGHTSTI
CK
:
usage
=
9
;
break
;
case
SDL_CONTROLLER_BUTTON_GUIDE
:
usage
=
10
;
break
;
case
SDL_CONTROLLER_BUTTON_GUIDE
:
usage
=
10
;
break
;
case
SDL_CONTROLLER_BUTTON_DPAD_UP
:
case
SDL_CONTROLLER_BUTTON_DPAD_UP
:
...
...
dlls/xinput1_3/hid.c
View file @
ba79a143
...
@@ -375,11 +375,10 @@ void HID_update_state(xinput_controller* device)
...
@@ -375,11 +375,10 @@ void HID_update_state(xinput_controller* device)
case
4
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_Y
;
break
;
case
4
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_Y
;
break
;
case
5
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_LEFT_SHOULDER
;
break
;
case
5
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_LEFT_SHOULDER
;
break
;
case
6
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_RIGHT_SHOULDER
;
break
;
case
6
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_RIGHT_SHOULDER
;
break
;
case
7
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_LEFT_THUMB
;
break
;
case
7
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_BACK
;
break
;
case
8
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_RIGHT_THUMB
;
break
;
case
8
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_START
;
break
;
case
9
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_LEFT_THUMB
;
break
;
case
9
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_START
;
break
;
case
10
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_RIGHT_THUMB
;
break
;
case
10
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_BACK
;
break
;
case
11
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_GUIDE
;
break
;
case
11
:
device
->
state
.
Gamepad
.
wButtons
|=
XINPUT_GAMEPAD_GUIDE
;
break
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment