Replace pause and message menu by formspec ones

1 files changed, 15 insertions, 3 deletions

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 1946f88eb..858894e5c 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -42,12 +42,22 @@ typedef enum {
 	f_Unknown
 } FormspecFieldType;
 
+typedef enum {
+	quit_mode_no,
+	quit_mode_accept,
+	quit_mode_cancel
+} FormspecQuitMode;
+
 struct TextDest
 {
 	virtual ~TextDest() {};
 	// This is deprecated I guess? -celeron55
 	virtual void gotText(std::wstring text){}
 	virtual void gotText(std::map<std::string, std::string> fields) = 0;
+	virtual void setFormName(std::string formname)
+	{ m_formname = formname;};
+
+	std::string m_formname;
 };
 
 class IFormSource
@@ -139,7 +149,8 @@ class GUIFormSpecMenu : public GUIModalMenu
 		FieldSpec()
 		{
 		}
-		FieldSpec(const std::wstring name, const std::wstring label, const std::wstring fdeflt, int id):
+		FieldSpec(const std::wstring name, const std::wstring label,
+				const std::wstring fdeflt, int id) :
 			fname(name),
 			flabel(label),
 			fdefault(fdeflt),
@@ -228,7 +239,7 @@ public:
 	void updateSelectedItem();
 	ItemStack verifySelectedItem();
 
-	void acceptInput(bool quit);
+	void acceptInput(FormspecQuitMode quitmode);
 	bool preprocessEvent(const SEvent& event);
 	bool OnEvent(const SEvent& event);
 
@@ -332,7 +343,8 @@ private:
 	void parsePwdField(parserData* data,std::string element);
 	void parseField(parserData* data,std::string element,std::string type);
 	void parseSimpleField(parserData* data,std::vector<std::string> &parts);
-	void parseTextArea(parserData* data,std::vector<std::string>& parts,std::string type);
+	void parseTextArea(parserData* data,std::vector<std::string>& parts,
+			std::string type);
 	void parseLabel(parserData* data,std::string element);
 	void parseVertLabel(parserData* data,std::string element);
 	void parseImageButton(parserData* data,std::string element,std::string type);