Skip to content

Commit

Permalink
Revert "Backed out Vita touch ID change for SDL2"
Browse files Browse the repository at this point in the history
This reverts commit a326ebc.

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

(cherry picked from commit 5a25183)
  • Loading branch information
slouken committed Jan 1, 2025
1 parent e38ea9d commit 439bb53
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/video/vita/SDL_vitatouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 439bb53

Please sign in to comment.