[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH] winejoystick: Add support for wheel axes
From:       Tim Schumacher <timschumi () gmx ! de>
Date:       2019-03-31 11:02:27
Message-ID: 20190331110227.18757-2-timschumi () gmx ! de
[Download RAW message or body]

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>
---
 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 287f4be60d..7c24040761 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 */
--
2.21.0




[prev in list] [next in list] [prev in thread] [next in thread]