Merge bac526ce72 into fec4428ebf

include/input_mappings.hpp

@@ -1,5 +1,10 @@
 #pragma once
 
+#include <filesystem>
+#include <fstream>
+#include <map>
+#include <optional>
+#include <toml.hpp>
 #include <unordered_map>
 
 #include "helpers.hpp"
@@ -15,8 +20,96 @@ struct InputMappings {
 	}
 
 	void setMapping(Scancode scancode, u32 key) { container[scancode] = key; }
+
+	void serialize(const std::filesystem::path& path, const std::string& frontend) const {
+		toml::basic_value<toml::preserve_comments, std::map> data;
+
+		std::error_code error;
+		if (std::filesystem::exists(path, error)) {
+			try {
+				data = toml::parse<toml::preserve_comments, std::map>(path);
+			} catch (const std::exception& ex) {
+				Helpers::warn("Exception trying to parse mappings file. Exception: %s\n", ex.what());
+				return;
+			}
+		} else {
+			if (error) {
+				Helpers::warn("Filesystem error accessing %s (error: %s)\n", path.string().c_str(), error.message().c_str());
+			}
+			printf("Saving new mappings file %s\n", path.string().c_str());
+		}
+
+		data["Metadata"]["Name"] = name.empty() ? "Unnamed Mappings" : name;
+		data["Metadata"]["Device"] = device.empty() ? "Unknown Device" : device;
+		data["Metadata"]["Frontend"] = frontend;
+
+		data["Mappings"] = toml::table{};
+
+		for (const auto& [scancode, key] : container) {
+			if (!data["Mappings"].contains(HID::Keys::keyToName(key))) {
+				data["Mappings"][HID::Keys::keyToName(key)] = toml::array{};
+			}
+
+			data["Mappings"][HID::Keys::keyToName(key)].push_back(scancodeToName(scancode));
+		}
+
+		std::ofstream file(path, std::ios::out);
+		file << data;
+	}
+
+	static std::optional<InputMappings> deserialize(const std::filesystem::path& path, const std::string& wantFrontend) {
+		toml::basic_value<toml::preserve_comments, std::map> data;
+		std::error_code error;
+		
+		if (!std::filesystem::exists(path, error)) {
+			if (error) {
+				Helpers::warn("Filesystem error accessing %s (error: %s)\n", path.string().c_str(), error.message().c_str());
+			}
+			
+			return std::nullopt;
+		}
+
+		InputMappings mappings;
+
+		try {
+			data = toml::parse<toml::preserve_comments, std::map>(path);
+
+			const auto metadata = toml::find(data, "Metadata");
+			mappings.name = toml::find_or<std::string>(metadata, "Name", "Unnamed Mappings");
+			mappings.device = toml::find_or<std::string>(metadata, "Device", "Unknown Device");
+			
+			std::string haveFrontend = toml::find_or<std::string>(metadata, "Frontend", "Unknown Frontend");
+
+			bool equal = std::equal(haveFrontend.begin(), haveFrontend.end(), wantFrontend.begin(), wantFrontend.end(), [](char a, char b) {
+				return std::tolower(a) == std::tolower(b);
+			});
+
+			if (equal) {
+				Helpers::warn("Mappings file %s was created for frontend %s, but we are using frontend %s\n", path.string().c_str(), haveFrontend.c_str(), wantFrontend.c_str());
+				return std::nullopt;
+			}
+		} catch (const std::exception& ex) {
+			Helpers::warn("Exception trying to parse config file. Exception: %s\n", ex.what());
+			
+			return std::nullopt;
+		}
+
+		const auto& mappingsTable = toml::find_or<toml::table>(data, "Mappings", toml::table{});
+		for (const auto& [key, scancodes] : mappingsTable) {
+			for (const auto& scancode : scancodes.as_array()) {
+				mappings.setMapping(nameToScancode(scancode.as_string()), HID::Keys::nameToKey(key));
+			}
+		}
+
+		return mappings;
+	}
+
 	static InputMappings defaultKeyboardMappings();
+	static std::string scancodeToName(Scancode scancode);
+	static Scancode nameToScancode(const std::string& name);
 
   private:
 	Container container;
