Module: wine Branch: stable Commit: 4fcf59e0f2c2a5b4a10d60f45557c02ee4de8e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcf59e0f2c2a5b4a10d60f45...
Author: Tim Schumacher timschumi@gmx.de Date: Sun Mar 31 13:02:27 2019 +0200
winejoystick: Add support for wheel axes.
Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z.
Signed-off-by: Tim Schumacher timschumi@gmx.de Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 905e7b0e2ef99c7ccfa5a3dda0844d5ea40afc77) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be..7c24040 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -280,10 +280,13 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -365,13 +368,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */