Merge pull request #240 from pavanvo/feat/non_blocking

Feat/non blocking for loading game info

source/glest_game/menu/menu_state_load_game.cpp

@@ -281,11 +281,13 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
     	if(slotsScrollBar.getElementCount()!=0){
     		for(int i = slotsScrollBar.getVisibleStart(); i <= slotsScrollBar.getVisibleEnd(); ++i) {
 				if(slots[i]->mouseClick(x, y) && selectedButton != slots[i]) {
+					loadButton.setEnabled(false);
 					soundRenderer.playFx(coreData.getClickSoundB());
 
 					Lang &lang= Lang::getInstance();
 					cleanupTexture(&previewTexture);
 					selectedButton = slots[i];
+					for(auto slot : slots) slot->setEnabled(false);
 					string filename	= saveGameDir + selectedButton->getText()+".xml";
 					string screenShotFilename = filename + ".jpg";
 					if(fileExists(screenShotFilename) == true) {
@@ -322,16 +324,18 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
 
 #endif
 
-						XmlTree	xmlTree(engine_type);
-
 						if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Before load of XML\n");
+						versionWarningLabel.setText("");
+						infoTextLabel.setText("Loading...");
 						std::map<string,string> mapExtraTagReplacementValues;
 						try {
-							xmlTree.load(filename, Properties::getTagReplacementValues(&mapExtraTagReplacementValues),true,false,true);
-
+							auto xmlTree = std::make_shared<XmlTree>(engine_type);
+							xmlTree->loadAsync(filename, Properties::getTagReplacementValues(&mapExtraTagReplacementValues),true,false,true)
+								->then([this, xmlTree, &lang, filename](){
+
 							if(SystemFlags::VERBOSE_MODE_ENABLED) printf("After load of XML\n");
 
-							const XmlNode *rootNode= xmlTree.getRootNode();
+							const XmlNode *rootNode= xmlTree->getRootNode();
 							if(rootNode != NULL && rootNode->hasChild("megaglest-saved-game") == true) {
 								rootNode = rootNode->getChild("megaglest-saved-game");
 							}
@@ -368,13 +372,18 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
 									 newGameSettings.getThisFactionIndex() < newGameSettings.getFactionCount() ?
 									newGameSettings.getFactionTypeName(newGameSettings.getThisFactionIndex()).c_str() : ""));
 							infoTextLabel.setText(szBuf);
+							for(auto slot : slots) slot->setEnabled(true);
+							loadButton.setEnabled(true);
+							});
 						}
 						catch(const megaglest_runtime_error &ex) {
 							char szBuf[8096]="";
 							snprintf(szBuf,8096,"In [%s::%s Line: %d]\nError [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,ex.what());
 							SystemFlags::OutputDebug(SystemFlags::debugError,szBuf);
 
 							showMessageBox(ex.what(), lang.getString("Notice"), false);
+							for(auto slot : slots) slot->setEnabled(true);
+							loadButton.setEnabled(true);
 						}
 					}
 					else {
@@ -383,21 +392,21 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
 
 					break;
 				}
-    		}
-    	}
-    }
+			}
+		}
+	}
 }
 
 void MenuStateLoadGame::mouseUp(int x, int y, const MouseButton mouseButton) {
-    if (mouseButton == mbLeft) {
-        slotsScrollBar.mouseUp(x, y);
-    }
+	if (mouseButton == mbLeft) {
+		slotsScrollBar.mouseUp(x, y);
+	}
 }
 
 void MenuStateLoadGame::mouseMove(int x, int y, const MouseState *ms) {
-    abortButton.mouseMove(x, y);
-    deleteButton.mouseMove(x, y);
-    loadButton.mouseMove(x, y);
+	abortButton.mouseMove(x, y);
+	deleteButton.mouseMove(x, y);
+	loadButton.mouseMove(x, y);
 	if(slotsScrollBar.getElementCount()!=0){
 		for(int i = slotsScrollBar.getVisibleStart(); i <= slotsScrollBar.getVisibleEnd(); ++i) {
 			slots[i]->mouseMove(x, y);

source/shared_lib/include/util/callback.h

@@ -0,0 +1,70 @@
+#pragma once
+
+#include <functional>
+#include <thread>
+#include <utility>
+
+using std::function;
+using std::thread;
+
+namespace Shared{ namespace Util{
+
+template<typename T>
+class CallBack {
+
+
+private:
+	function<void()> _onThen = [](){};
+	function<T()> _mainFunc = [](){};
+	T _result;
+
+public:
+	CallBack(function<T()> func){
+		_mainFunc = func;
+	};
+
+	~CallBack() {
+		//printf("CallBack::~CallBack p [%p]\n",this);
+	};
+
+	void then(function<void()> onThen){
+		_onThen = onThen;
+	};
+
+	T getResult(){
+		return _result;
+	}
+
+	void run(){
+		_result = _mainFunc();
+		_onThen();
+	};
+};
+
+template<>
+class CallBack<void> {
+
+private:
+	function<void()> _onThen = [](){};
+	function<void()> _mainFunc = [](){};
+
+public:
+	CallBack(function<void()> func){
+		_mainFunc = func;
+	};
+
+	~CallBack() {
+		//printf("CallBack::~CallBack p [%p]\n",this);
+	};
+
+	void then(function<void()> onThen){
+		_onThen = onThen;
+	};
+
+	void run(){
+		_mainFunc();
+		_onThen();
+	};
+};
+
+}}

source/shared_lib/include/xml/xml_parser.h

@@ -15,6 +15,7 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <memory>
 
 #if defined(WANT_XERCES)
 
@@ -23,10 +24,12 @@
 #endif
 
 #include "rapidxml/rapidxml.hpp"
+#include "callback.h"
 #include "data_types.h"
 #include "leak_dumper.h"
 
 using namespace rapidxml;
+using namespace Shared::Util;
 using namespace std;
 
 #if defined(WANT_XERCES)
@@ -151,6 +154,7 @@ class XmlTree{
 	void setSkipUpdatePathClimbingParts(bool value);
 	void init(const string &name);
 	void load(const string &path, const std::map<string,string> &mapTagReplacementValues, bool noValidation=false,bool skipStackCheck=false,bool skipStackTrace=false);
+	std::shared_ptr<CallBack<void>> loadAsync(const string &path, const std::map<string,string> &mapTagReplacementValues, bool noValidation=false,bool skipStackCheck=false,bool skipStackTrace=false);
 	void save(const string &path);
 
 	XmlNode *getRootNode() const	{return rootNode;}

source/shared_lib/sources/xml/xml_parser.cpp

@@ -585,6 +585,16 @@ void XmlTree::load(const string &path, const std::map<string,string> &mapTagRepl
 	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] about to load [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,path.c_str());
 }
 
+std::shared_ptr<CallBack<void>> XmlTree::loadAsync(const string &path, const std::map<string,string> &mapTagReplacementValues, bool noValidation,bool skipStackCheck,bool skipStackTrace) {
+	auto load = [this, path, mapTagReplacementValues, noValidation, skipStackCheck, skipStackTrace]() {
+		this->load(path, mapTagReplacementValues, noValidation, skipStackCheck, skipStackTrace);
+	};
+	auto cb = std::make_shared<CallBack<void>>(load);
+
+	std::thread([cb]() { cb->run(); }).detach();
+	return cb;
+}
+
 void XmlTree::save(const string &path) {
 
 #if defined(WANT_XERCES)