+	std::string name;
+	std::string device;
 };

include/services/hid.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include <array>
 #include <optional>
+#include <string>
 
 #include "helpers.hpp"
 #include "kernel_types.hpp"
@@ -32,7 +33,10 @@ namespace HID::Keys {
 		CirclePadUp = 1 << 30,     // Y >= 41
 		CirclePadDown = 1u << 31   // Y <= -41
 	};
-}
+
+	const char* keyToName(u32 key);
+	u32 nameToKey(std::string name);
+}  // namespace HID::Keys
 
 // Circular dependency because we need HID to spawn events
 class Kernel;

src/core/services/hid.cpp

@@ -1,7 +1,62 @@
 #include "services/hid.hpp"
+
+#include <map>
+#include <unordered_map>
+
 #include "ipc.hpp"
 #include "kernel.hpp"
-#include <bit>
+
+namespace HID::Keys {
+	const char* keyToName(u32 key) {
+		static std::map<u32, const char*> keyMap = {
+			{A, "A"},
+			{B, "B"},
+			{Select, "Select"},
+			{Start, "Start"},
+			{Right, "Right"},
+			{Left, "Left"},
+			{Up, "Up"},
+			{Down, "Down"},
+			{R, "R"},
+			{L, "L"},
+			{X, "X"},
+			{Y, "Y"},
+			{CirclePadRight, "CirclePad Right"},
+			{CirclePadLeft, "CirclePad Left"},
+			{CirclePadUp, "CirclePad Up"},
+			{CirclePadDown, "CirclePad Down"},
+		};
+
+		auto it = keyMap.find(key);
+		return it != keyMap.end() ? it->second : "Unknown key";
+	}
+
+	u32 nameToKey(std::string name) {
+		static std::unordered_map<std::string, u32> keyMap = {
+			{"a", A},
+			{"b", B},
+			{"select", Select},
+			{"start", Start},
+			{"right", Right},
+			{"left", Left},
+			{"up", Up},
+			{"down", Down},
+			{"r", R},
+			{"l", L},
+			{"x", X},
+			{"y", Y},
+			{"circlepad right", CirclePadRight},
+			{"circlepad left", CirclePadLeft},
+			{"circlepad up", CirclePadUp},
+			{"circlepad down", CirclePadDown},
+		};
+
+		std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+
+		auto it = keyMap.find(name);
+		return it != keyMap.end() ? it->second : HID::Keys::Null;
+	}
+}  // namespace HID::Keys
 
 namespace HIDCommands {
 	enum : u32 {

src/panda_qt/mappings.cpp

@@ -1,4 +1,7 @@
 #include <QKeyEvent>
+#include <string>
+
+#include "input_mappings.hpp"
 
 #include "input_mappings.hpp"
 
@@ -22,4 +25,8 @@ InputMappings InputMappings::defaultKeyboardMappings() {
 	mappings.setMapping(Qt::Key_A, HID::Keys::CirclePadLeft);
 
 	return mappings;
-}
+}
+
+std::string InputMappings::scancodeToName(Scancode scancode) { return QKeySequence(scancode).toString().toStdString(); }
+
+InputMappings::Scancode InputMappings::nameToScancode(const std::string& name) { return QKeySequence(QString::fromStdString(name))[0].key(); }

src/panda_sdl/mappings.cpp

@@ -1,7 +1,9 @@
-#include "input_mappings.hpp"
-
 #include <SDL.h>
 
+#include <string>
+
+#include "input_mappings.hpp"
+
 InputMappings InputMappings::defaultKeyboardMappings() {
 	InputMappings mappings;
 	mappings.setMapping(SDLK_l, HID::Keys::A);
@@ -22,4 +24,8 @@ InputMappings InputMappings::defaultKeyboardMappings() {
 	mappings.setMapping(SDLK_a, HID::Keys::CirclePadLeft);
 
 	return mappings;
-}
+}
+
+std::string InputMappings::scancodeToName(Scancode scancode) { return SDL_GetKeyName(scancode); }
+
+InputMappings::Scancode InputMappings::nameToScancode(const std::string& name) { return SDL_GetKeyFromName(name.c_str()); }