Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index f5a273668d65a9abb78854734eddcbb04b4cfd85..1946f88ebc3ba0c635e8c3261c977bd1b4a50326 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -27,13 +27,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "inventorymanager.h"
 #include "modalMenu.h"
+#include "guiTable.h"
 
 class IGameDef;
 class InventoryManager;
+class ISimpleTextureSource;
 
 typedef enum {
        f_Button,
-       f_ListBox,
+       f_Table,
        f_TabHeader,
        f_CheckBox,
        f_DropDown,
@@ -57,13 +59,6 @@ class IFormSource
        virtual std::string resolveText(std::string str){ return str; }
 };
 
-void drawItemStack(video::IVideoDriver *driver,
-               gui::IGUIFont *font,
-               const ItemStack &item,
-               const core::rect<s32> &rect,
-               const core::rect<s32> *clip,
-               IGameDef *gamedef);
-
 class GUIFormSpecMenu : public GUIModalMenu
 {
        struct ItemSpec
@@ -183,7 +178,8 @@ class GUIFormSpecMenu : public GUIModalMenu
                        gui::IGUIElement* parent, s32 id,
                        IMenuManager *menumgr,
                        InventoryManager *invmgr,
-                       IGameDef *gamedef
+                       IGameDef *gamedef,
+                       ISimpleTextureSource *tsrc
                        );
 
        ~GUIFormSpecMenu();
@@ -213,16 +209,13 @@ class GUIFormSpecMenu : public GUIModalMenu
                m_allowclose = value;
        }
 
-       void useGettext(bool value) {
-               m_use_gettext = true;
-       }
-
        void lockSize(bool lock,v2u32 basescreensize=v2u32(0,0)) {
                m_lock = lock;
                m_lockscreensize = basescreensize;
        }
 
        void removeChildren();
+       void setInitialFocus();
        /*
                Remove and re-add (or reposition) stuff
        */
@@ -235,10 +228,14 @@ class GUIFormSpecMenu : public GUIModalMenu
        void updateSelectedItem();
        ItemStack verifySelectedItem();
 
-       void acceptInput(int evttype=-1);
+       void acceptInput(bool quit);
+       bool preprocessEvent(const SEvent& event);
        bool OnEvent(const SEvent& event);
-       
-       int getListboxIndex(std::string listboxname);
+
+       GUITable* getTable(std::wstring tablename);
+
+       static bool parseColor(const std::string &value,
+                       video::SColor &color, bool quiet);
 
 protected:
        v2s32 getBasePos() const
@@ -254,6 +251,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        irr::IrrlichtDevice* m_device;
        InventoryManager *m_invmgr;
        IGameDef *m_gamedef;
+       ISimpleTextureSource *m_tsrc;
 
        std::string m_formspec_string;
        InventoryLocation m_current_inventory_location;
@@ -266,7 +264,7 @@ class GUIFormSpecMenu : public GUIModalMenu
        std::vector<ImageDrawSpec> m_itemimages;
        std::vector<BoxDrawSpec> m_boxes;
        std::vector<FieldSpec> m_fields;
-       std::vector<std::pair<FieldSpec,gui::IGUIListBox*> > m_listboxes;
+       std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
        std::vector<std::pair<FieldSpec,gui::IGUICheckBox*> > m_checkboxes;
 
        ItemSpec *m_selected_item;
@@ -283,9 +281,16 @@ class GUIFormSpecMenu : public GUIModalMenu
        gui::IGUIStaticText *m_tooltip_element;
 
        bool m_allowclose;
-       bool m_use_gettext;
        bool m_lock;
        v2u32 m_lockscreensize;
+
+       bool m_bgfullscreen;
+       bool m_slotborder;
+       bool m_clipbackground;
+       video::SColor m_bgcolor;
+       video::SColor m_slotbg_n;
+       video::SColor m_slotbg_h;
+       video::SColor m_slotbordercolor;
 private:
        typedef struct {
                v2s32 size;
@@ -294,10 +299,21 @@ class GUIFormSpecMenu : public GUIModalMenu
                v2s32 basepos;
                int bp_set;
                v2u32 screensize;
-               std::map<std::wstring,int> listbox_selections;
+               std::wstring 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;
        } parserData;
 
-       std::vector<video::ITexture *> m_Textures;
+       typedef struct {
+               bool key_up;
+               bool key_down;
+               bool key_enter;
+               bool key_escape;
+       } fs_key_pendig;
+
+       fs_key_pendig current_keys_pending;
 
        void parseElement(parserData* data,std::string element);
 
@@ -308,6 +324,9 @@ class GUIFormSpecMenu : public GUIModalMenu
        void parseItemImage(parserData* data,std::string element);
        void parseButton(parserData* data,std::string element,std::string typ);
        void parseBackground(parserData* data,std::string element);
+       void parseTableOptions(parserData* data,std::string element);
+       void parseTableColumns(parserData* data,std::string element);
+       void parseTable(parserData* data,std::string element);
        void parseTextList(parserData* data,std::string element);
        void parseDropDown(parserData* data,std::string element);
        void parsePwdField(parserData* data,std::string element);
@@ -320,8 +339,8 @@ class GUIFormSpecMenu : public GUIModalMenu
        void parseItemImageButton(parserData* data,std::string element);
        void parseTabHeader(parserData* data,std::string element);
        void parseBox(parserData* data,std::string element);
-
-       irr::video::SColor getColor(std::string color,bool& valid_color);
+       void parseBackgroundColor(parserData* data,std::string element);
+       void parseListColors(parserData* data,std::string element);
 };
 
 class FormspecFormSource: public IFormSource