[Scummvm-git-logs] scummvm master -> 91b44c8ee32833c9559d1738961fc016d8b620f1

[rsn8887]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
91b44c8ee3 VITA: Fix front touch with latest SDL2


Commit: 91b44c8ee32833c9559d1738961fc016d8b620f1
    https://github.com/scummvm/scummvm/commit/91b44c8ee32833c9559d1738961fc016d8b620f1
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2024-11-09T22:57:05-06:00

Commit Message:
VITA: Fix front touch with latest SDL2

Changed paths:
    backends/events/psp2sdl/psp2sdl-events.cpp
    backends/events/sdl/sdl-events.cpp


diff --git a/backends/events/psp2sdl/psp2sdl-events.cpp b/backends/events/psp2sdl/psp2sdl-events.cpp
index b7f2ebc2662..1d039f364b5 100644
--- a/backends/events/psp2sdl/psp2sdl-events.cpp
+++ b/backends/events/psp2sdl/psp2sdl-events.cpp
@@ -46,11 +46,11 @@ void PSP2EventSource::preprocessEvents(SDL_Event *event) {
 }
 
 bool PSP2EventSource::isTouchPortTouchpadMode(SDL_TouchID port) {
-	return port != 0 || ConfMan.getBool("frontpanel_touchpad_mode");
+	return port != 1 || ConfMan.getBool("frontpanel_touchpad_mode");
 }
 
 bool PSP2EventSource::isTouchPortActive(SDL_TouchID port) {
-	return port == 0 || ConfMan.getBool("touchpad_mouse_mode");
+	return port == 1 || ConfMan.getBool("touchpad_mouse_mode");
 }
 
 #endif
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 183ceee511c..3cd124e6dfa 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -417,7 +417,7 @@ Common::KeyCode SdlEventSource::SDLToOSystemKeycode(const SDL_Keycode key) {
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 void SdlEventSource::preprocessFingerDown(SDL_Event *event) {
-	// front (0) or back (1) panel
+	// front (1) or back (2) panel
 	SDL_TouchID port = event->tfinger.touchId;
 	// id (for multitouch)
 	SDL_FingerID id = event->tfinger.fingerId;
@@ -501,7 +501,7 @@ void SdlEventSource::finishSimulatedMouseClicks() {
 }
 
 bool SdlEventSource::preprocessFingerUp(SDL_Event *event, Common::Event *ev) {
-	// front (0) or back (1) panel
+	// front (1) or back (2) panel
 	SDL_TouchID port = event->tfinger.touchId;
 	// id (for multitouch)
 	SDL_FingerID id = event->tfinger.fingerId;
@@ -584,7 +584,7 @@ bool SdlEventSource::preprocessFingerUp(SDL_Event *event, Common::Event *ev) {
 }
 
 void SdlEventSource::preprocessFingerMotion(SDL_Event *event) {
-	// front (0) or back (1) panel
+	// front (1) or back (2) panel
 	SDL_TouchID port = event->tfinger.touchId;
 	// id (for multitouch)
 	SDL_FingerID id = event->tfinger.fingerId;