Add support for overriding key input profiles per content and misc tw…

…eaks * Imagine: Improve find/find_if utility functions in algorithm.h * Imagine: Clean up old/unused iOS code and add various wrapper functions for newer SDK headers * EmuFramework: Add Input Overrides menu to SystemActionsView * EmuFramework: Add EmuSystem::canRenderRGB565 boolean for systems that only render to RGBA8888 like Saturn.emu * EmuFramework: Add utility functions for reading/writing resizable containers * EmuFramework: Remove legacy code for reading recent content entries used in older app versions * EmuFramework: Various code clean up
Rakashazi · Jul 4, 2024 · 5060e6d · 5060e6d
1 parent 9c09335
commit 5060e6d
Show file tree

Hide file tree

Showing 53 changed files with 1,011 additions and 579 deletions.
diff --git a/C64.emu/src/main/EmuMenuViews.cc b/C64.emu/src/main/EmuMenuViews.cc
@@ -157,7 +157,7 @@ class CustomVideoOptionView : public VideoOptionView, public MainAppHelper
 	MultiChoiceMenuItem defaultPalette
 	{
 		"Default Palette", attachParams(),
-		[this]()
+		[this]() -> int
 		{
 			if(system().defaultPaletteName.empty())
 				return 0;
@@ -1004,7 +1004,7 @@ class MachineOptionView : public TableView, public MainAppHelper
 	MultiChoiceMenuItem palette
 	{
 		"Palette", attachParams(),
-		[this]()
+		[this]() -> int
 		{
 			if(!system().usingExternalPalette())
 				return 0;

diff --git a/EmuFramework/build.mk b/EmuFramework/build.mk
@@ -38,6 +38,7 @@ gui/FilePicker.cc \
 gui/FrameTimingView.cc \
 gui/GUIOptionView.cc \
 gui/InputManagerView.cc \
+gui/InputOverridesView.cc \
 gui/LoadProgressView.cc \
 gui/MainMenuView.cc \
 gui/PlaceVControlsView.cc \

diff --git a/EmuFramework/include/emuframework/EmuApp.hh b/EmuFramework/include/emuframework/EmuApp.hh
@@ -44,7 +44,6 @@
 #include <imagine/util/used.hh>
 #include <imagine/util/enum.hh>
 #include <cstring>
-#include <optional>
 #include <span>
 #include <string>
 
@@ -118,6 +117,20 @@ WISE_ENUM_CLASS((CPUAffinityMode, uint8_t),
 	Auto, Any, Manual
 );
 
+struct DrawableConfig
+{
+	Property<PixelFormat, CFGKEY_WINDOW_PIXEL_FORMAT> pixelFormat;
+	Property<Gfx::ColorSpace, CFGKEY_VIDEO_COLOR_SPACE> colorSpace;
+
+	constexpr DrawableConfig() = default;
+	constexpr DrawableConfig(Gfx::DrawableConfig c)
+	{
+		pixelFormat.setUnchecked(c.pixelFormat);
+		colorSpace.setUnchecked(c.colorSpace);
+	}
+	constexpr operator Gfx::DrawableConfig() const { return {.pixelFormat = pixelFormat, .colorSpace = colorSpace}; }
+};
+
 constexpr float menuVideoBrightnessScale = .25f;
 
 class EmuApp : public IG::Application
@@ -203,6 +216,7 @@ public:
 	void saveSessionOptions();
 	void loadSessionOptions();
 	bool hasSavedSessionOptions();
+	void resetSessionOptions();
 	void deleteSessionOptions();
 	void syncEmulationThread();
 	void startAudio();
@@ -236,8 +250,6 @@ public:
 	void setMogaManagerActive(bool on, bool notify);
 	void closeBluetoothConnections();
 	ViewAttachParams attachParams();
-	auto &customKeyConfigList() { return inputManager.customKeyConfigs; };
-	auto &savedInputDeviceList() { return inputManager.savedInputDevs; };
 	IG::Viewport makeViewport(const Window &win) const;
 	void setEmuViewOnExtraWindow(bool on, IG::Screen &);
 	void record(FrameTimeStatEvent, SteadyClockTimePoint t = {});
@@ -256,7 +268,6 @@ public:
 
 	// Video Options
 	bool setWindowDrawableConfig(Gfx::DrawableConfig);
-	Gfx::DrawableConfig windowDrawableConfig() const { return windowDrawableConf; }
 	IG::PixelFormat windowPixelFormat() const;
 	void setRenderPixelFormat(IG::PixelFormat);
 	bool setVideoAspectRatio(float val);
@@ -330,6 +341,25 @@ public:
 		postMessage(secs, true, IG_forward(msg));
 	}
 
+	void forEachKeyConfig(Input::Map map, auto&& func) const
+	{
+		for(auto& confPtr : inputManager.customKeyConfigs)
+		{
+			auto& conf = *confPtr;
+			if(conf.desc().map == map)
+			{
+				func(conf);
+			}
+		}
+		for(const auto& conf : defaultKeyConfigs())
+		{
+			if(conf.map == map)
+			{
+				func(conf);
+			}
+		}
+	}
+
 public:
 	IG::FontManager fontManager;
 	mutable Gfx::Renderer renderer;
@@ -352,10 +382,10 @@ protected:
 	[[no_unique_address]] PerformanceHintManager perfHintManager;
 	[[no_unique_address]] PerformanceHintSession perfHintSession;
 	ConditionalMember<MOGA_INPUT, std::unique_ptr<Input::MogaManager>> mogaManagerPtr;
-	Gfx::DrawableConfig windowDrawableConf;
 	ConditionalMember<Config::TRANSLUCENT_SYSTEM_UI, bool> layoutBehindSystemUI{};
 	bool enableBlankFrameInsertion{};
 public:
+	DrawableConfig windowDrawableConfig;
 	BluetoothAdapter bluetoothAdapter;
 	RecentContent recentContent;
 	FS::PathString contentSearchPath;
@@ -419,7 +449,7 @@ public:
 protected:
 	struct ConfigParams
 	{
-		Gfx::DrawableConfig windowDrawableConf{};
+		Gfx::DrawableConfig windowDrawableConf;
 	};
 
 	void onMainWindowCreated(ViewAttachParams, const Input::Event &);
@@ -428,8 +458,6 @@ protected:
 	void saveConfigFile(FileIO &);
 	void initOptions(IG::ApplicationContext);
 	void applyRenderPixelFormat();
-	std::optional<IG::PixelFormat> windowDrawablePixelFormatOption() const;
-	std::optional<Gfx::ColorSpace> windowDrawableColorSpaceOption() const;
 	FS::PathString sessionConfigPath();
 	void loadSystemOptions();
 	void saveSystemOptions();

diff --git a/EmuFramework/include/emuframework/EmuInput.hh b/EmuFramework/include/emuframework/EmuInput.hh
@@ -34,6 +34,9 @@ using namespace IG;
 class InputDeviceConfig;
 struct InputAction;
 
+constexpr int8_t playerIndexMulti = -1;
+constexpr int8_t playerIndexUnset = -2;
+
 struct KeyCategory
 {
 	std::string_view name;
@@ -146,12 +149,27 @@ struct InputDeviceSavedConfig
 	ConditionalMember<hasICadeInput, bool> iCadeMode{};
 	ConditionalMember<Config::envIsAndroid, bool> handleUnboundEvents{};
 
-	bool operator ==(InputDeviceSavedConfig const& rhs) const
+	constexpr bool operator ==(InputDeviceSavedConfig const& rhs) const
+	{
+		return enumId == rhs.enumId && name == rhs.name;
+	}
+
+	bool matchesDevice(const Input::Device& dev) const;
+};
+
+struct InputDeviceSavedSessionConfig
+{
+	std::string keyConfName;
+	std::string name;
+	uint8_t enumId{};
+	int8_t player{};
+
+	constexpr bool operator ==(InputDeviceSavedSessionConfig const& rhs) const
 	{
 		return enumId == rhs.enumId && name == rhs.name;
 	}
 
-	bool matchesDevice(const Input::Device &dev) const;
+	bool matchesDevice(const Input::Device& dev) const;
 };
 
 struct SystemKeyInputFlags
@@ -164,7 +182,8 @@ class InputManager
 public:
 	VController vController;
 	std::vector<std::unique_ptr<KeyConfig>> customKeyConfigs;
-	std::vector<std::unique_ptr<InputDeviceSavedConfig>> savedInputDevs;
+	std::vector<std::unique_ptr<InputDeviceSavedConfig>> savedDevConfigs;
+	std::vector<std::unique_ptr<InputDeviceSavedSessionConfig>> savedSessionDevConfigs;
 	TurboInput turboActions;
 	ToggleInput toggleInput;
 	DelegateFunc<void ()> onUpdateDevices;
@@ -179,6 +198,13 @@ public:
 	KeyConfig *customKeyConfig(std::string_view name, const Input::Device &) const;
 	KeyConfigDesc keyConfig(std::string_view name, const Input::Device &) const;
 	void deleteKeyProfile(ApplicationContext, KeyConfig *);
+	void deleteDeviceSavedConfig(ApplicationContext, const InputDeviceSavedConfig&);
+	void deleteDeviceSavedConfig(ApplicationContext, const InputDeviceSavedSessionConfig&);
+	void resetSessionOptions(ApplicationContext);
+	bool readSessionConfig(ApplicationContext, MapIO&, uint16_t);
+	void writeSessionConfig(FileIO &io) const;
+	bool readInputDeviceSessionConfigs(ApplicationContext, MapIO&);
+	void writeInputDeviceSessionConfigs(FileIO&) const;
 	void writeCustomKeyConfigs(FileIO &) const;
 	void writeSavedInputDevices(ApplicationContext, FileIO &) const;
 	bool readCustomKeyConfig(MapIO &);

diff --git a/EmuFramework/include/emuframework/EmuOptions.hh b/EmuFramework/include/emuframework/EmuOptions.hh
@@ -83,7 +83,7 @@ enum { CFGKEY_SOUND = 0, CFGKEY_TOUCH_CONTROL_DISPLAY = 1,
 	CFGKEY_INPUT_KEY_CONFIGS_V2 = 114, CFGKEY_VCONTROLLER_HIGHLIGHT_PUSHED_BUTTONS = 115,
 	CFGKEY_RECENT_CONTENT_V2 = 116, CFGKEY_MAX_RECENT_CONTENT = 117,
 	CFGKEY_REWIND_STATES = 118, CFGKEY_REWIND_TIMER_SECS = 119,
-	CFGKEY_FRAME_CLOCK = 120,
+	CFGKEY_FRAME_CLOCK = 120, CFGKEY_INPUT_DEVICE_CONTENT_CONFIGS = 121,
 	// 256+ is reserved
 };
 

diff --git a/EmuFramework/include/emuframework/EmuSystem.hh b/EmuFramework/include/emuframework/EmuSystem.hh
@@ -185,6 +185,7 @@ public:
 	static bool inputHasKeyboard;
 	static bool hasBundledGames;
 	static bool hasPALVideoSystem;
+	static bool canRenderRGB565;
 	static bool canRenderRGBA8888;
 	static bool hasResetModes;
 	static bool handlesArchiveFiles;
@@ -233,6 +234,7 @@ public:
 	WSize multiresVideoBaseSize() const;
 	double videoAspectRatioScale() const;
 	bool onVideoRenderFormatChange(EmuVideo &, PixelFormat);
+	static bool canRenderMultipleFormats() {return canRenderRGBA8888 && canRenderRGB565;}
 	void loadBackupMemory(EmuApp &);
 	void onFlushBackupMemory(EmuApp &, BackupMemoryDirtyFlags);
 	WallClockTimePoint backupMemoryLastWriteTime(const EmuApp &) const;

diff --git a/EmuFramework/include/emuframework/Option.hh b/EmuFramework/include/emuframework/Option.hh
@@ -204,4 +204,30 @@ inline void writeStringOptionValueIfNotDefault(Writable auto &io, uint16_t key,
 	writeStringOptionValueAllowEmpty(io, key, s);
 }
 
+template<class Size>
+inline size_t sizedDataBytes(const ResizableContainer auto& c)
+{
+	size_t bytes = sizeof(Size); // store array length
+	Size size = std::min(c.size(), size_t(std::numeric_limits<Size>::max()));
+	bytes += size * sizeof(c[0]);
+	return bytes;
+}
+
+template<class Size>
+inline void writeSizedData(Writable auto& io, const ResizableContainer auto& c)
+{
+	Size size = std::min(c.size(), size_t(std::numeric_limits<Size>::max()));
+	io.put(size);
+	if(size)
+		io.write(c.data(), size);
+}
+
+template<class Size>
+inline ssize_t readSizedData(Readable auto& io, ResizableContainer auto& c)
+{
+	auto size = io.template get<Size>();
+	return io.readSized(c, size);
+}
+
+
 }
diff --git a/EmuFramework/include/emuframework/RecentContent.hh b/EmuFramework/include/emuframework/RecentContent.hh
@@ -55,7 +55,6 @@ public:
 	void clear() { recentContentList.clear(); }
 	void writeConfig(FileIO &) const;
 	bool readConfig(MapIO &, unsigned key, const EmuSystem &);
-	bool readLegacyConfig(MapIO &, const EmuSystem &);
 
 private:
 	std::vector<RecentContentInfo> recentContentList;

diff --git a/EmuFramework/include/emuframework/SystemActionsView.hh b/EmuFramework/include/emuframework/SystemActionsView.hh
@@ -32,7 +32,7 @@ public:
 	void onShow() override;
 	void loadStandardItems();
 
-	static constexpr int STANDARD_ITEMS = 10;
+	static constexpr int STANDARD_ITEMS = 11;
 	static constexpr int MAX_SYSTEM_ITEMS = 6;
 
 protected:
@@ -42,6 +42,7 @@ protected:
 	TextMenuItem autosaveNow;
 	TextMenuItem revertAutosave;
 	TextMenuItem stateSlot;
+	TextMenuItem inputOverrides;
 	ConditionalMember<Config::envIsAndroid, TextMenuItem> addLauncherIcon;
 	TextMenuItem screenshot;
 	TextMenuItem resetSessionOptions;

diff --git a/EmuFramework/src/ConfigFile.cc b/EmuFramework/src/ConfigFile.cc
@@ -62,8 +62,8 @@ void EmuApp::saveConfigFile(FileIO &io)
 	writeOptionValue(io, CFGKEY_BACK_NAVIGATION, viewManager.needsBackControlOption());
 	writeOptionValue(io, CFGKEY_SWAPPED_GAMEPAD_CONFIM, swappedConfirmKeysOption());
 	writeOptionValue(io, CFGKEY_AUDIO_SOLO_MIX, audio.manager.soloMixOption());
-	writeOptionValue(io, CFGKEY_WINDOW_PIXEL_FORMAT, windowDrawablePixelFormatOption());
-	writeOptionValue(io, CFGKEY_VIDEO_COLOR_SPACE, windowDrawableColorSpaceOption());
+	writeOptionValueIfNotDefault(io, windowDrawableConfig.pixelFormat);
+	writeOptionValueIfNotDefault(io, windowDrawableConfig.colorSpace);
 	writeOptionValueIfNotDefault(io, renderPixelFormat);
 	writeOptionValueIfNotDefault(io, textureBufferMode);
 	writeOptionValueIfNotDefault(io, showOnSecondScreen);
@@ -178,8 +178,7 @@ EmuApp::ConfigParams EmuApp::loadConfigFile(IG::ApplicationContext ctx)
 				case CFGKEY_MENU_SCALE: return readOptionValue(io, menuScale);
 				case CFGKEY_SHOW_ON_2ND_SCREEN: return readOptionValue(io, showOnSecondScreen);
 				case CFGKEY_IMAGE_EFFECT_PIXEL_FORMAT: return readOptionValue(io, imageEffectPixelFormat);
-				case CFGKEY_RENDER_PIXEL_FORMAT: return EmuSystem::canRenderRGBA8888 ? readOptionValue(io, renderPixelFormat) : false;
-				case CFGKEY_RECENT_CONTENT: return recentContent.readLegacyConfig(io, system());
+				case CFGKEY_RENDER_PIXEL_FORMAT: return EmuSystem::canRenderMultipleFormats() ? readOptionValue(io, renderPixelFormat) : false;
 				case CFGKEY_SWAPPED_GAMEPAD_CONFIM:
 					setSwappedConfirmKeys(readOptionValue<bool>(io));
 					return true;
@@ -241,7 +240,7 @@ EmuApp::ConfigParams EmuApp::loadConfigFile(IG::ApplicationContext ctx)
 	{
 		if(pendingWindowDrawableConf.colorSpace != Gfx::ColorSpace{} && pendingWindowDrawableConf.pixelFormat != IG::PixelFmtRGBA8888)
 			pendingWindowDrawableConf.colorSpace = {};
-		windowDrawableConf = pendingWindowDrawableConf;
+		windowDrawableConfig = pendingWindowDrawableConf;
 	}
 
 	return appConfig;