Fix calculation of selected item (for not drawing it) in formspec

[dragonfireclient.git] / src / guiFormSpecMenu.cpp

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index a1da09ee1615f76817a5f767643af5d970e43cae..0cc63133245c7326ab9d305645eebba6436f8250 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -207,18 +207,18 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
        Strfnd f(m_formspec_string);
        while(f.atend() == false)
        {
-               std::string type = trim(f.next("["));
+               std::string type = trim(f.next_esc("["));
                if(type == "invsize" || type == "size")
                {
                        v2f invsize;
-                       invsize.X = stof(f.next(","));
+                       invsize.X = stof(f.next_esc(","));
                        if(type == "size")
                        {
-                               invsize.Y = stof(f.next("]"));
+                               invsize.Y = stof(f.next_esc("]"));
                        }
                        else{
-                               invsize.Y = stof(f.next(";"));
-                               f.next("]");
+                               invsize.Y = stof(f.next_esc(";"));
+                               f.next_esc("]");
                        }
                        infostream<<"Form size ("<<invsize.X<<","<<invsize.Y<<")"<<std::endl;
 
@@ -242,24 +242,24 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                }
                else if(type == "list")
                {
-                       std::string name = f.next(";");
+                       std::string name = f.next_esc(";");
                        InventoryLocation loc;
                        if(name == "context" || name == "current_name")
                                loc = m_current_inventory_location;
                        else
                                loc.deSerialize(name);
-                       std::string listname = f.next(";");
+                       std::string listname = f.next_esc(";");
                        v2s32 pos = basepos;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = stoi(f.next(","));
-                       geom.Y = stoi(f.next(";"));
+                       geom.X = stoi(f.next_esc(","));
+                       geom.Y = stoi(f.next_esc(";"));
                        infostream<<"list inv="<<name<<", listname="<<listname
                                        <<", pos=("<<pos.X<<","<<pos.Y<<")"
                                        <<", geom=("<<geom.X<<","<<geom.Y<<")"
                                        <<std::endl;
-                       std::string start_i_s = f.next("]");
+                       std::string start_i_s = f.next_esc("]");
                        s32 start_i = 0;
                        if(start_i_s != "")
                                start_i = stoi(start_i_s);
@@ -270,12 +270,12 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "image")
                {
                        v2s32 pos = basepos;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = stof(f.next(",")) * (float)imgsize.X;
-                       geom.Y = stof(f.next(";")) * (float)imgsize.Y;
-                       std::string name = f.next("]");
+                       geom.X = stof(f.next_esc(",")) * (float)imgsize.X;
+                       geom.Y = stof(f.next_esc(";")) * (float)imgsize.Y;
+                       std::string name = f.next_esc("]");
                        infostream<<"image name="<<name
                                        <<", pos=("<<pos.X<<","<<pos.Y<<")"
                                        <<", geom=("<<geom.X<<","<<geom.Y<<")"
@@ -287,12 +287,12 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "item_image")
                {
                        v2s32 pos = basepos;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = stof(f.next(",")) * (float)imgsize.X;
-                       geom.Y = stof(f.next(";")) * (float)imgsize.Y;
-                       std::string name = f.next("]");
+                       geom.X = stof(f.next_esc(",")) * (float)imgsize.X;
+                       geom.Y = stof(f.next_esc(";")) * (float)imgsize.Y;
+                       std::string name = f.next_esc("]");
                        infostream<<"item name="<<name
                                        <<", pos=("<<pos.X<<","<<pos.Y<<")"
                                        <<", geom=("<<geom.X<<","<<geom.Y<<")"
@@ -304,12 +304,12 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "background")
                {
                        v2s32 pos = basepos;
-                       pos.X += stof(f.next(",")) * (float)spacing.X - ((float)spacing.X-(float)imgsize.X)/2;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y - ((float)spacing.Y-(float)imgsize.Y)/2;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X - ((float)spacing.X-(float)imgsize.X)/2;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y - ((float)spacing.Y-(float)imgsize.Y)/2;
                        v2s32 geom;
-                       geom.X = stof(f.next(",")) * (float)spacing.X;
-                       geom.Y = stof(f.next(";")) * (float)spacing.Y;
-                       std::string name = f.next("]");
+                       geom.X = stof(f.next_esc(",")) * (float)spacing.X;
+                       geom.Y = stof(f.next_esc(";")) * (float)spacing.Y;
+                       std::string name = f.next_esc("]");
                        infostream<<"image name="<<name
                                        <<", pos=("<<pos.X<<","<<pos.Y<<")"
                                        <<", geom=("<<geom.X<<","<<geom.Y<<")"
@@ -320,8 +320,8 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                }
                else if(type == "field" || type == "textarea")
                {
-                       std::string fname = f.next(";");
-                       std::string flabel = f.next(";");
+                       std::string fname = f.next_esc(";");
+                       std::string flabel = f.next_esc(";");
 
                        if(fname.find(",") == std::string::npos && flabel.find(",") == std::string::npos)
                        {
@@ -372,14 +372,14 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 
 
                                
-                               fname = f.next(";");
-                               flabel = f.next(";");
+                               fname = f.next_esc(";");
+                               flabel = f.next_esc(";");
                                if(bp_set != 2)
                                        errorstream<<"WARNING: invalid use of positioned "<<type<<" without a size[] element"<<std::endl;
                                
                        }
 
-                       std::string odefault = f.next("]");
+                       std::string odefault = f.next_esc("]");
                        std::string fdefault;
 
                        // fdefault may contain a variable reference, which
@@ -389,6 +389,9 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                        else
                                fdefault = odefault;
 
+                       fdefault = unescape_string(fdefault);
+                       flabel = unescape_string(flabel);
+
                        FieldSpec spec = FieldSpec(
                                narrow_to_wide(fname.c_str()),
                                narrow_to_wide(flabel.c_str()),
@@ -415,9 +418,12 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                                        e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT);
                                } else {
                                        irr::SEvent evt;
-                                       evt.KeyInput.Key = KEY_END;
                                        evt.EventType = EET_KEY_INPUT_EVENT;
+                                       evt.KeyInput.Key = KEY_END;
                                        evt.KeyInput.PressedDown = true;
+                                       evt.KeyInput.Char = 0;
+                                       evt.KeyInput.Control = 0;
+                                       evt.KeyInput.Shift = 0;
                                        e->OnEvent(evt);
                                }
 
@@ -434,15 +440,17 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "label")
                {
                        v2s32 pos = padding;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
 
                        rect = core::rect<s32>(pos.X, pos.Y+((imgsize.Y/2)-15), pos.X+300, pos.Y+((imgsize.Y/2)+15));
                        
-                       std::string flabel = f.next("]");
+                       std::string flabel = f.next_esc("]");
                        if(bp_set != 2)
                                errorstream<<"WARNING: invalid use of label without a size[] element"<<std::endl;
 
+                       flabel = unescape_string(flabel);
+
                        FieldSpec spec = FieldSpec(
                                narrow_to_wide(""),
                                narrow_to_wide(flabel.c_str()),
@@ -455,19 +463,21 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "button" || type == "button_exit")
                {
                        v2s32 pos = padding;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = (stof(f.next(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
-                       pos.Y += (stof(f.next(";")) * (float)imgsize.Y)/2;
+                       geom.X = (stof(f.next_esc(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
+                       pos.Y += (stof(f.next_esc(";")) * (float)imgsize.Y)/2;
 
                        rect = core::rect<s32>(pos.X, pos.Y-15, pos.X+geom.X, pos.Y+15);
                        
-                       std::string fname = f.next(";");
-                       std::string flabel = f.next("]");
+                       std::string fname = f.next_esc(";");
+                       std::string flabel = f.next_esc("]");
                        if(bp_set != 2)
                                errorstream<<"WARNING: invalid use of button without a size[] element"<<std::endl;
 
+                       flabel = unescape_string(flabel);
+
                        FieldSpec spec = FieldSpec(
                                narrow_to_wide(fname.c_str()),
                                narrow_to_wide(flabel.c_str()),
@@ -483,20 +493,22 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "image_button" || type == "image_button_exit")
                {
                        v2s32 pos = padding;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = (stof(f.next(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
-                       geom.Y = (stof(f.next(";")) * (float)spacing.Y)-(spacing.Y-imgsize.Y);
+                       geom.X = (stof(f.next_esc(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
+                       geom.Y = (stof(f.next_esc(";")) * (float)spacing.Y)-(spacing.Y-imgsize.Y);
 
                        rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);
                        
-                       std::string fimage = f.next(";");
-                       std::string fname = f.next(";");
-                       std::string flabel = f.next("]");
+                       std::string fimage = f.next_esc(";");
+                       std::string fname = f.next_esc(";");
+                       std::string flabel = f.next_esc("]");
                        if(bp_set != 2)
                                errorstream<<"WARNING: invalid use of image_button without a size[] element"<<std::endl;
 
+                       flabel = unescape_string(flabel);
+
                        FieldSpec spec = FieldSpec(
                                narrow_to_wide(fname.c_str()),
                                narrow_to_wide(flabel.c_str()),
@@ -519,15 +531,15 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else if(type == "item_image_button")
                {
                        v2s32 pos = padding;
-                       pos.X += stof(f.next(",")) * (float)spacing.X;
-                       pos.Y += stof(f.next(";")) * (float)spacing.Y;
+                       pos.X += stof(f.next_esc(",")) * (float)spacing.X;
+                       pos.Y += stof(f.next_esc(";")) * (float)spacing.Y;
                        v2s32 geom;
-                       geom.X = (stof(f.next(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
-                       geom.Y = (stof(f.next(";")) * (float)spacing.Y)-(spacing.Y-imgsize.Y);
+                       geom.X = (stof(f.next_esc(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
+                       geom.Y = (stof(f.next_esc(";")) * (float)spacing.Y)-(spacing.Y-imgsize.Y);
                        rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);               
-                       std::string fimage = f.next(";");
-                       std::string fname = f.next(";");
-                       std::string flabel = f.next("]");
+                       std::string fimage = f.next_esc(";");
+                       std::string fname = f.next_esc(";");
+                       std::string flabel = f.next_esc("]");
                        if(bp_set != 2)
                                errorstream<<"WARNING: invalid use of item_image_button without a size[] element"<<std::endl;           
                        IItemDefManager *idef = m_gamedef->idef();
@@ -535,6 +547,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                        item.deSerialize(fimage, idef);
                        video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef);
                        std::string tooltip = item.getDefinition(idef).description;
+                       flabel = unescape_string(flabel);
                        FieldSpec spec = FieldSpec(
                                narrow_to_wide(fname.c_str()),
                                narrow_to_wide(flabel.c_str()),
@@ -556,7 +569,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                else
                {
                        // Ignore others
-                       std::string ts = f.next("]");
+                       std::string ts = f.next_esc("]");
                        infostream<<"Unknown DrawSpec: type="<<type<<", data=\""<<ts<<"\""
                                        <<std::endl;
                }
@@ -571,6 +584,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                                size.Y-rect.getHeight()-5);
                const wchar_t *text = wgettext("Left click: Move all items, Right click: Move single item");
                Environment->addStaticText(text, rect, false, true, this, 256);
+               delete[] text;
                changeCtype("C");
        }
        // If there's fields, add a Proceed button
@@ -594,7 +608,9 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 
                        v2s32 size = DesiredRect.getSize();
                        rect = core::rect<s32>(size.X/2-70, pos.Y, (size.X/2-70)+140, pos.Y+30);
-                       Environment->addButton(rect, this, 257, wgettext("Proceed"));
+                       wchar_t* text = wgettext("Proceed");
+                       Environment->addButton(rect, this, 257, text);
+                       delete[] text;
                }
                changeCtype("C");
        }
@@ -682,7 +698,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase)
                bool selected = m_selected_item
                        && m_invmgr->getInventory(m_selected_item->inventoryloc) == inv
                        && m_selected_item->listname == s.listname
-                       && m_selected_item->i == i;
+                       && m_selected_item->i == item_i;
                bool hovering = rect.isPointInside(m_pointer);
 
                if(phase == 0)