Merge pull request #18128 from hrydgard/assorted-fixes-3

Restore touch D-Pad behavior

Core/ControlMapper.cpp

@@ -251,6 +251,7 @@ void ControlMapper::SwapMappingIfEnabled(uint32_t *vkey) {
 }
 
 // Can only be called from Key or Axis.
+// mutex_ should be locked.
 // TODO: We should probably make a batched version of this.
 bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double now) {
 	// Instead of taking an input key and finding what it outputs, we loop through the OUTPUTS and

UI/GamepadEmu.cpp

@@ -351,22 +351,23 @@ void PSPDpad::ProcessTouch(float x, float y, bool down) {
 	}
 
 	int lastDown = down_;
+	int pressed = ctrlMask & ~lastDown;
+	int released = (~ctrlMask) & lastDown;
 	down_ = ctrlMask;
-	__CtrlUpdateButtons(ctrlMask, CTRL_LEFT | CTRL_RIGHT | CTRL_UP | CTRL_DOWN);
-
-	if (g_Config.bHapticFeedback) {
-		int pressed = down_ & ~lastDown;
-		static const int dir[4] = { CTRL_RIGHT, CTRL_DOWN, CTRL_LEFT, CTRL_UP };
-		bool vibrate = false;
-		for (int i = 0; i < 4; i++) {
-			if (pressed & dir[i]) {
-				vibrate = true;
-			}
+	bool vibrate = false;
+	static const int dir[4] = { CTRL_RIGHT, CTRL_DOWN, CTRL_LEFT, CTRL_UP };
+	for (int i = 0; i < 4; i++) {
+		if (pressed & dir[i]) {
+			vibrate = true;
+			__CtrlUpdateButtons(dir[i], 0);
 		}
-		if (vibrate) {
-			System_Vibrate(HAPTIC_VIRTUAL_KEY);
+		if (released & dir[i]) {
+			__CtrlUpdateButtons(0, dir[i]);
 		}
 	}
+	if (vibrate && g_Config.bHapticFeedback) {
+		System_Vibrate(HAPTIC_VIRTUAL_KEY);
+	}
 }
 
 void PSPDpad::Draw(UIContext &dc) {

Windows/RawInput.cpp

@@ -275,8 +275,7 @@ namespace WindowsRawInput {
 
 			if (key.keyCode) {
 				NativeKey(key);
-
-				auto keyDown = std::find(keyboardKeysDown.begin(), keyboardKeysDown.end(), key.keyCode);
+				auto keyDown = keyboardKeysDown.find(key.keyCode);
 				if (keyDown != keyboardKeysDown.end())
 					keyboardKeysDown.erase(keyDown);
 			}