Tune caves
[oweals/minetest.git] / src / guiInventoryMenu.cpp
index bba23e719abf91a6d781ad4e1064a96c9750b167..f3346090666bb05b72f87ae590e5b864437e19a5 100644 (file)
@@ -20,23 +20,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "guiInventoryMenu.h"
 #include "constants.h"
-
-void drawInventoryItem(gui::IGUIEnvironment* env,
-               InventoryItem *item, core::rect<s32> rect,
-               const core::rect<s32> *clip)
+#include "gamedef.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 drawItemStack(video::IVideoDriver *driver,
+               gui::IGUIFont *font,
+               const ItemStack &item,
+               const core::rect<s32> &rect,
+               const core::rect<s32> *clip,
+               IGameDef *gamedef)
 {
-       gui::IGUISkin* skin = env->getSkin();
-       if (!skin)
+       if(item.empty())
                return;
-       video::IVideoDriver* driver = env->getVideoDriver();
-       
-       video::ITexture *texture = NULL;
        
-       if(item != NULL)
-       {
-               texture = item->getImage();
-       }
+       const ItemDefinition &def = item.getDefinition(gamedef->idef());
+       video::ITexture *texture = def.inventory_texture;
 
+       // Draw the inventory texture
        if(texture != NULL)
        {
                const video::SColor color(255,255,255,255);
@@ -44,30 +51,68 @@ void drawInventoryItem(gui::IGUIEnvironment* env,
                driver->draw2DImage(texture, rect,
                        core::rect<s32>(core::position2d<s32>(0,0),
                        core::dimension2di(texture->getOriginalSize())),
-                       clip, colors, false);
+                       clip, colors, true);
        }
-       else
+
+       if(def.type == ITEM_TOOL && item.wear != 0)
        {
-               video::SColor bgcolor(128,128,128,128);
-               driver->draw2DRectangle(bgcolor, rect, clip);
+               // Draw a progressbar
+               float barheight = rect.getHeight()/16;
+               float barpad_x = rect.getWidth()/16;
+               float barpad_y = rect.getHeight()/16;
+               core::rect<s32> progressrect(
+                       rect.UpperLeftCorner.X + barpad_x,
+                       rect.LowerRightCorner.Y - barpad_y - barheight,
+                       rect.LowerRightCorner.X - barpad_x,
+                       rect.LowerRightCorner.Y - barpad_y);
+
+               // Shrink progressrect by amount of tool damage
+               float wear = item.wear / 65535.0;
+               int progressmid =
+                       wear * progressrect.UpperLeftCorner.X +
+                       (1-wear) * progressrect.LowerRightCorner.X;
+
+               // Compute progressbar color
+               //   wear = 0.0: green
+               //   wear = 0.5: yellow
+               //   wear = 1.0: red
+               video::SColor color(255,255,255,255);
+               int wear_i = MYMIN(floor(wear * 600), 511);
+               wear_i = MYMIN(wear_i + 10, 511);
+               if(wear_i <= 255)
+                       color.set(255, wear_i, 255, 0);
+               else
+                       color.set(255, 255, 511-wear_i, 0);
+
+               core::rect<s32> progressrect2 = progressrect;
+               progressrect2.LowerRightCorner.X = progressmid;
+               driver->draw2DRectangle(color, progressrect2, clip);
+
+               color = video::SColor(255,0,0,0);
+               progressrect2 = progressrect;
+               progressrect2.UpperLeftCorner.X = progressmid;
+               driver->draw2DRectangle(color, progressrect2, clip);
        }
 
-       if(item != NULL)
+       if(font != NULL && item.count >= 2)
        {
-               gui::IGUIFont *font = skin->getFont();
-               std::string text = item->getText();
-               if(font && text != "")
-               {
-                       core::rect<s32> rect2(rect.UpperLeftCorner,
-                                       (core::dimension2d<u32>(rect.getWidth(), 15)));
-
-                       video::SColor bgcolor(128,0,0,0);
-                       driver->draw2DRectangle(bgcolor, rect2, clip);
-
-                       font->draw(text.c_str(), rect2,
-                                       video::SColor(255,255,255,255), false, false,
-                                       clip);
-               }
+               // Get the item count as a string
+               std::string text = itos(item.count);
+               v2u32 dim = font->getDimension(narrow_to_wide(text).c_str());
+               v2s32 sdim(dim.X,dim.Y);
+
+               core::rect<s32> rect2(
+                       /*rect.UpperLeftCorner,
+                       core::dimension2d<u32>(rect.getWidth(), 15)*/
+                       rect.LowerRightCorner - sdim,
+                       sdim
+               );
+
+               video::SColor bgcolor(128,0,0,0);
+               driver->draw2DRectangle(bgcolor, rect2, clip);
+
+               video::SColor color(255,255,255,255);
+               font->draw(text.c_str(), rect2, color, false, false, clip);
        }
 }
 
