Sync controller mappings DB with SDL2 community repo

Synced with gabomdq/SDL_GameControllerDB@322aac4bb71d8c62ec7dcd4eb627a9d338b37684.

Also improve parser errors to allow identifying the problematic mappings.

1 files changed, 7 insertions, 6 deletions

diff --git a/core/input/input.cpp b/core/input/input.cpp
index 12028efc56..35ca8aefe6 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -1239,7 +1239,7 @@ void Input::parse_mapping(String p_mapping) {
 		String output = entry[idx].get_slice(":", 0).replace(" ", "");
 		String input = entry[idx].get_slice(":", 1).replace(" ", "");
 		ERR_CONTINUE_MSG(output.length() < 1 || input.length() < 2,
-				String(entry[idx] + "\nInvalid device mapping entry: " + entry[idx]));
+				vformat("Invalid device mapping entry \"%s\" in mapping:\n%s", entry[idx], p_mapping));
 
 		if (output == "platform" || output == "hint") {
 			continue;
@@ -1247,7 +1247,8 @@ void Input::parse_mapping(String p_mapping) {
 
 		JoyAxisRange output_range = FULL_AXIS;
 		if (output[0] == '+' || output[0] == '-') {
-			ERR_CONTINUE_MSG(output.length() < 2, String(entry[idx] + "\nInvalid output: " + entry[idx]));
+			ERR_CONTINUE_MSG(output.length() < 2,
+					vformat("Invalid output entry \"%s\" in mapping:\n%s", entry[idx], p_mapping));
 			if (output[0] == '+') {
 				output_range = POSITIVE_HALF_AXIS;
 			} else if (output[0] == '-') {
@@ -1273,9 +1274,9 @@ void Input::parse_mapping(String p_mapping) {
 		JoyButton output_button = _get_output_button(output);
 		JoyAxis output_axis = _get_output_axis(output);
 		ERR_CONTINUE_MSG(output_button == JOY_BUTTON_INVALID && output_axis == JOY_AXIS_INVALID,
-				String(entry[idx] + "\nUnrecognised output string: " + output));
+				vformat("Unrecognised output string \"%s\" in mapping:\n%s", output, p_mapping));
 		ERR_CONTINUE_MSG(output_button != JOY_BUTTON_INVALID && output_axis != JOY_AXIS_INVALID,
-				String("BUG: Output string matched both button and axis: " + output));
+				vformat("Output string \"%s\" matched both button and axis in mapping:\n%s", output, p_mapping));
 
 		JoyBinding binding;
 		if (output_button != JOY_BUTTON_INVALID) {
@@ -1300,13 +1301,13 @@ void Input::parse_mapping(String p_mapping) {
 				break;
 			case 'h':
 				ERR_CONTINUE_MSG(input.length() != 4 || input[2] != '.',
-						String(entry[idx] + "\nInvalid hat input: " + input));
+						vformat("Invalid had input \"%s\" in mapping:\n%s", input, p_mapping));
 				binding.inputType = TYPE_HAT;
 				binding.input.hat.hat = (HatDir)input.substr(1, 1).to_int();
 				binding.input.hat.hat_mask = static_cast<HatMask>(input.substr(3).to_int());
 				break;
 			default:
-				ERR_CONTINUE_MSG(true, String(entry[idx] + "\nUnrecognised input string: " + input));
+				ERR_CONTINUE_MSG(true, vformat("Unrecognized input string \"%s\" in mapping:\n%s", input, p_mapping));
 		}
 
 		mapping.bindings.push_back(binding);