From ee3c189d6b9f1ed0624c8992263269ff5ccbb95d Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Wed, 29 May 2019 23:30:52 +0530
Subject: [PATCH] Allow for changing control overlay image

---
 src/config.cpp   |  4 +++-
 src/config.h     |  3 ++-
 src/graphics.cpp | 13 +++++++++++--
 src/graphics.h   |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 66c7944..383a567 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -480,7 +480,9 @@ parseOverlayButtonDesc(const ptree &pt, TouchOverlay::Button &out)
 static void
 parseOverlayDesc(const ptree &pt, TouchOverlay &out)
 {
-	out.image = pt.get<std::string>("image");
+	for (auto &img : pt.get_child("images")) {
+		out.images[img.second.get<int>("id")] = img.second.get<std::string>("file");
+	}
 
 	const ptree &buttons = pt.get_child("buttons");
 	for (ptree::const_iterator ci = buttons.begin(); ci != buttons.end(); ++ci)
diff --git a/src/config.h b/src/config.h
index b737602..f207cb1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -24,11 +24,12 @@
 
 #include <string>
 #include <vector>
+#include <map>
 #include <set>
 
 struct TouchOverlay
 {
-	std::string image;
+	std::map<int, std::string> images;
 
 	struct Button
 	{
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 00ddd08..066bff6 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -503,12 +503,16 @@ struct GraphicsPrivate
 		TEXFBO::allocEmpty(frozenScene, scRes.x, scRes.y);
 		TEXFBO::linkFBO(frozenScene);
 
+		setOverlay(0);
+
 		FloatRect screenRect(0, 0, scRes.x, scRes.y);
 		screenQuad.setTexPosRect(screenRect, screenRect);
 
 		fpsLimiter.resetFrameAdjust();
-		
-		const std::string &olImage = rtData->config.touchOverlay.image;
+	}
+
+	void setOverlay(int id) {
+		const std::string &olImage = threadData->config.touchOverlay.images[id];
 		if (!olImage.empty())
 		{
 			SDL_RWops *ops = SDL_RWFromFile(olImage.c_str(), "rb");
@@ -862,6 +866,11 @@ void Graphics::frameReset()
 	p->fpsLimiter.resetFrameAdjust();
 }
 
+void Graphics::setOverlay(int id)
+{
+	p->setOverlay(id);
+}
+
 static void guardDisposed() {}
 
 DEF_ATTR_RD_SIMPLE(Graphics, FrameRate, int, p->frameRate)
diff --git a/src/graphics.h b/src/graphics.h
index aa30189..f609264 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -40,6 +40,7 @@ public:
 	                const char *filename = "",
 	                int vague = 40);
 	void frameReset();
+	void setOverlay(int);
 
 	DECL_ATTR( FrameRate,  int )
 	DECL_ATTR( FrameCount, int )