Merge branch 'master' of github.com:erlehmann/minetest-delta

[dragonfireclient.git] / src / guiInventoryMenu.cpp

diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp
index 2d20b24aac384e358396a815076007f137d8d74f..786a4dd227d64ed4cf9f2cceba9f0e152792c5d7 100644 (file)
--- a/src/guiInventoryMenu.cpp
+++ b/src/guiInventoryMenu.cpp
@@ -20,6 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "guiInventoryMenu.h"
 #include "constants.h"
+#include "keycode.h"
+#include "strfnd.h"
 
 void drawInventoryItem(video::IVideoDriver *driver,
                gui::IGUIFont *font,
@@ -80,15 +82,13 @@ GUIInventoryMenu::GUIInventoryMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
                IMenuManager *menumgr,
                v2s16 menu_size,
-               core::array<DrawSpec> &init_draw_spec,
                InventoryContext *c,
                InventoryManager *invmgr
                ):
        GUIModalMenu(env, parent, id, menumgr),
        m_menu_size(menu_size),
        m_c(c),
-       m_invmgr(invmgr),
-       m_init_draw_spec(init_draw_spec)
+       m_invmgr(invmgr)
 {
        m_selected_item = NULL;
 }
@@ -103,7 +103,7 @@ GUIInventoryMenu::~GUIInventoryMenu()
 
 void GUIInventoryMenu::removeChildren()
 {
-       /*const core::list<gui::IGUIElement*> &children = getChildren();
+       const core::list<gui::IGUIElement*> &children = getChildren();
        core::list<gui::IGUIElement*> children_copy;
        for(core::list<gui::IGUIElement*>::ConstIterator
                        i = children.begin(); i != children.end(); i++)
@@ -115,12 +115,12 @@ void GUIInventoryMenu::removeChildren()
                        i != children_copy.end(); i++)
        {
                (*i)->remove();
-       }*/
-       {
+       }
+       /*{
                gui::IGUIElement *e = getElementFromId(256);
                if(e != NULL)
                        e->remove();
-       }
+       }*/
 }
 
 void GUIInventoryMenu::regenerateGui(v2u32 screensize)
@@ -132,9 +132,9 @@ void GUIInventoryMenu::regenerateGui(v2u32 screensize)
        spacing = v2s32(60,56);
        imgsize = v2s32(48,48);*/
 
-       padding = v2s32(screensize.X/48, screensize.X/48);
-       spacing = v2s32(screensize.X/16, screensize.X/17);
-       imgsize = v2s32(screensize.X/20, screensize.X/20);
+       padding = v2s32(screensize.Y/40, screensize.Y/40);
+       spacing = v2s32(screensize.Y/12, screensize.Y/13);
+       imgsize = v2s32(screensize.Y/15, screensize.Y/15);
 
        s32 helptext_h = 15;
 
@@ -295,7 +295,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
                        quitMenu();
                        return true;
                }
-               if(event.KeyInput.Key==KEY_KEY_I && event.KeyInput.PressedDown)
+               if(event.KeyInput.Key==getKeySetting("keymap_inventory") && event.KeyInput.PressedDown)
                {
                        quitMenu();
                        return true;
@@ -326,6 +326,10 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
                                                        inv_from->getList(m_selected_item->listname);
                                        InventoryList *list_to =
                                                        inv_to->getList(s.listname);
+                                       if(list_from == NULL)
+                                               dstream<<"from list doesn't exist"<<std::endl;
+                                       if(list_to == NULL)
+                                               dstream<<"to list doesn't exist"<<std::endl;
                                        // Indicates whether source slot completely empties
                                        bool source_empties = false;
                                        if(list_from && list_to
@@ -409,5 +413,85 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
        return Parent ? Parent->OnEvent(event) : false;
 }
 
+/*
+       Here is an example traditional set-up sequence for a DrawSpec list:
+
+       std::string furnace_inv_id = "nodemetadata:0,1,2";
+       core::array<GUIInventoryMenu::DrawSpec> draw_spec;
+       draw_spec.push_back(GUIInventoryMenu::DrawSpec(
+                       "list", furnace_inv_id, "fuel",
+                       v2s32(2, 3), v2s32(1, 1)));
+       draw_spec.push_back(GUIInventoryMenu::DrawSpec(
+                       "list", furnace_inv_id, "src",
+                       v2s32(2, 1), v2s32(1, 1)));
+       draw_spec.push_back(GUIInventoryMenu::DrawSpec(
+                       "list", furnace_inv_id, "dst",
+                       v2s32(5, 1), v2s32(2, 2)));
+       draw_spec.push_back(GUIInventoryMenu::DrawSpec(
+                       "list", "current_player", "main",
+                       v2s32(0, 5), v2s32(8, 4)));
+       setDrawSpec(draw_spec);
+
+       Here is the string for creating the same DrawSpec list (a single line,
+       spread to multiple lines here):
+       
+       GUIInventoryMenu::makeDrawSpecArrayFromString(
+                       draw_spec,
+                       "nodemetadata:0,1,2",
+                       "invsize[8,9;]"
+                       "list[current_name;fuel;2,3;1,1;]"
+                       "list[current_name;src;2,1;1,1;]"
+                       "list[current_name;dst;5,1;2,2;]"
+                       "list[current_player;main;0,5;8,4;]");
+       
+       Returns inventory menu size defined by invsize[].
+*/
+v2s16 GUIInventoryMenu::makeDrawSpecArrayFromString(
+               core::array<GUIInventoryMenu::DrawSpec> &draw_spec,
+               const std::string &data,
+               const std::string &current_name)
+{
+       v2s16 invsize(8,9);
+       Strfnd f(data);
+       while(f.atend() == false)
+       {
+               std::string type = trim(f.next("["));
+               //dstream<<"type="<<type<<std::endl;
+               if(type == "list")
+               {
+                       std::string name = f.next(";");
+                       if(name == "current_name")
+                               name = current_name;
+                       std::string subname = f.next(";");
+                       s32 pos_x = stoi(f.next(","));
+                       s32 pos_y = stoi(f.next(";"));
+                       s32 geom_x = stoi(f.next(","));
+                       s32 geom_y = stoi(f.next(";"));
+                       dstream<<"list name="<<name<<", subname="<<subname
+                                       <<", pos=("<<pos_x<<","<<pos_y<<")"
+                                       <<", geom=("<<geom_x<<","<<geom_y<<")"
+                                       <<std::endl;
+                       draw_spec.push_back(GUIInventoryMenu::DrawSpec(
+                                       type, name, subname,
+                                       v2s32(pos_x,pos_y),v2s32(geom_x,geom_y)));
+                       f.next("]");
+               }
+               else if(type == "invsize")
+               {
+                       invsize.X = stoi(f.next(","));
+                       invsize.Y = stoi(f.next(";"));
+                       dstream<<"invsize ("<<invsize.X<<","<<invsize.Y<<")"<<std::endl;
+                       f.next("]");
+               }
+               else
+               {
+                       // Ignore others
+                       std::string ts = f.next("]");
+                       dstream<<"Unknown DrawSpec: type="<<type<<", data=\""<<ts<<"\""
+                                       <<std::endl;
+               }
+       }
 
+       return invsize;
+}