FormSpec: Add position and anchor elements (#5284)

[oweals/minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 4122b1f565fbac9801ae4f5acdf0526ade9aa7d1..bbab9c16454b54c1a4b38ceaaa0d8a6f5a11e8ce 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -22,17 +22,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GUIINVENTORYMENU_HEADER
 
 #include <utility>
+#include <stack>
 
 #include "irrlichttypes_extrabloated.h"
-#include "inventory.h"
 #include "inventorymanager.h"
 #include "modalMenu.h"
 #include "guiTable.h"
 #include "network/networkprotocol.h"
+#include "client/joystick_controller.h"
 #include "util/string.h"
 #include "util/enriched_string.h"
 
-class IGameDef;
 class InventoryManager;
 class ISimpleTextureSource;
 class Client;
@@ -142,9 +142,10 @@ class GUIFormSpecMenu : public GUIModalMenu
        struct ImageDrawSpec
        {
                ImageDrawSpec():
-                       parent_button(NULL)
-               {
-               }
+                       parent_button(NULL),
+                       clip(false)
+               {}
+
                ImageDrawSpec(const std::string &a_name,
                                const std::string &a_item_name,
                                gui::IGUIButton *a_parent_button,
@@ -154,9 +155,10 @@ class GUIFormSpecMenu : public GUIModalMenu
                        parent_button(a_parent_button),
                        pos(a_pos),
                        geom(a_geom),
-                       scale(true)
-               {
-               }
+                       scale(true),
+                       clip(false)
+               {}
+
                ImageDrawSpec(const std::string &a_name,
                                const std::string &a_item_name,
                                const v2s32 &a_pos, const v2s32 &a_geom):
@@ -165,32 +167,36 @@ class GUIFormSpecMenu : public GUIModalMenu
                        parent_button(NULL),
                        pos(a_pos),
                        geom(a_geom),
-                       scale(true)
-               {
-               }
+                       scale(true),
+                       clip(false)
+               {}
+
                ImageDrawSpec(const std::string &a_name,
-                               const v2s32 &a_pos, const v2s32 &a_geom):
+                               const v2s32 &a_pos, const v2s32 &a_geom, bool clip=false):
                        name(a_name),
                        parent_button(NULL),
                        pos(a_pos),
                        geom(a_geom),
-                       scale(true)
-               {
-               }
+                       scale(true),
+                       clip(clip)
+               {}
+
                ImageDrawSpec(const std::string &a_name,
                                const v2s32 &a_pos):
                        name(a_name),
                        parent_button(NULL),
                        pos(a_pos),
-                       scale(false)
-               {
-               }
+                       scale(false),
+                       clip(false)
+               {}
+
                std::string name;
                std::string item_name;
                gui::IGUIButton *parent_button;
                v2s32 pos;
                v2s32 geom;
                bool scale;
+               bool clip;
        };
 
        struct FieldSpec
@@ -201,14 +207,14 @@ class GUIFormSpecMenu : public GUIModalMenu
                FieldSpec(const std::string &name, const std::wstring &label,
                                const std::wstring &default_text, int id) :
                        fname(name),
-                       fid(id)
+                       flabel(label),
+                       fid(id),
+                       send(false),
+                       ftype(f_Unknown),
+                       is_exit(false)
                {
                        //flabel = unescape_enriched(label);
-                       flabel = label;
                        fdefault = unescape_enriched(default_text);
-                       send = false;
-                       ftype = f_Unknown;
-                       is_exit = false;
                }
                std::string fname;
                std::wstring flabel;
@@ -278,14 +284,13 @@ class GUIFormSpecMenu : public GUIModalMenu
 
 public:
        GUIFormSpecMenu(irr::IrrlichtDevice* dev,
+                       JoystickController *joystick,
                        gui::IGUIElement* parent, s32 id,
                        IMenuManager *menumgr,
-                       InventoryManager *invmgr,
-                       IGameDef *gamedef,
+                       Client *client,
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       Client* client,
                        bool remap_dbl_click = true);
 
        ~GUIFormSpecMenu();
@@ -370,10 +375,11 @@ protected:
        v2s32 spacing;
        v2s32 imgsize;
        v2s32 offset;
+       v2s32 pos_offset;
+       std::stack<v2s32> container_stack;
 
        irr::IrrlichtDevice* m_device;
        InventoryManager *m_invmgr;
-       IGameDef *m_gamedef;
        ISimpleTextureSource *m_tsrc;
        Client *m_client;
 
@@ -387,6 +393,7 @@ protected:
        std::vector<ImageDrawSpec> m_images;
        std::vector<ImageDrawSpec> m_itemimages;
        std::vector<BoxDrawSpec> m_boxes;
+       UNORDERED_MAP<std::string, bool> field_close_on_enter;
        std::vector<FieldSpec> m_fields;
        std::vector<StaticTextSpec> m_static_texts;
        std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
@@ -396,8 +403,6 @@ protected:
        std::vector<std::pair<FieldSpec, std::vector<std::string> > > m_dropdowns;
 
        ItemSpec *m_selected_item;
-       f32 m_timer1;
-       f32 m_timer2;
        u32 m_selected_amount;
        bool m_selected_dragging;
 
@@ -424,7 +429,6 @@ protected:
 
        bool m_bgfullscreen;
        bool m_slotborder;
-       bool m_clipbackground;
        video::SColor m_bgcolor;
        video::SColor m_slotbg_n;
        video::SColor m_slotbg_h;
@@ -433,15 +437,18 @@ protected:
        video::SColor m_default_tooltip_color;
 
 private:
-       IFormSource      *m_form_src;
-       TextDest         *m_text_dst;
-       unsigned int      m_formspec_version;
-       std::string       m_focused_element;
+       IFormSource        *m_form_src;
+       TextDest           *m_text_dst;
+       unsigned int        m_formspec_version;
+       std::string         m_focused_element;
+       JoystickController *m_joystick;
 
        typedef struct {
                bool explicit_size;
                v2f invsize;
                v2s32 size;
+               v2f32 offset;
+               v2f32 anchor;
                core::rect<s32> rect;
                v2s32 basepos;
                v2u32 screensize;
@@ -449,7 +456,7 @@ private:
                GUITable::TableOptions table_options;
                GUITable::TableColumns table_columns;
                // used to restore table selection/scroll/treeview state
-               std::map<std::string, GUITable::DynamicData> table_dyndata;
+               UNORDERED_MAP<std::string, GUITable::DynamicData> table_dyndata;
        } parserData;
 
        typedef struct {
@@ -460,14 +467,17 @@ private:
        } fs_key_pendig;
 
        fs_key_pendig current_keys_pending;
+       std::string current_field_enter_pending;
 
-       void parseElement(parserData* data,std::string element);
+       void parseElement(parserData* data, std::string element);
 
-       void parseSize(parserData* data,std::string element);
-       void parseList(parserData* data,std::string element);
-       void parseListRing(parserData* data,std::string element);
-       void parseCheckbox(parserData* data,std::string element);
-       void parseImage(parserData* data,std::string element);
+       void parseSize(parserData* data, std::string element);
+       void parseContainer(parserData* data, std::string element);
+       void parseContainerEnd(parserData* data);
+       void parseList(parserData* data, std::string element);
+       void parseListRing(parserData* data, std::string element);
+       void parseCheckbox(parserData* data, std::string element);
+       void parseImage(parserData* data, std::string element);
        void parseItemImage(parserData* data,std::string element);
        void parseButton(parserData* data,std::string element,std::string typ);
        void parseBackground(parserData* data,std::string element);
@@ -476,6 +486,7 @@ private:
        void parseTable(parserData* data,std::string element);
        void parseTextList(parserData* data,std::string element);
        void parseDropDown(parserData* data,std::string element);
+       void parseFieldCloseOnEnter(parserData *data, const std::string &element);
        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);
@@ -493,6 +504,12 @@ private:
        bool parseVersionDirect(std::string data);
        bool parseSizeDirect(parserData* data, std::string element);
        void parseScrollBar(parserData* data, std::string element);
+       bool parsePositionDirect(parserData *data, const std::string &element);
+       void parsePosition(parserData *data, const std::string &element);
+       bool parseAnchorDirect(parserData *data, const std::string &element);
+       void parseAnchor(parserData *data, const std::string &element);
+
+       void tryClose();
 
        /**
         * check if event is part of a double click
@@ -552,4 +569,3 @@ public:
 };
 
 #endif
-