Make get_biome_list() error message more helpful

[minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index d38e9ec468e5973a9d57c1f521efd7ce0318e49e..f7259578293190fe173ad26d991cfcdacc714896 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventorymanager.h"
 #include "modalMenu.h"
 #include "guiTable.h"
-#include "clientserver.h"
+#include "network/networkprotocol.h"
 
 class IGameDef;
 class InventoryManager;
@@ -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
        */
@@ -324,10 +331,12 @@ class GUIFormSpecMenu : public GUIModalMenu
        gui::IGUIStaticText *m_tooltip_element;
 
        u32 m_tooltip_show_delay;
-       s32 m_hoovered_time;
+       s32 m_hovered_time;
        s32 m_old_tooltip_id;
        std::string m_old_tooltip;
 
+       bool m_rmouse_auto_place;
+
        bool m_allowclose;
        bool m_lock;
        v2u32 m_lockscreensize;
@@ -345,14 +354,15 @@ class GUIFormSpecMenu : public GUIModalMenu
 private:
        IFormSource      *m_form_src;
        TextDest         *m_text_dst;
-       gui::IGUIFont    *m_font;
        unsigned int      m_formspec_version;
+       std::wstring      m_focused_element;
 
        typedef struct {
+               bool explicit_size;
+               v2f invsize;
                v2s32 size;
                core::rect<s32> rect;
                v2s32 basepos;
-               int bp_set;
                v2u32 screensize;
                std::wstring focused_fieldname;
                GUITable::TableOptions table_options;
@@ -399,6 +409,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        void parseListColors(parserData* data,std::string element);
        void parseTooltip(parserData* data,std::string element);
        bool parseVersionDirect(std::string data);
+       bool parseSizeDirect(parserData* data, std::string element);
        void parseScrollBar(parserData* data, std::string element);
 
        /**
@@ -416,6 +427,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        clickpos m_doubleclickdetect[2];
 
        int m_btn_height;
+       gui::IGUIFont *m_font;
 
        std::wstring getLabelByID(s32 id);
        std::wstring getNameByID(s32 id);
@@ -424,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