[Scummvm-git-logs] scummvm master -> 5de0a8b3a072e7ea09bc566ba33f0c08e3a5eff1

[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:
5de0a8b3a0 PSP2: Enable rear touch only when Touchpad Mouse Mode is on


Commit: 5de0a8b3a072e7ea09bc566ba33f0c08e3a5eff1
    https://github.com/scummvm/scummvm/commit/5de0a8b3a072e7ea09bc566ba33f0c08e3a5eff1
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2018-01-24T20:06:46-06:00

Commit Message:
PSP2: Enable rear touch only when Touchpad Mouse Mode is on

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 cc72b01..b2b9df7 100644
--- a/backends/events/psp2sdl/psp2sdl-events.cpp
+++ b/backends/events/psp2sdl/psp2sdl-events.cpp
@@ -59,16 +59,21 @@ void PSP2EventSource::preprocessEvents(SDL_Event *event) {
 		// front (0) or back (1) panel
 		SDL_TouchID port = event->tfinger.touchId;
 		if (port < SCE_TOUCH_PORT_MAX_NUM && port >= 0) {
-			switch (event->type) {
-			case SDL_FINGERDOWN:
-				preprocessFingerDown(event);
-				break;
-			case SDL_FINGERUP:
-				preprocessFingerUp(event);
-				break;
-			case SDL_FINGERMOTION:
-				preprocessFingerMotion(event);
-				break;
+			// 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
+			// 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) {
+				case SDL_FINGERDOWN:
+					preprocessFingerDown(event);
+					break;
+				case SDL_FINGERUP:
+					preprocessFingerUp(event);
+					break;
+				case SDL_FINGERMOTION:
+					preprocessFingerMotion(event);
+					break;
+				}
 			}
 		}
 	}