Remove unnecessary delays from large data transfer unit test

[minetest.git] / src / guiInventoryMenu.h

diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h
index 0032ce66aa64b15403b7d7db952a26ff906b827e..ed8df88fc4a2744cd374ba4aa5d4e8ac40477c94 100644 (file)
--- a/src/guiInventoryMenu.h
+++ b/src/guiInventoryMenu.h
@@ -23,13 +23,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "inventorymanager.h"
 #include "utility.h"
+#include "modalMenu.h"
 
-void drawInventoryItem(gui::IGUIEnvironment* env,
-               InventoryItem *item, core::rect<s32> rect,
-               const core::rect<s32> *clip=0);
+class IGameDef;
+class InventoryManager;
 
-class GUIInventoryMenu : public gui::IGUIElement
+void drawItemStack(video::IVideoDriver *driver,
+               gui::IGUIFont *font,
+               const ItemStack &item,
+               const core::rect<s32> &rect,
+               const core::rect<s32> *clip,
+               IGameDef *gamedef);
+
+class GUIInventoryMenu : public GUIModalMenu
 {
        struct ItemSpec
        {
@@ -37,9 +45,12 @@ class GUIInventoryMenu : public gui::IGUIElement
                {
                        i = -1;
                }
-               ItemSpec(const std::string &a_name, s32 a_i)
+               ItemSpec(const InventoryLocation &a_inventoryloc,
+                               const std::string &a_listname,
+                               s32 a_i)
                {
-                       listname = a_name;
+                       inventoryloc = a_inventoryloc;
+                       listname = a_listname;
                        i = a_i;
                }
                bool isValid() const
@@ -47,6 +58,7 @@ class GUIInventoryMenu : public gui::IGUIElement
                        return i != -1;
                }
 
+               InventoryLocation inventoryloc;
                std::string listname;
                s32 i;
        };
@@ -56,68 +68,105 @@ class GUIInventoryMenu : public gui::IGUIElement
                ListDrawSpec()
                {
                }
-               ListDrawSpec(const std::string &a_name, v2s32 a_pos, v2s32 a_geom)
+               ListDrawSpec(const InventoryLocation &a_inventoryloc,
+                               const std::string &a_listname,
+                               v2s32 a_pos, v2s32 a_geom)
                {
-                       listname = a_name;
+                       inventoryloc = a_inventoryloc;
+                       listname = a_listname;
                        pos = a_pos;
                        geom = a_geom;
                }
 
+               InventoryLocation inventoryloc;
                std::string listname;
                v2s32 pos;
                v2s32 geom;
        };
-
 public:
+       struct DrawSpec
+       {
+               DrawSpec()
+               {
+               }
+               DrawSpec(const std::string &a_type,
+                               const InventoryLocation &a_name,
+                               const std::string &a_subname,
+                               v2s32 a_pos,
+                               v2s32 a_geom)
+               {
+                       type = a_type;
+                       name = a_name;
+                       subname = a_subname;
+                       pos = a_pos;
+                       geom = a_geom;
+               }
+
+               std::string type;
+               InventoryLocation name;
+               std::string subname;
+               v2s32 pos;
+               v2s32 geom;
+       };
+       
+       // See .cpp for format
+       static v2s16 makeDrawSpecArrayFromString(
+                       core::array<GUIInventoryMenu::DrawSpec> &draw_spec,
+                       const std::string &data,
+                       const InventoryLocation &current_location);
+
        GUIInventoryMenu(gui::IGUIEnvironment* env,
                        gui::IGUIElement* parent, s32 id,
-                       Inventory *inventory);
+                       IMenuManager *menumgr,
+                       v2s16 menu_size,
+                       InventoryManager *invmgr,
+                       IGameDef *gamedef
+                       );
        ~GUIInventoryMenu();
 
+       void setDrawSpec(core::array<DrawSpec> &init_draw_spec)
+       {
+               m_init_draw_spec = init_draw_spec;
+       }
+
+       void removeChildren();
        /*
                Remove and re-add (or reposition) stuff
        */
-       void resizeGui();
+       void regenerateGui(v2u32 screensize);
        
        ItemSpec getItemAtPos(v2s32 p) const;
-       void drawList(const ListDrawSpec &s);
-       void draw();
-
-       void launch()
-       {
-               setVisible(true);
-               Environment->setFocus(this);
-       }
-
-       bool canTakeFocus(gui::IGUIElement *e)
-       {
-               return (e && (e == this || isMyChild(e)));
-       }
+       void drawList(const ListDrawSpec &s, int phase);
+       void drawSelectedItem();
+       void drawMenu();
+       void updateSelectedItem();
 
        bool OnEvent(const SEvent& event);
        
-       // Actions returned by this are sent to the server.
-       // Server replies by updating the inventory.
-       InventoryAction* getNextAction();
-       
-private:
+protected:
        v2s32 getBasePos() const
        {
                return padding + AbsoluteRect.UpperLeftCorner;
        }
 
+       v2s16 m_menu_size;
+
        v2s32 padding;
        v2s32 spacing;
        v2s32 imgsize;
+       
+       InventoryManager *m_invmgr;
+       IGameDef *m_gamedef;
 
-       core::array<ListDrawSpec> m_draw_positions;
-
-       Inventory *m_inventory;
-       v2u32 m_screensize_old;
+       core::array<DrawSpec> m_init_draw_spec;
+       core::array<ListDrawSpec> m_draw_spec;
 
        ItemSpec *m_selected_item;
-       
-       Queue<InventoryAction*> m_actions;
+       u32 m_selected_amount;
+       bool m_selected_dragging;
+
+       v2s32 m_pointer;
+       gui::IGUIStaticText *m_tooltip_element;
 };
 
 #endif