@@ -77,35 +122,75 @@ void drawInventoryItem(gui::IGUIEnvironment* env,
 
 GUIInventoryMenu::GUIInventoryMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
-               Inventory *inventory,
-               Queue<InventoryAction*> *actions,
-               int *active_menu_count):
-       GUIModalMenu(env, parent, id, active_menu_count)
+               IMenuManager *menumgr,
+               v2s16 menu_size,
+               InventoryManager *invmgr,
+               IGameDef *gamedef
+               ):
+       GUIModalMenu(env, parent, id, menumgr),
+       m_menu_size(menu_size),
+       m_invmgr(invmgr),
+       m_gamedef(gamedef)
 {
-       m_inventory = inventory;
        m_selected_item = NULL;
-       m_actions = actions;
-
-       /*m_selected_item = new ItemSpec;
-       m_selected_item->listname = "main";
-       m_selected_item->i = 3;*/
+       m_selected_amount = 0;
+       m_selected_dragging = false;
+       m_tooltip_element = NULL;
 }
 
 GUIInventoryMenu::~GUIInventoryMenu()
 {
+       removeChildren();
+
        if(m_selected_item)
                delete m_selected_item;
 }
 
+void GUIInventoryMenu::removeChildren()
+{
+       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++)
+       {
+               children_copy.push_back(*i);
+       }
+       for(core::list<gui::IGUIElement*>::Iterator
+                       i = children_copy.begin();
+                       i != children_copy.end(); i++)
+       {
+               (*i)->remove();
+       }
+       /*{
+               gui::IGUIElement *e = getElementFromId(256);
+               if(e != NULL)
+                       e->remove();
+       }*/
+       if(m_tooltip_element)
+       {
+               m_tooltip_element->remove();
+               m_tooltip_element = NULL;
+       }
+}
+
 void GUIInventoryMenu::regenerateGui(v2u32 screensize)
 {
-       padding = v2s32(24,24);
+       // Remove children
+       removeChildren();
+       
+       /*padding = v2s32(24,24);
        spacing = v2s32(60,56);
-       imgsize = v2s32(48,48);
+       imgsize = v2s32(48,48);*/
+
+       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;
 
        v2s32 size(
-               padding.X*2+spacing.X*(8-1)+imgsize.X,
-               padding.Y*2+spacing.Y*(7-1)+imgsize.Y
+               padding.X*2+spacing.X*(m_menu_size.X-1)+imgsize.X,
+               padding.Y*2+spacing.Y*(m_menu_size.Y-1)+imgsize.Y + helptext_h
        );
 
        core::rect<s32> rect(
@@ -120,22 +205,57 @@ void GUIInventoryMenu::regenerateGui(v2u32 screensize)
 
        v2s32 basepos = getBasePos();
        
-       m_draw_positions.clear();
-       m_draw_positions.push_back(ListDrawSpec("main",
+       m_draw_spec.clear();
+       for(u16 i=0; i<m_init_draw_spec.size(); i++)
+       {
+               DrawSpec &s = m_init_draw_spec[i];
+               if(s.type == "list")
+               {
+                       m_draw_spec.push_back(ListDrawSpec(s.name, s.subname,
+                                       basepos + v2s32(spacing.X*s.pos.X, spacing.Y*s.pos.Y),
+                                       s.geom));
+               }
+       }
+
+       /*
+       m_draw_spec.clear();
+       m_draw_spec.push_back(ListDrawSpec("main",
                        basepos + v2s32(spacing.X*0, spacing.Y*3), v2s32(8, 4)));
-       m_draw_positions.push_back(ListDrawSpec("craft",
+       m_draw_spec.push_back(ListDrawSpec("craft",
                        basepos + v2s32(spacing.X*3, spacing.Y*0), v2s32(3, 3)));
-       m_draw_positions.push_back(ListDrawSpec("craftresult",
+       m_draw_spec.push_back(ListDrawSpec("craftresult",
                        basepos + v2s32(spacing.X*7, spacing.Y*1), v2s32(1, 1)));
+       */
+       
+       // Add children
+       {
+               core::rect<s32> rect(0, 0, size.X-padding.X*2, helptext_h);
+               rect = rect + v2s32(size.X/2 - rect.getWidth()/2,
+                               size.Y-rect.getHeight()-15);
+               const wchar_t *text =
+               L"Left click: Move all items, Right click: Move single item";
+               Environment->addStaticText(text, rect, false, true, this, 256);
+
+               // Add tooltip
+               // Note: parent != this so that the tooltip isn't clipped by the menu rectangle
+               m_tooltip_element = Environment->addStaticText(L"",core::rect<s32>(0,0,110,18));
+               m_tooltip_element->enableOverrideColor(true);
+               m_tooltip_element->setBackgroundColor(video::SColor(255,110,130,60));
+               m_tooltip_element->setDrawBackground(true);
+               m_tooltip_element->setDrawBorder(true);
+               m_tooltip_element->setOverrideColor(video::SColor(255,255,255,255));
+               m_tooltip_element->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
+               m_tooltip_element->setWordWrap(false);
+       }
 }
 
 GUIInventoryMenu::ItemSpec GUIInventoryMenu::getItemAtPos(v2s32 p) const
 {
        core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
        
-       for(u32 i=0; i<m_draw_positions.size(); i++)
+       for(u32 i=0; i<m_draw_spec.size(); i++)
        {
-               const ListDrawSpec &s = m_draw_positions[i];
+               const ListDrawSpec &s = m_draw_spec[i];
 
                for(s32 i=0; i<s.geom.X*s.geom.Y; i++)
                {
@@ -145,48 +265,123 @@ GUIInventoryMenu::ItemSpec GUIInventoryMenu::getItemAtPos(v2s32 p) const
                        core::rect<s32> rect = imgrect + s.pos + p0;
                        if(rect.isPointInside(p))
                        {
-                               return ItemSpec(s.listname, i);
+                               return ItemSpec(s.inventoryloc, s.listname, i);
                        }
                }
        }
 
-       return ItemSpec("", -1);
+       return ItemSpec(InventoryLocation(), "", -1);
 }
 
-//void GUIInventoryMenu::drawList(const std::string &name, v2s32 pos, v2s32 geom)
-void GUIInventoryMenu::drawList(const ListDrawSpec &s)
+void GUIInventoryMenu::drawList(const ListDrawSpec &s, int phase)
 {
        video::IVideoDriver* driver = Environment->getVideoDriver();
 
-       InventoryList *ilist = m_inventory->getList(s.listname);
+       // Get font
+       gui::IGUIFont *font = NULL;
+       gui::IGUISkin* skin = Environment->getSkin();
+       if (skin)
+               font = skin->getFont();
+       
+       Inventory *inv = m_invmgr->getInventory(s.inventoryloc);
+       assert(inv);
+       InventoryList *ilist = inv->getList(s.listname);
        
        core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
-
+       
        for(s32 i=0; i<s.geom.X*s.geom.Y; i++)
        {
                s32 x = (i%s.geom.X) * spacing.X;
                s32 y = (i/s.geom.X) * spacing.Y;
                v2s32 p(x,y);
                core::rect<s32> rect = imgrect + s.pos + p;
-               InventoryItem *item = NULL;
+               ItemStack item;
                if(ilist)
                        item = ilist->getItem(i);
 
-               if(m_selected_item != NULL && m_selected_item->listname == s.listname
-                               && m_selected_item->i == i)
+               bool selected = m_selected_item
+                       && m_invmgr->getInventory(m_selected_item->inventoryloc) == inv
+                       && m_selected_item->listname == s.listname
+                       && m_selected_item->i == i;
+               bool hovering = rect.isPointInside(m_pointer);
+
+               if(phase == 0)
+               {
+                       if(hovering && m_selected_item)
+                       {
+                               video::SColor bgcolor(255,192,192,192);
+                               driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+                       }
+                       else
+                       {
+                               video::SColor bgcolor(255,128,128,128);
+                               driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+                       }
+               }
+
+               if(phase == 1)
                {
-                       driver->draw2DRectangle(video::SColor(255,255,0,0),
-                                       core::rect<s32>(rect.UpperLeftCorner - v2s32(2,2),
-                                                       rect.LowerRightCorner + v2s32(2,2)),
-                                                       &AbsoluteClippingRect);
+                       // Draw item stack
+                       if(selected)
+                       {
+                               item.takeItem(m_selected_amount);
+                       }
+                       if(!item.empty())
+                       {
+                               drawItemStack(driver, font, item,
+                                               rect, &AbsoluteClippingRect, m_gamedef);
+                       }
+
+                       // Draw tooltip
+                       std::string tooltip_text = "";
+                       if(hovering && !m_selected_item)
+                               tooltip_text = item.getDefinition(m_gamedef->idef()).description;
+                       if(tooltip_text != "")
+                       {
+                               m_tooltip_element->setVisible(true);
+                               this->bringToFront(m_tooltip_element);
+                               m_tooltip_element->setText(narrow_to_wide(tooltip_text).c_str());
+                               s32 tooltip_x = m_pointer.X + 15;
+                               s32 tooltip_y = m_pointer.Y + 15;
+                               s32 tooltip_width = m_tooltip_element->getTextWidth() + 15;
+                               s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;
+                               m_tooltip_element->setRelativePosition(core::rect<s32>(
+                                               core::position2d<s32>(tooltip_x, tooltip_y),
+                                               core::dimension2d<s32>(tooltip_width, tooltip_height)));
+                       }
                }
-               drawInventoryItem(Environment, item,
-                               rect, &AbsoluteClippingRect);
        }
 }
 
+void GUIInventoryMenu::drawSelectedItem()
+{
+       if(!m_selected_item)
+               return;
+
+       video::IVideoDriver* driver = Environment->getVideoDriver();
+
+       // Get font
+       gui::IGUIFont *font = NULL;
+       gui::IGUISkin* skin = Environment->getSkin();
+       if (skin)
+               font = skin->getFont();
+       
+       Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc);
+       assert(inv);
+       InventoryList *list = inv->getList(m_selected_item->listname);
+       assert(list);
+       ItemStack stack = list->getItem(m_selected_item->i);
+       stack.count = m_selected_amount;
+
+       core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
+       core::rect<s32> rect = imgrect + (m_pointer - imgrect.getCenter());
+       drawItemStack(driver, font, stack, rect, NULL, m_gamedef);
+}
+
 void GUIInventoryMenu::drawMenu()
 {
+       updateSelectedItem();
+
        gui::IGUISkin* skin = Environment->getSkin();
        if (!skin)
                return;
@@ -195,89 +390,372 @@ void GUIInventoryMenu::drawMenu()
        video::SColor bgcolor(140,0,0,0);
        driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
 
+       m_tooltip_element->setVisible(false);
+
        /*
                Draw items
+               Phase 0: Item slot rectangles
+               Phase 1: Item images; prepare tooltip
        */
        
-       for(u32 i=0; i<m_draw_positions.size(); i++)
+       for(int phase=0; phase<=1; phase++)
+       for(u32 i=0; i<m_draw_spec.size(); i++)
        {
-               ListDrawSpec &s = m_draw_positions[i];
-               drawList(s);
+               drawList(m_draw_spec[i], phase);
        }
 
+       /*
+               Draw dragged item stack
+       */
+       drawSelectedItem();
+
        /*
                Call base class
        */
        gui::IGUIElement::draw();
 }
 
-bool GUIInventoryMenu::OnEvent(const SEvent& event)
+void GUIInventoryMenu::updateSelectedItem()
 {
-       if(event.EventType==EET_KEY_INPUT_EVENT)
+       // If the selected stack has become empty for some reason, deselect it.
+       // If the selected stack has become smaller, adjust m_selected_amount.
+       if(m_selected_item)
        {
-               if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
+               bool selection_valid = false;
+               if(m_selected_item->isValid())
                {
-                       quitMenu();
-                       return true;
+                       Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc);
+                       if(inv)
+                       {
+                               InventoryList *list = inv->getList(m_selected_item->listname);
+                               if(list && (u32) m_selected_item->i < list->getSize())
+                               {
+                                       ItemStack stack = list->getItem(m_selected_item->i);
+                                       if(m_selected_amount > stack.count)
+                                               m_selected_amount = stack.count;
+                                       if(!stack.empty())
+                                               selection_valid = true;
+                               }
+                       }
+               }
+               if(!selection_valid)
+               {
+                       delete m_selected_item;
+                       m_selected_item = NULL;
+                       m_selected_amount = 0;
+                       m_selected_dragging = false;
+               }
+       }
+
+       // If craftresult is nonempty and nothing else is selected, select it now.
+       if(!m_selected_item)
+       {
+               for(u32 i=0; i<m_draw_spec.size(); i++)
+               {
+                       const ListDrawSpec &s = m_draw_spec[i];
+                       if(s.listname == "craftpreview")
+                       {
+                               Inventory *inv = m_invmgr->getInventory(s.inventoryloc);
+                               InventoryList *list = inv->getList("craftresult");
+                               if(list && list->getSize() >= 1 && !list->getItem(0).empty())
+                               {
+                                       m_selected_item = new ItemSpec;
+                                       m_selected_item->inventoryloc = s.inventoryloc;
+                                       m_selected_item->listname = "craftresult";
+                                       m_selected_item->i = 0;
+                                       m_selected_amount = 0;
+                                       m_selected_dragging = false;
+                                       break;
+                               }
+                       }
                }
-               if(event.KeyInput.Key==KEY_KEY_I && event.KeyInput.PressedDown)
+       }
+
+       // If craftresult is selected, keep the whole stack selected
+       if(m_selected_item && m_selected_item->listname == "craftresult")
+       {
+               Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc);
+               assert(inv);
+               InventoryList *list = inv->getList(m_selected_item->listname);
+               assert(list);
+               m_selected_amount = list->getItem(m_selected_item->i).count;
+       }
+}
+
+bool GUIInventoryMenu::OnEvent(const SEvent& event)
+{
+       if(event.EventType==EET_KEY_INPUT_EVENT)
+       {
+               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.EventType==EET_MOUSE_INPUT_EVENT
+                       && event.MouseInput.Event == EMIE_MOUSE_MOVED)
+       {
+               // Mouse moved
+               m_pointer = v2s32(event.MouseInput.X, event.MouseInput.Y);
+       }
+       if(event.EventType==EET_MOUSE_INPUT_EVENT
+                       && event.MouseInput.Event != EMIE_MOUSE_MOVED)
        {
+               // Mouse event other than movement
+
+               v2s32 p(event.MouseInput.X, event.MouseInput.Y);
+               m_pointer = p;
+
+               // Get selected item and hovered/clicked item (s)
+
+               updateSelectedItem();
+               ItemSpec s = getItemAtPos(p);
+
+               Inventory *inv_selected = NULL;
+               Inventory *inv_s = NULL;
+
+               if(m_selected_item)
+               {
+                       inv_selected = m_invmgr->getInventory(m_selected_item->inventoryloc);
+                       assert(inv_selected);
+                       assert(inv_selected->getList(m_selected_item->listname) != NULL);
+               }
+
+               u32 s_count = 0;
+
+               if(s.isValid())
+               {
+                       inv_s = m_invmgr->getInventory(s.inventoryloc);
+                       assert(inv_s);
+
+                       InventoryList *list = inv_s->getList(s.listname);
+                       if(list != NULL && (u32) s.i < list->getSize())
+                               s_count = list->getItem(s.i).count;
+                       else
+                               s.i = -1;  // make it invalid again
+               }
+
+               bool identical = (m_selected_item != NULL) && s.isValid() &&
+                       (inv_selected == inv_s) &&
+                       (m_selected_item->listname == s.listname) &&
+                       (m_selected_item->i == s.i);
+
+               // buttons: 0 = left, 1 = right, 2 = middle
+               // up/down: 0 = down (press), 1 = up (release), 2 = unknown event
+               int button = 0;
+               int updown = 2;
                if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+                       { button = 0; updown = 0; }
+               else if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
+                       { button = 1; updown = 0; }
+               else if(event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN)
+                       { button = 2; updown = 0; }
+               else if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
+                       { button = 0; updown = 1; }
+               else if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP)
+                       { button = 1; updown = 1; }
+               else if(event.MouseInput.Event == EMIE_MMOUSE_LEFT_UP)
+                       { button = 2; updown = 1; }
+
+               // Set this number to a positive value to generate a move action
+               // from m_selected_item to s.
+               u32 move_amount = 0;
+
+               // Set this number to a positive value to generate a drop action
+               // from m_selected_item.
+               u32 drop_amount = 0;
+
+               // Set this number to a positive value to generate a craft action at s.
+               u32 craft_amount = 0;
+
+               if(updown == 0)
                {
-                       v2s32 p(event.MouseInput.X, event.MouseInput.Y);
-                       //dstream<<"Mouse down at p=("<<p.X<<","<<p.Y<<")"<<std::endl;
-                       ItemSpec s = getItemAtPos(p);
-                       if(s.isValid())
+                       // Some mouse button has been pressed
+
+                       //infostream<<"Mouse button "<<button<<" pressed at p=("
+                       //      <<p.X<<","<<p.Y<<")"<<std::endl;
+
+                       m_selected_dragging = false;
+
+                       if(s.isValid() && s.listname == "craftpreview")
+                       {
+                               // Craft preview has been clicked: craft
+                               craft_amount = (button == 2 ? 10 : 1);
+                       }
+                       else if(m_selected_item == NULL)
                        {
-                               //dstream<<"Mouse down on "<<s.listname<<" "<<s.i<<std::endl;
-                               if(m_selected_item)
+                               if(s_count != 0)
                                {
-                                       InventoryList *list_from =
-                                                       m_inventory->getList(m_selected_item->listname);
-                                       InventoryList *list_to =
-                                                       m_inventory->getList(s.listname);
-                                       if(list_from && list_to
-                                                       && list_from->getItem(m_selected_item->i) != NULL)
+                                       // Non-empty stack has been clicked: select it
+                                       m_selected_item = new ItemSpec(s);
+
+                                       if(button == 1)  // right
+                                               m_selected_amount = (s_count + 1) / 2;
+                                       else if(button == 2)  // middle
+                                               m_selected_amount = MYMIN(s_count, 10);
+                                       else  // left
+                                               m_selected_amount = s_count;
+
+                                       m_selected_dragging = true;
+                               }
+                       }
+                       else  // m_selected_item != NULL
+                       {
+                               assert(m_selected_amount >= 1);
+
+                               if(s.isValid())
+                               {
+                                       // Clicked a slot: move
+                                       if(button == 1)  // right
+                                               move_amount = 1;
+                                       else if(button == 2)  // middle
+                                               move_amount = MYMIN(m_selected_amount, 10);
+                                       else  // left
+                                               move_amount = m_selected_amount;
+
+                                       if(identical)
                                        {
-                                               dstream<<"Queueing IACTION_MOVE"<<std::endl;
-                                               IMoveAction *a =
-                                                       new IMoveAction();
-                                               a->count = 1;
-                                               a->from_name = m_selected_item->listname;
-                                               a->from_i = m_selected_item->i;
-                                               a->to_name = s.listname;
-                                               a->to_i = s.i;
-                                               m_actions->push_back(a);
+                                               if(move_amount >= m_selected_amount)
+                                                       m_selected_amount = 0;
+                                               else
+                                                       m_selected_amount -= move_amount;
+                                               move_amount = 0;
                                        }
-                                       delete m_selected_item;
-                                       m_selected_item = NULL;
+                               }
+                               else if(getAbsoluteClippingRect().isPointInside(m_pointer))
+                               {
+                                       // Clicked somewhere else: deselect
+                                       m_selected_amount = 0;
                                }
                                else
                                {
-                                       /*
-                                               Select if non-NULL
-                                       */
-                                       InventoryList *list = m_inventory->getList(s.listname);
-                                       if(list->getItem(s.i) != NULL)
-                                       {
-                                               m_selected_item = new ItemSpec(s);
-                                       }
+                                       // Clicked outside of the window: drop
+                                       if(button == 1)  // right
+                                               drop_amount = 1;
+                                       else if(button == 2)  // middle
+                                               drop_amount = MYMIN(m_selected_amount, 10);
+                                       else  // left
+                                               drop_amount = m_selected_amount;
                                }
                        }
-                       else
+               }
+               else if(updown == 1)
+               {
+                       // Some mouse button has been released
+
+                       //infostream<<"Mouse button "<<button<<" released at p=("
+                       //      <<p.X<<","<<p.Y<<")"<<std::endl;
+
+                       if(m_selected_item != NULL && m_selected_dragging && s.isValid())
                        {
-                               if(m_selected_item)
+                               if(!identical)
                                {
-                                       delete m_selected_item;
-                                       m_selected_item = NULL;
+                                       // Dragged to different slot: move all selected
+                                       move_amount = m_selected_amount;
                                }
                        }
+                       else if(m_selected_item != NULL && m_selected_dragging &&
+                               !(getAbsoluteClippingRect().isPointInside(m_pointer)))
+                       {
+                               // Dragged outside of window: drop all selected
+                               drop_amount = m_selected_amount;
+                       }
+
+                       m_selected_dragging = false;
+               }
+
+               // Possibly send inventory action to server
+               if(move_amount > 0)
+               {
+                       // Send IACTION_MOVE
+
+                       assert(m_selected_item && m_selected_item->isValid());
+                       assert(s.isValid());
+
+                       assert(inv_selected && inv_s);
+                       InventoryList *list_from = inv_selected->getList(m_selected_item->listname);
+                       InventoryList *list_to = inv_s->getList(s.listname);
+                       assert(list_from && list_to);
+                       ItemStack stack_from = list_from->getItem(m_selected_item->i);
+                       ItemStack stack_to = list_to->getItem(s.i);
+
+                       // Check how many items can be moved
+                       move_amount = stack_from.count = MYMIN(move_amount, stack_from.count);
+                       ItemStack leftover = stack_to.addItem(stack_from, m_gamedef->idef());
+                       if(leftover.count == stack_from.count)
+                       {
+                               // Swap the stacks
+                               m_selected_amount -= stack_to.count;
+                       }
+                       else if(leftover.empty())
+                       {
+                               // Item fits
+                               m_selected_amount -= move_amount;
+                       }
+                       else
+                       {
+                               // Item only fits partially
+                               move_amount -= leftover.count;
+                               m_selected_amount -= move_amount;
+                       }
+
+                       infostream<<"Handing IACTION_MOVE to manager"<<std::endl;
+                       IMoveAction *a = new IMoveAction();
+                       a->count = move_amount;
+                       a->from_inv = m_selected_item->inventoryloc;
+                       a->from_list = m_selected_item->listname;
+                       a->from_i = m_selected_item->i;
+                       a->to_inv = s.inventoryloc;
+                       a->to_list = s.listname;
+                       a->to_i = s.i;
+                       m_invmgr->inventoryAction(a);
+               }
+               else if(drop_amount > 0)
+               {
+                       // Send IACTION_DROP
+
+                       assert(m_selected_item && m_selected_item->isValid());
+                       assert(inv_selected);
+                       InventoryList *list_from = inv_selected->getList(m_selected_item->listname);
+                       assert(list_from);
+                       ItemStack stack_from = list_from->getItem(m_selected_item->i);
+
+                       // Check how many items can be dropped
+                       drop_amount = stack_from.count = MYMIN(drop_amount, stack_from.count);
+                       assert(drop_amount > 0 && drop_amount <= m_selected_amount);
+                       m_selected_amount -= drop_amount;
+
+                       infostream<<"Handing IACTION_DROP to manager"<<std::endl;
+                       IDropAction *a = new IDropAction();
+                       a->count = drop_amount;
+                       a->from_inv = m_selected_item->inventoryloc;
+                       a->from_list = m_selected_item->listname;
+                       a->from_i = m_selected_item->i;
+                       m_invmgr->inventoryAction(a);
+               }
+               else if(craft_amount > 0)
+               {
+                       // Send IACTION_CRAFT
+
+                       assert(s.isValid());
+                       assert(inv_s);
+
+                       infostream<<"Handing IACTION_CRAFT to manager"<<std::endl;
+                       ICraftAction *a = new ICraftAction();
+                       a->count = craft_amount;
+                       a->craft_inv = s.inventoryloc;
+                       m_invmgr->inventoryAction(a);
+               }
+
+               // If m_selected_amount has been decreased to zero, deselect
+               if(m_selected_amount == 0)
+               {
+                       delete m_selected_item;
+                       m_selected_item = NULL;
+                       m_selected_amount = 0;
+                       m_selected_dragging = false;
                }
        }
        if(event.EventType==EET_GUI_EVENT)
@@ -287,7 +765,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
                {
                        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;
@@ -310,5 +788,88 @@ 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 InventoryLocation &current_location)
+{
+       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(";");
+                       InventoryLocation loc;
+                       if(name == "current_name")
+                               loc = current_location;
+                       else
+                               loc.deSerialize(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, loc, 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;
+}