Fix RUN_IN_PLACE broken due to invalid usage of assert

[minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 3368bb82d8188c588fb1f1cbede558f7d13b0939..2074fb780c7e71746197beaac8ba8f5326309c59 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -28,10 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventorymanager.h"
 #include "modalMenu.h"
 #include "guiTable.h"
+#include "network/networkprotocol.h"
 
 class IGameDef;
 class InventoryManager;
 class ISimpleTextureSource;
+class Client;
 
 typedef enum {
        f_Button,
@@ -39,6 +41,7 @@ typedef enum {
        f_TabHeader,
        f_CheckBox,
        f_DropDown,
+       f_ScrollBar,
        f_Unknown
 } FormspecFieldType;
 
@@ -150,7 +153,7 @@ class GUIFormSpecMenu : public GUIModalMenu
                {
                }
                FieldSpec(const std::wstring &name, const std::wstring &label,
-                         const std::wstring &fdeflt, int id) :
+                               const std::wstring &fdeflt, int id) :
                        fname(name),
                        flabel(label),
                        fdefault(fdeflt),
@@ -207,7 +210,7 @@ class GUIFormSpecMenu : public GUIModalMenu
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       GUIFormSpecMenu** ext_ptr
+                       Client* client
                        );
 
        ~GUIFormSpecMenu();
@@ -243,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
        */
@@ -270,8 +280,9 @@ 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
 
 protected:
        v2s32 getBasePos() const
@@ -288,10 +299,12 @@ class GUIFormSpecMenu : public GUIModalMenu
        InventoryManager *m_invmgr;
        IGameDef *m_gamedef;
        ISimpleTextureSource *m_tsrc;
+       Client *m_client;
 
        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;
@@ -301,7 +314,8 @@ class GUIFormSpecMenu : public GUIModalMenu
        std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
        std::vector<std::pair<FieldSpec,gui::IGUICheckBox*> > m_checkboxes;
        std::map<std::wstring, TooltipSpec> m_tooltips;
-       
+       std::vector<std::pair<FieldSpec,gui::IGUIScrollBar*> > m_scrollbars;
+
        ItemSpec *m_selected_item;
        u32 m_selected_amount;
        bool m_selected_dragging;
@@ -313,13 +327,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;
@@ -337,14 +354,15 @@ 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;
+       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;
@@ -390,6 +408,9 @@ class GUIFormSpecMenu : public GUIModalMenu
        void parseBackgroundColor(parserData* data,std::string element);
        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);
 
        /**
         * check if event is part of a double click
@@ -406,6 +427,15 @@ 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);
+#ifdef __ANDROID__
+       v2s32 m_down_pos;
+       std::wstring m_JavaDialogFieldName;
+#endif
+
 };
 
 class FormspecFormSource: public IFormSource
@@ -420,7 +450,7 @@ class FormspecFormSource: public IFormSource
        {}
 
        void setForm(std::string formspec) {
-               m_formspec = formspec;
+               m_formspec = FORMSPEC_VERSION_STRING + formspec;
        }
 
        std::string getForm()