Minimal: Add snow biome and jungleleaves nodes. Add mapgen aliases

[minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index ed0e9637c6cc1354a9e39fc20c0825bcbdd2f4f4..f7259578293190fe173ad26d991cfcdacc714896 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -56,7 +56,7 @@ 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 gotText(const StringMap &fields) = 0;
        virtual void setFormName(std::string formname)
        { m_formname = formname;};
 
@@ -210,8 +210,8 @@ class GUIFormSpecMenu : public GUIModalMenu
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       Client* client
-                       );
+                       Client* client,
+                       bool remap_dbl_click = true);
 
        ~GUIFormSpecMenu();
 
@@ -246,13 +246,20 @@ class GUIFormSpecMenu : public GUIModalMenu
                m_allowclose = value;
        }
 
-       void lockSize(bool lock,v2u32 basescreensize=v2u32(0,0)) {
+       void lockSize(bool lock,v2u32 basescreensize=v2u32(0,0))
+       {
                m_lock = lock;
                m_lockscreensize = basescreensize;
        }
 
        void removeChildren();
        void setInitialFocus();
+
+       void setFocus(std::wstring elementname)
+       {
+               m_focused_element = elementname;
+       }
+
        /*
                Remove and re-add (or reposition) stuff
        */
@@ -348,6 +355,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        IFormSource      *m_form_src;
        TextDest         *m_text_dst;
        unsigned int      m_formspec_version;
+       std::wstring      m_focused_element;
 
        typedef struct {
                bool explicit_size;
@@ -428,6 +436,14 @@ class GUIFormSpecMenu : public GUIModalMenu
        std::wstring m_JavaDialogFieldName;
 #endif
 
+       /* If true, remap a double-click (or double-tap) action to ESC. This is so
+        * that, for example, Android users can double-tap to close a formspec.
+       *
+        * This value can (currently) only be set by the class constructor
+        * and the default value for the setting is true.
+        */
+       bool m_remap_dbl_click;
+
 };
 
 class FormspecFormSource: public IFormSource