Fix on_rightclick() being called directly after placing node

[dragonfireclient.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 15bc628d17296f869b40145111cf9b7f30e03346..2ba47f7ff5bac5c60648465886cfd4daec20f959 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -28,11 +28,12 @@ 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;
 class ISimpleTextureSource;
+class Client;
 
 typedef enum {
        f_Button,
@@ -55,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;};
 
@@ -120,6 +121,22 @@ class GUIFormSpecMenu : public GUIModalMenu
                s32 start_item_i;
        };
 
+       struct ListRingSpec
+       {
+               ListRingSpec()
+               {
+               }
+               ListRingSpec(const InventoryLocation &a_inventoryloc,
+                               const std::string &a_listname):
+                       inventoryloc(a_inventoryloc),
+                       listname(a_listname)
+               {
+               }
+
+               InventoryLocation inventoryloc;
+               std::string listname;
+       };
+
        struct ImageDrawSpec
        {
                ImageDrawSpec()
@@ -151,7 +168,7 @@ class GUIFormSpecMenu : public GUIModalMenu
                FieldSpec()
                {
                }
-               FieldSpec(const std::wstring &name, const std::wstring &label,
+               FieldSpec(const std::string &name, const std::wstring &label,
                                const std::wstring &fdeflt, int id) :
                        fname(name),
                        flabel(label),
@@ -162,7 +179,7 @@ class GUIFormSpecMenu : public GUIModalMenu
                        ftype = f_Unknown;
                        is_exit = false;
                }
-               std::wstring fname;
+               std::string fname;
                std::wstring flabel;
                std::wstring fdefault;
                int fid;
@@ -209,8 +226,8 @@ class GUIFormSpecMenu : public GUIModalMenu
                        ISimpleTextureSource *tsrc,
                        IFormSource* fs_src,
                        TextDest* txt_dst,
-                       GUIFormSpecMenu** ext_ptr
-                       );
+                       Client* client,
+                       bool remap_dbl_click = true);
 
        ~GUIFormSpecMenu();
 
@@ -245,13 +262,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::string &elementname)
+       {
+               m_focused_element = elementname;
+       }
+
        /*
                Remove and re-add (or reposition) stuff
        */
@@ -270,10 +294,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        bool doPause;
        bool pausesGame() { return doPause; }
 
-       GUITable* getTable(std::wstring tablename);
-
-       static bool parseColor(const std::string &value,
-                       video::SColor &color, bool quiet);
+       GUITable* getTable(const std::string &tablename);
 
 #ifdef __ANDROID__
        bool getAndroidUIInput();
@@ -294,11 +315,14 @@ 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<ListRingSpec> m_inventory_rings;
        std::vector<ImageDrawSpec> m_backgrounds;
        std::vector<ImageDrawSpec> m_images;
        std::vector<ImageDrawSpec> m_itemimages;
@@ -306,7 +330,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        std::vector<FieldSpec> m_fields;
        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::map<std::string, TooltipSpec> m_tooltips;
        std::vector<std::pair<FieldSpec,gui::IGUIScrollBar*> > m_scrollbars;
 
        ItemSpec *m_selected_item;
@@ -320,13 +344,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;
@@ -344,21 +371,21 @@ 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::string       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;
+               std::string focused_fieldname;
                GUITable::TableOptions table_options;
                GUITable::TableColumns table_columns;
                // used to restore table selection/scroll/treeview state
-               std::map<std::wstring,GUITable::DynamicData> table_dyndata;
+               std::map<std::string, GUITable::DynamicData> table_dyndata;
        } parserData;
 
        typedef struct {
@@ -374,6 +401,7 @@ class GUIFormSpecMenu : public GUIModalMenu
 
        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 parseItemImage(parserData* data,std::string element);
@@ -399,6 +427,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,14 +445,23 @@ 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);
+       std::string getNameByID(s32 id);
 #ifdef __ANDROID__
        v2s32 m_down_pos;
-       std::wstring m_JavaDialogFieldName;
+       std::string 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