Rename --do-unittests to --run-unittests as @Zeno- and @sfan5 requested

[minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index df988f5a5034daa91f5d7b5f539f4d741055fc76..2074fb780c7e71746197beaac8ba8f5326309c59 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;
@@ -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
        */
@@ -328,6 +335,8 @@ class GUIFormSpecMenu : public GUIModalMenu
        s32 m_old_tooltip_id;
        std::string m_old_tooltip;
 
+       bool m_rmouse_auto_place;
+
        bool m_allowclose;
        bool m_lock;
        v2u32 m_lockscreensize;
@@ -346,12 +355,14 @@ class GUIFormSpecMenu : public GUIModalMenu
        IFormSource      *m_form_src;
        TextDest         *m_text_dst;
        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;
@@ -398,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);
 
        /**
@@ -415,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);