mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Backed out Vita touch ID change for SDL2" 

This reverts commit a326ebce61.

It turns out that 0 is an invalid touch ID for SDL2, per the documentation for SDL_GetTouchDevice()

(cherry picked from commit 5a25183b39)
This commit is contained in:
Sam Lantinga 2025-01-01 09:03:24 -08:00
parent e38ea9df0c
commit 439bb5377c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/vita/SDL_vitatouch.c
View File

@ -70,8 +70,8 @@ void VITA_InitTouch(void)
}
// Support passing both front and back touch devices in events
SDL_AddTouch((SDL_TouchID)0, SDL_TOUCH_DEVICE_DIRECT, "Front");
SDL_AddTouch((SDL_TouchID)1, SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE, "Back");
SDL_AddTouch((SDL_TouchID)1, SDL_TOUCH_DEVICE_DIRECT, "Front");
SDL_AddTouch((SDL_TouchID)2, SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE, "Back");
}
void VITA_QuitTouch(void)
@ -123,7 +123,7 @@ void VITA_PollTouch(void)
// Skip if finger was already previously down
if (!finger_down) {
// Send an initial touch
SDL_SendTouch((SDL_TouchID)port,
SDL_SendTouch((SDL_TouchID)(port + 1),
finger_id,
Vita_Window,
SDL_TRUE,
@ -133,7 +133,7 @@ void VITA_PollTouch(void)
}
// Always send the motion
SDL_SendTouchMotion((SDL_TouchID)port,
SDL_SendTouchMotion((SDL_TouchID)(port + 1),
finger_id,
Vita_Window,
x,
@ -160,7 +160,7 @@ void VITA_PollTouch(void)
VITA_ConvertTouchXYToSDLXY(&x, &y, touch_old[port].report[i].x, touch_old[port].report[i].y, port);
finger_id = (SDL_FingerID)touch_old[port].report[i].id;
// Finger released from screen
SDL_SendTouch((SDL_TouchID)port,
SDL_SendTouch((SDL_TouchID)(port + 1),
finger_id,
Vita_Window,
SDL_FALSE,