[Scummvm-git-logs] scummvm master -> 3cc12c3da2a1502876284c9b4801432954fdcb09

rsn8887 rsn8887 at users.noreply.github.com
Thu Jan 25 18:58:02 CET 2018


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:
3cc12c3da2 PSP2: Always use direct touch on front touch panel


Commit: 3cc12c3da2a1502876284c9b4801432954fdcb09
    https://github.com/scummvm/scummvm/commit/3cc12c3da2a1502876284c9b4801432954fdcb09
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2018-01-25T11:57:31-06:00

Commit Message:
PSP2: Always use direct touch on front touch panel

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


diff --git a/backends/events/psp2sdl/psp2sdl-events.cpp b/backends/events/psp2sdl/psp2sdl-events.cpp
index b2b9df7..3f447b7 100644
--- a/backends/events/psp2sdl/psp2sdl-events.cpp
+++ b/backends/events/psp2sdl/psp2sdl-events.cpp
@@ -60,7 +60,7 @@ void PSP2EventSource::preprocessEvents(SDL_Event *event) {
 		SDL_TouchID port = event->tfinger.touchId;
 		if (port < SCE_TOUCH_PORT_MAX_NUM && port >= 0) {
 			// touchpad_mouse_mode off: use only front panel for direct touch control of pointer
-			// touchpad_mouse_mode on: use both front and rear for indirect touch control
+			// touchpad_mouse_mode on: also enable rear touch with indirect touch control
 			// where the finger can be somewhere else than the pointer and still move it
 			if (port == 0 || ConfMan.getBool("touchpad_mouse_mode")) {
 				switch (event->type) {
@@ -119,7 +119,7 @@ void PSP2EventSource::preprocessFingerUp(SDL_Event *event) {
 	int x = _km.x / MULTIPLIER;
 	int y = _km.y / MULTIPLIER;
 
-	if (!ConfMan.getBool("touchpad_mouse_mode") && port == 0) {
+	if (port == 0) {
 		convertTouchXYToGameXY(event->tfinger.x, event->tfinger.y, &x, &y);
 	}
 
@@ -170,7 +170,7 @@ void PSP2EventSource::preprocessFingerMotion(SDL_Event *event) {
 		int x = _km.x / MULTIPLIER;
 		int y = _km.y / MULTIPLIER;
 
-		if (!ConfMan.getBool("touchpad_mouse_mode") && port == 0) {
+		if (port == 0) {
 			convertTouchXYToGameXY(event->tfinger.x, event->tfinger.y, &x, &y);
 		} else {
 			// for relative mode, use the pointer speed setting





More information about the Scummvm-git-logs mailing list