#include "guiInventoryMenu.h"
#include "constants.h"
+#include "keycode.h"
+#include "strfnd.h"
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
+#include "log.h"
void drawInventoryItem(video::IVideoDriver *driver,
gui::IGUIFont *font,
driver->draw2DImage(texture, rect,
core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(texture->getOriginalSize())),
- clip, colors, false);
+ clip, colors, true);
}
else
{
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;
}
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++)
i != children_copy.end(); i++)
{
(*i)->remove();
- }*/
- {
+ }
+ /*{
gui::IGUIElement *e = getElementFromId(256);
if(e != NULL)
e->remove();
- }
+ }*/
}
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;
if(m_selected_item != NULL && m_selected_item->listname == s.listname
&& m_selected_item->i == i)
{
+ /*s32 border = imgsize.X/12;
+ driver->draw2DRectangle(video::SColor(255,192,192,192),
+ core::rect<s32>(rect.UpperLeftCorner - v2s32(1,1)*border,
+ rect.LowerRightCorner + v2s32(1,1)*border),
+ NULL);
+ driver->draw2DRectangle(video::SColor(255,0,0,0),
+ core::rect<s32>(rect.UpperLeftCorner - v2s32(1,1)*((border+1)/2),
+ rect.LowerRightCorner + v2s32(1,1)*((border+1)/2)),
+ NULL);*/
+ s32 border = 2;
driver->draw2DRectangle(video::SColor(255,255,0,0),
- core::rect<s32>(rect.UpperLeftCorner - v2s32(2,2),
- rect.LowerRightCorner + v2s32(2,2)),
+ core::rect<s32>(rect.UpperLeftCorner - v2s32(1,1)*border,
+ rect.LowerRightCorner + v2s32(1,1)*border),
&AbsoluteClippingRect);
}
+ video::SColor bgcolor(255,128,128,128);
+ driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+
if(item)
{
drawInventoryItem(driver, font, item,
rect, &AbsoluteClippingRect);
}
- else
- {
- video::SColor bgcolor(255,128,128,128);
- driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
- }
+
}
}
{
if(event.EventType==EET_KEY_INPUT_EVENT)
{
- if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
- {
- quitMenu();
- return true;
- }
- if(event.KeyInput.Key==KEY_KEY_I && event.KeyInput.PressedDown)
+ KeyPress kp(event.KeyInput);
+ if (event.KeyInput.PressedDown && (kp == EscapeKey ||
+ kp == getKeySetting("keymap_inventory")))
{
quitMenu();
return true;
}
if(event.EventType==EET_MOUSE_INPUT_EVENT)
{
- if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN
- || event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
+ char amount = -1;
+
+ if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+ amount = 0;
+ else if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
+ amount = 1;
+ else if(event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN)
+ amount = 10;
+
+ if(amount >= 0)
{
- bool right = (event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN);
v2s32 p(event.MouseInput.X, event.MouseInput.Y);
- //
dstream<<"Mouse down at p=("<<p.X<<","<<p.Y<<")"<<std::endl;
+ //
infostream<<"Mouse down at p=("<<p.X<<","<<p.Y<<")"<<std::endl;
ItemSpec s = getItemAtPos(p);
if(s.isValid())
{
- dstream<<"Mouse down on "<<s.inventoryname
+ infostream<<"Mouse down on "<<s.inventoryname
<<"/"<<s.listname<<" "<<s.i<<std::endl;
if(m_selected_item)
{
inv_from->getList(m_selected_item->listname);
InventoryList *list_to =
inv_to->getList(s.listname);
+ if(list_from == NULL)
+ infostream<<"from list doesn't exist"<<std::endl;
+ if(list_to == NULL)
+ infostream<<"to list doesn't exist"<<std::endl;
// Indicates whether source slot completely empties
bool source_empties = false;
if(list_from && list_to
&& list_from->getItem(m_selected_item->i) != NULL)
{
- dstream<<"Handing IACTION_MOVE to manager"<<std::endl;
+ infostream<<"Handing IACTION_MOVE to manager"<<std::endl;
IMoveAction *a = new IMoveAction();
- a->count = right ? 1 : 0;
+ a->count = amount;
a->from_inv = m_selected_item->inventoryname;
a->from_list = m_selected_item->listname;
a->from_i = m_selected_item->i;
}
// Remove selection if target was left-clicked or source
// slot was emptied
- if(right == false || source_empties)
+ if(amount == 0 || source_empties)
{
delete m_selected_item;
m_selected_item = NULL;
{
if(!canTakeFocus(event.GUIEvent.Element))
{
- dstream<<"GUIInventoryMenu: Not allowing focus change."
+ infostream<<"GUIInventoryMenu: Not allowing focus change."
<<std::endl;
// Returning true disables focus change
return true;
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 ¤t_name)
+{
+ v2s16 invsize(8,9);
+ Strfnd f(data);
+ while(f.atend() == false)
+ {
+ std::string type = trim(f.next("["));
+ //infostream<<"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(";"));
+ infostream<<"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(";"));
+ infostream<<"invsize ("<<invsize.X<<","<<invsize.Y<<")"<<std::endl;
+ f.next("]");
+ }
+ else
+ {
+ // Ignore others
+ std::string ts = f.next("]");
+ infostream<<"Unknown DrawSpec: type="<<type<<", data=\""<<ts<<"\""
+ <<std::endl;
+ }
+ }
+ return invsize;
+}
projects / oweals / minetest.git / blobdiff