Merge pull request #19983 from hrydgard/touch-gliding

Touch: Implement "Touch gliding" (keep all dragged/touched buttons pressed until touch release)

Author: hrydgard

Common/Input/InputState.h

@@ -145,6 +145,8 @@ enum {
 	TOUCH_TOOL_STYLUS = 2 << 10,
 	TOUCH_TOOL_MOUSE = 3 << 10,
 	TOUCH_TOOL_ERASER = 4 << 10,
+
+	TOUCH_MAX_POINTERS = 10,
 };
 
 // Used for asynchronous touch input.

Core/Config.cpp

@@ -284,6 +284,7 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("SwipeSmoothing", &g_Config.fSwipeSmoothing, 0.3f, CfgFlag::PER_GAME),
 	ConfigSetting("DoubleTapGesture", &g_Config.iDoubleTapGesture, 0, CfgFlag::PER_GAME),
 	ConfigSetting("GestureControlEnabled", &g_Config.bGestureControlEnabled, false, CfgFlag::PER_GAME),
+	ConfigSetting("TouchGliding", &g_Config.bTouchGliding, false, CfgFlag::PER_GAME),
 
 	// "default" means let emulator decide, "" means disable.
 	ConfigSetting("ReportingHost", &g_Config.sReportHost, "default", CfgFlag::DEFAULT),

Core/Config.h

@@ -361,7 +361,9 @@ struct Config {
 
 	// Disable diagonals
 	bool bDisableDpadDiagonals;
+
 	bool bGamepadOnlyFocused;
+
 	// Control Style
 	int iTouchButtonStyle;
 	int iTouchButtonOpacity;
@@ -377,6 +379,9 @@ struct Config {
 	// Sticky D-pad (can't glide off it)
 	bool bStickyTouchDPad;
 
+	// Touch gliding (see #14490)
+	bool bTouchGliding;
+
 	//space between PSP buttons
 	//the PSP button's center (triangle, circle, square, cross)
 	ConfigTouchPos touchActionButtonCenter;

UI/EmuScreen.cpp

@@ -1080,6 +1080,9 @@ bool EmuScreen::key(const KeyInput &key) {
 void EmuScreen::touch(const TouchInput &touch) {
 	if (g_Config.bShowImDebugger && imguiInited_) {
 		ImGui_ImplPlatform_TouchEvent(touch);
+		if (!ImGui::GetIO().WantCaptureMouse) {
+			UIScreen::touch(touch);
+		}
 	} else {
 		UIScreen::touch(touch);
 	}

UI/GameSettingsScreen.cpp

@@ -801,6 +801,8 @@ void GameSettingsScreen::CreateControlsSettings(UI::ViewGroup *controlsSettings)
 		autoHide->SetFormat(di->T("%d seconds"));
 		autoHide->SetZeroLabel(co->T("Off"));
 
+		controlsSettings->Add(new CheckBox(&g_Config.bTouchGliding, co->T("Touch gliding")));
+
 		// Hide stick background, useful when increasing the size
 		CheckBox *hideStickBackground = controlsSettings->Add(new CheckBox(&g_Config.bHideStickBackground, co->T("Hide touch analog stick background circle")));
 		hideStickBackground->SetEnabledPtr(&g_Config.bShowTouchControls);

UI/GamepadEmu.cpp

@@ -42,6 +42,8 @@ static uint32_t analogPointerMask = 0;
 static float g_gamepadOpacity;
 static double g_lastTouch;
 
+MultiTouchButton *primaryButton[TOUCH_MAX_POINTERS]{};
+
 void GamepadUpdateOpacity(float force) {
 	if (force >= 0.0f) {
 		g_gamepadOpacity = force;
@@ -100,23 +102,36 @@ void MultiTouchButton::GetContentDimensions(const UIContext &dc, float &w, float
 	}
 }
 
+bool MultiTouchButton::CanGlide() const {
+	return g_Config.bTouchGliding;
+}
+
 bool MultiTouchButton::Touch(const TouchInput &input) {
+	_dbg_assert_(input.id >= 0 && input.id < TOUCH_MAX_POINTERS);
+
 	bool retval = GamepadView::Touch(input);
 	if ((input.flags & TOUCH_DOWN) && bounds_.Contains(input.x, input.y)) {
 		pointerDownMask_ |= 1 << input.id;
 		usedPointerMask |= 1 << input.id;
+		if (CanGlide() && !primaryButton[input.id])
+			primaryButton[input.id] = this;
 	}
 	if (input.flags & TOUCH_MOVE) {
 		if (!(input.flags & TOUCH_MOUSE) || input.buttons) {
-			if (bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id)))
+			if (bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id))) {
+				if (CanGlide() && !primaryButton[input.id]) {
+					primaryButton[input.id] = this;
+				}
 				pointerDownMask_ |= 1 << input.id;
-			else
+			} else if (primaryButton[input.id] != this) {
 				pointerDownMask_ &= ~(1 << input.id);
+			}
 		}
 	}
 	if (input.flags & TOUCH_UP) {
 		pointerDownMask_ &= ~(1 << input.id);
 		usedPointerMask &= ~(1 << input.id);
+		primaryButton[input.id] = nullptr;
 	}
 	if (input.flags & TOUCH_RELEASE_ALL) {
 		pointerDownMask_ = 0;

UI/GamepadEmu.h

@@ -54,6 +54,8 @@ class MultiTouchButton : public GamepadView {
 	MultiTouchButton *SetAngle(float angle) { angle_ = angle; bgAngle_ = angle; return this; }
 	MultiTouchButton *SetAngle(float angle, float bgAngle) { angle_ = angle; bgAngle_ = bgAngle; return this; }
 
+	bool CanGlide() const;
+
 protected:
 	uint32_t pointerDownMask_ = 0;
 	float scale_;