Deduplicate code and use stdlib in string functions

[minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 583cad4a27da64ba29a273d5d05ab2d3ad5d671d..6d6c07453ed8440c30847aca3821fca07b84b35c 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -210,7 +210,6 @@ class GUIFormSpecMenu : public GUIModalMenu
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       GUIFormSpecMenu** ext_ptr,
                        Client* client
                        );
 
@@ -274,9 +273,6 @@ class GUIFormSpecMenu : public GUIModalMenu
 
        GUITable* getTable(std::wstring tablename);
 
-       static bool parseColor(const std::string &value,
-                       video::SColor &color, bool quiet);
-
 #ifdef __ANDROID__
        bool getAndroidUIInput();
 #endif
@@ -301,6 +297,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        std::string m_formspec_string;
        InventoryLocation m_current_inventory_location;
 
+
        std::vector<ListDrawSpec> m_inventorylists;
        std::vector<ImageDrawSpec> m_backgrounds;
        std::vector<ImageDrawSpec> m_images;
@@ -323,13 +320,16 @@ class GUIFormSpecMenu : public GUIModalMenu
        InventoryLocation m_selected_content_guess_inventory;
 
        v2s32 m_pointer;
+       v2s32 m_old_pointer;  // Mouse position after previous mouse event
        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;
@@ -347,15 +347,14 @@ class GUIFormSpecMenu : public GUIModalMenu
 private:
        IFormSource      *m_form_src;
        TextDest         *m_text_dst;
-       GUIFormSpecMenu **m_ext_ptr;
-       gui::IGUIFont    *m_font;
        unsigned int      m_formspec_version;
 
        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;
@@ -402,6 +401,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);
 
        /**
@@ -419,6 +419,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);