BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-05 22:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix Steam Controller 2 touchpad finger detection (#15644)

Browse source 
(cherry picked from commit a20530cf15)
This commit is contained in:
Kuratius 2026-05-18 16:03:56 +02:00 • committed by Sam Lantinga
parent 85d86dd72c
commit d147bb2a06
1 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/joystick/hidapi/SDL_hidapi_steam_triton.c
View file

@ -107,6 +107,13 @@ typedef struct
Uint16 low_frequency_rumble;
Uint16 high_frequency_rumble;
Uint64 last_rumble_time;
bool left_touch_down;
float left_touch_x;
float left_touch_y;
bool right_touch_down;
float right_touch_x;
float right_touch_y;
} SDL_DriverSteamTriton_Context;
static bool IsProteusDongle(Uint16 product_id)
@ -247,17 +254,33 @@ static void HIDAPI_DriverSteamTriton_HandleState(SDL_HIDAPI_Device *device,
ctx->last_sensor_tick = pTritonReport->imu.timestamp;
}
SDL_SendJoystickTouchpad(timestamp, joystick, 0, 0,
pTritonReport->sPressureLeft > 0,
pTritonReport->sLeftPadX / 65536.0f + 0.5f,
-(float)pTritonReport->sLeftPadY / 65536.0f + 0.5f,
pTritonReport->sPressureLeft / 32768.0f);
bool left_touch_down = (pTritonReport->buttons & TRITON_LEFT_TOUCHPAD_TOUCH) ? true : false;
bool right_touch_down = (pTritonReport->buttons & TRITON_RIGHT_TOUCHPAD_TOUCH) ? true : false;
if (left_touch_down || ctx->left_touch_down) {
if (left_touch_down) {
ctx->left_touch_x = pTritonReport->sLeftPadX / 65536.0f + 0.5f;
ctx->left_touch_y = -(float)pTritonReport->sLeftPadY / 65536.0f + 0.5f;
SDL_SendJoystickTouchpad(timestamp, joystick, 1, 0,
pTritonReport->sPressureRight > 0,
pTritonReport->sRightPadX / 65536.0f + 0.5f,
-(float)pTritonReport->sRightPadY / 65536.0f + 0.5f,
pTritonReport->sPressureRight / 32768.0f);
}
SDL_SendJoystickTouchpad(timestamp, joystick, 0, 0,
left_touch_down,
ctx->left_touch_x,
ctx->left_touch_y,
pTritonReport->sPressureLeft / 32768.0f);
ctx->left_touch_down = left_touch_down;
}
if (right_touch_down || ctx->right_touch_down) {
if (right_touch_down) {
ctx->right_touch_x = pTritonReport->sRightPadX / 65536.0f + 0.5f;
ctx->right_touch_y = -(float)pTritonReport->sRightPadY / 65536.0f + 0.5f;
}
SDL_SendJoystickTouchpad(timestamp, joystick, 1, 0,
right_touch_down,
ctx->right_touch_x,
ctx->right_touch_y,
pTritonReport->sPressureRight / 32768.0f);
ctx->right_touch_down = right_touch_down;
}
}
static void HIDAPI_DriverSteamTriton_HandleBatteryStatus(SDL_HIDAPI_Device *device,