Merged trunk changes from revision 2618 to 2716 into the 0.1.0 branch.

26 files changed, 517 insertions, 136 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 165fa7dc..ae779503 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -91,6 +91,7 @@ BuyDialog::BuyDialog():
     mSlider->setEventId("slider");
 
     mItemList->addActionListener(this);
+    mItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
     add(mScrollArea);
@@ -140,7 +141,8 @@ void BuyDialog::addItem(short id, int price)
 {
     ITEM_SHOP item_shop;
 
-    item_shop.name = itemDb->getItemInfo(id)->getName() + " " + toString(price) + " GP";
+    item_shop.name = itemDb->getItemInfo(id).getName() + " "
+        + toString(price) + " GP";
     item_shop.price = price;
     item_shop.id = id;
 
@@ -152,7 +154,8 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
 {
     int selectedItem = mItemList->getSelected();
 
-    if (eventId == "item") {
+    if (eventId == "item")
+    {
         // Reset amount of items and update labels
         mAmountItems = 0;
         mSlider->setValue(0);
@@ -175,23 +178,27 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
         mIncreaseButton->setEnabled(mMaxItems > 0);
         mSlider->setEnabled(mMaxItems > 0);
     }
-    else if (eventId == "quit") {
+    else if (eventId == "quit")
+    {
         setVisible(false);
         current_npc = 0;
     }
 
     // The following actions require a valid selection
-    if (selectedItem < 0 || selectedItem >= int(mShopItems->size())) {
+    if (selectedItem < 0 || selectedItem >= int(mShopItems->size()))
+    {
         return;
     }
 
     bool updateButtonsAndLabels = false;
 
-    if (eventId == "slider") {
+    if (eventId == "slider")
+    {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "+") {
+    else if (eventId == "+")
+    {
         if (mAmountItems < mMaxItems) {
             mAmountItems++;
         } else {
@@ -201,7 +208,8 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
         mSlider->setValue(double(mAmountItems)/double(mMaxItems));
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "-") {
+    else if (eventId == "-")
+    {
         if (mAmountItems > 0) {
             mAmountItems--;
         } else {
@@ -211,7 +219,7 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
         mSlider->setValue(double(mAmountItems)/double(mMaxItems));
         updateButtonsAndLabels = true;
     }
-    // TODO Actually we'd have a bug elsewhere if this check for the number
+    // TODO: Actually we'd have a bug elsewhere if this check for the number
     // of items to be bought ever fails, Bertram removed the assertions, is
     // there a better way to ensure this fails in an _obivous_ way in C++?
     else if (eventId == "buy" && (mAmountItems > 0 &&
@@ -239,7 +247,8 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 
     // If anything has changed, we have to update the buttons and labels
-    if (updateButtonsAndLabels) {
+    if (updateButtonsAndLabels)
+    {
         // Update buttons
         mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
         mDecreaseButton->setEnabled(mAmountItems > 0);
@@ -255,19 +264,21 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 }
 
-void BuyDialog::mouseClick(int x, int y, int button, int count)
+void BuyDialog::selectionChanged(const SelectionEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
-
     int selectedItem = mItemList->getSelected();
+
     if (selectedItem > -1)
     {
-        int itemId = mShopItems->at(selectedItem).id;
-        ItemInfo *itemInfo = itemDb->getItemInfo(itemId);
+        const ItemInfo &info =
+            itemDb->getItemInfo(mShopItems->at(selectedItem).id);
 
-        mItemDescLabel->setCaption("Description: " +
-                itemInfo->getDescription());
-        mItemEffectLabel->setCaption("Effect: " +
-                itemInfo->getEffect());
+        mItemDescLabel->setCaption("Description: " + info.getDescription());
+        mItemEffectLabel->setCaption("Effect: " + info.getEffect());
+    }
+    else
+    {
+        mItemDescLabel->setCaption("Description:");
+        mItemEffectLabel->setCaption("Effect:");
     }
 }
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 0ddea4c4..f5c163e1 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -27,17 +27,19 @@
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
+#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
 class ShopItems;
+class ListBox;
 
 /**
  * The buy dialog.
  *
  * \ingroup Interface
  */
-class BuyDialog : public Window, public gcn::ActionListener
+class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
 {
     public:
         /**
@@ -78,9 +80,11 @@ class BuyDialog : public Window, public gcn::ActionListener
         int getNumberOfElements();
 
         /**
-         * Mouse callback
+         * Updates the labels according to the selected item.
+         *
+         * @see SelectionListener::selectionChanged
          */
-        void mouseClick(int x, int y, int buton, int count);
+        void selectionChanged(const SelectionEvent &event);
 
         /**
          * Returns the name of item number i in the shop inventory.
@@ -92,7 +96,7 @@ class BuyDialog : public Window, public gcn::ActionListener
         gcn::Button *mQuitButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
-        gcn::ListBox *mItemList;
+        ListBox *mItemList;
         gcn::ScrollArea *mScrollArea;
         gcn::Label *mItemDescLabel;
         gcn::Label *mItemEffectLabel;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 042a5be8..3e6c4a5f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -224,6 +224,28 @@ void CharSelectDialog::logic()
     updatePlayerInfo();
 }
 
+bool CharSelectDialog::selectByName(const std::string &name)
+{
+    if (mCharInfo->isLocked())
+        return false;
+
+    unsigned int oldPos = mCharInfo->getPos();
+
+    mCharInfo->select(0);
+    do {
+        LocalPlayer *player = mCharInfo->getEntry();
+
+        if (player && player->getName() == name)
+            return true;
+
+        mCharInfo->next();
+    } while (mCharInfo->getPos());
+
+    mCharInfo->select(oldPos);
+
+    return false;
+}
+
 std::string CharSelectDialog::getName()
 {
     return mNameLabel->getCaption();
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 06881bb5..6d9d1a83 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -54,6 +54,8 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         void logic();
 
+        bool selectByName(const std::string &name);
+
         /**
          * Returns name of selected player
          */
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 2cbffde4..ec525c47 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -65,7 +65,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             continue;
         }
 
-        image = item->getInfo()->getImage();
+        image = item->getInfo().getImage();
         dynamic_cast<Graphics*>(graphics)->drawImage(
                 image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
     }
@@ -76,7 +76,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         return;
     }
 
-    image = item->getInfo()->getImage();
+    image = item->getInfo().getImage();
 
     dynamic_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
     graphics->drawText(toString(item->getQuantity()), 170, 62,
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ecf81712..33852f2b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -322,6 +322,19 @@ Gui::mousePress(int mx, int my, int button)
             }
         }
     }
+
+    if (button == gcn::MouseInput::MIDDLE)
+    {
+        // Find the being nearest to the clicked position
+        Being *target = beingManager->findNearestLivingBeing(
+                tilex, tiley,
+                20, Being::MONSTER);
+
+        if (target)
+        {
+            player_node->setTarget(target);
+        }
+    }
 }
 
 void
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 063e8836..ea0fd8c0 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -55,6 +55,8 @@ InventoryWindow::InventoryWindow():
     mDropButton = new Button("Drop", "drop", this);
 
     mItems = new ItemContainer(player_node->mInventory.get());
+    mItems->addSelectionListener(this);
+
     mInvenScroll = new ScrollArea(mItems);
     mInvenScroll->setPosition(8, 8);
     mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -123,33 +125,46 @@ void InventoryWindow::action(const std::string &eventId, gcn::Widget *widget)
     }
 }
 
-void InventoryWindow::mouseClick(int x, int y, int button, int count)
+void InventoryWindow::selectionChanged(const SelectionEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
-
     Item *item = mItems->getItem();
 
-    if (!item) {
-        return;
+    // Update name, effect and description
+    if (!item)
+    {
+        mItemNameLabel->setCaption("Name:");
+        mItemEffectLabel->setCaption("Effect:");
+        mItemDescriptionLabel->setCaption("Description:");
+    }
+    else
+    {
+        const ItemInfo& itemInfo = item->getInfo();
+        std::string SomeText;
+        SomeText = "Name: " + itemInfo.getName();
+        mItemNameLabel->setCaption(SomeText);
+        SomeText = "Effect: " + itemInfo.getEffect();
+        mItemEffectLabel->setCaption(SomeText);
+        SomeText = "Description: " + itemInfo.getDescription();
+        mItemDescriptionLabel->setCaption(SomeText);
+
+        mItemNameLabel->adjustSize();
+        mItemEffectLabel->adjustSize();
+        mItemDescriptionLabel->adjustSize();
     }
+}
 
-    // Show Name and Description
-    std::string SomeText;
-    SomeText = "Name: " + item->getInfo()->getName();
-    mItemNameLabel->setCaption(SomeText);
-    mItemNameLabel->adjustSize();
-    SomeText = "Effect: " + item->getInfo()->getEffect();
-    mItemEffectLabel->setCaption(SomeText);
-    mItemEffectLabel->adjustSize();
-    SomeText = "Description: " + item->getInfo()->getDescription();
-    mItemDescriptionLabel->setCaption(SomeText);
-    mItemDescriptionLabel->adjustSize();
+void InventoryWindow::mouseClick(int x, int y, int button, int count)
+{
+    Window::mouseClick(x, y, button, count);
 
     if (button == gcn::MouseInput::RIGHT)
     {
-        /*
-         * convert relative to the window coordinates to
-         * absolute screen coordinates
+        Item *item = mItems->getItem();
+
+        if (!item) return;
+
+        /* Convert relative to the window coordinates to
+         * absolute screen coordinates.
          */
         int mx = x + getX();
         int my = y + getY();
@@ -223,11 +238,6 @@ void InventoryWindow::loadWindowState()
     updateWidgets();
 }
 
-void InventoryWindow::setDefaultSize(int defaultX, int defaultY, int defaultWidth, int defaultHeight)
-{
-    Window::setDefaultSize(defaultX, defaultY, defaultWidth, defaultHeight);
-}
-
 void InventoryWindow::resetToDefaultSize()
 {
     Window::resetToDefaultSize();
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index da7a7ef2..d46e91e7 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -27,6 +27,7 @@
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
+#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -38,7 +39,7 @@ class ItemContainer;
  *
  * \ingroup Interface
  */
-class InventoryWindow : public Window, gcn::ActionListener
+class InventoryWindow : public Window, gcn::ActionListener, SelectionListener
 {
     public:
         /**
@@ -47,14 +48,14 @@ class InventoryWindow : public Window, gcn::ActionListener
         InventoryWindow();
 
         /**
-         * Logic (updates buttons and weight information)
+         * Logic (updates buttons and weight information).
          */
         void logic();
 
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const std::string &eventId, gcn::Widget *widget);
 
         void mouseClick(int x, int y, int button, int count);
 
@@ -64,14 +65,19 @@ class InventoryWindow : public Window, gcn::ActionListener
 
         void loadWindowState();
 
-        void setDefaultSize(int defaultX, int defaultY, int defaultWidth, int defaultHeight);
-
         void resetToDefaultSize();
 
+        /**
+         * Updates labels to currently selected item.
+         *
+         * @see SelectionListener::selectionChanged.
+         */
+        void selectionChanged(const SelectionEvent &event);
+
     private:
-        void updateButtons();    /** Updates button states */
+        void updateButtons();    /**< Updates button states. */
 
-        void updateWidgets();    /** Updates widgets size/position */
+        void updateWidgets();    /**< Updates widgets size/position. */
 
         ItemContainer *mItems;
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index c7c55fd9..5bcd000d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -25,6 +25,8 @@
 
 #include <guichan/mouseinput.hpp>
 
+#include "selectionlistener.h"
+
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
@@ -38,14 +40,14 @@
 #include "../utils/tostring.h"
 
 ItemContainer::ItemContainer(Inventory *inventory):
-    mInventory(inventory)
+    mInventory(inventory),
+    mSelectedItem(NULL)
 {
     ResourceManager *resman = ResourceManager::getInstance();
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
     if (!mSelImg) logger->error("Unable to load selection.png");
 
-    mSelectedItem = 0; // No item selected
     mMaxItems = mInventory->getLastUsedSlot() - 1; // Count from 0, usage from 2
 
     addMouseListener(this);
@@ -84,7 +86,7 @@ void ItemContainer::draw(gcn::Graphics* graphics)
     // sure somewhere else)
     if (mSelectedItem && mSelectedItem->getQuantity() <= 0)
     {
-        mSelectedItem = 0;
+        selectNone();
     }
 
     /*
@@ -111,7 +113,7 @@ void ItemContainer::draw(gcn::Graphics* graphics)
 
         // Draw item icon
         Image* image;
-        if ((image = item->getInfo()->getImage()) != NULL)
+        if ((image = item->getInfo().getImage()) != NULL)
         {
             dynamic_cast<Graphics*>(graphics)->drawImage(
                     image, itemX, itemY);
@@ -150,7 +152,28 @@ Item* ItemContainer::getItem()
 
 void ItemContainer::selectNone()
 {
-    mSelectedItem = 0;
+    setSelectedItem(NULL);
+}
+
+void ItemContainer::setSelectedItem(Item *item)
+{
+    if (mSelectedItem != item)
+    {
+        mSelectedItem = item;
+        fireSelectionChangedEvent();
+    }
+}
+
+void ItemContainer::fireSelectionChangedEvent()
+{
+    SelectionEvent event(this);
+    SelectionListeners::iterator i_end = mListeners.end();
+    SelectionListeners::iterator i;
+
+    for (i = mListeners.begin(); i != i_end; ++i)
+    {
+        (*i)->selectionChanged(event);
+    }
 }
 
 void ItemContainer::mousePress(int mx, int my, int button)
@@ -166,6 +189,6 @@ void ItemContainer::mousePress(int mx, int my, int button)
         if (index > INVENTORY_SIZE) {
             index = INVENTORY_SIZE - 1;
         }
-        mSelectedItem = mInventory->getItem(index);
+        setSelectedItem(mInventory->getItem(index));
     }
 }
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index f52f37ec..a2d5f0f7 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -27,9 +27,12 @@
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 
+#include <list>
+
 class Image;
 class Inventory;
 class Item;
+class SelectionListener;
 
 /**
  * An item container. Used to show items in inventory and trade dialog.
@@ -76,16 +79,46 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener
         Item* getItem();
 
         /**
-         * Set selected item to -1.
+         * Sets selected item to NULL.
          */
         void selectNone();
 
+        /**
+         * Adds a listener to the list that's notified each time a change to
+         * the selection occurs.
+         */
+        void addSelectionListener(SelectionListener *listener)
+        {
+            mListeners.push_back(listener);
+        }
+
+        /**
+         * Removes a listener from the list that's notified each time a change
+         * to the selection occurs.
+         */
+        void removeSelectionListener(SelectionListener *listener)
+        {
+            mListeners.remove(listener);
+        }
+
     private:
+        /**
+         * Sets the currently selected item.
+         */
+        void setSelectedItem(Item *item);
+
+        /**
+         * Sends out selection events to the list of selection listeners.
+         */
+        void fireSelectionChangedEvent();
+
         Inventory *mInventory;
         Image *mSelImg;
         Item *mSelectedItem;
 
         int mMaxItems;
+
+        std::list<SelectionListener*> mListeners;
 };
 
 #endif
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index df03b81b..14626d06 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -23,12 +23,16 @@
 
 #include "listbox.h"
 
+#include "selectionlistener.h"
+
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
+#include <guichan/mouseinput.hpp>
 
 ListBox::ListBox(gcn::ListModel *listModel):
-    gcn::ListBox(listModel)
+    gcn::ListBox(listModel),
+    mMousePressed(false)
 {
 }
 
@@ -45,8 +49,8 @@ void ListBox::draw(gcn::Graphics *graphics)
 
     // Draw rectangle below the selected list element
     if (mSelected >= 0) {
-        graphics->fillRectangle(
-                gcn::Rectangle(0, fontHeight * mSelected, getWidth(), fontHeight));
+        graphics->fillRectangle(gcn::Rectangle(0, fontHeight * mSelected,
+                                               getWidth(), fontHeight));
     }
 
     // Draw the list elements
@@ -55,3 +59,50 @@ void ListBox::draw(gcn::Graphics *graphics)
         graphics->drawText(mListModel->getElementAt(i), 1, y);
     }
 }
+
+void ListBox::setSelected(int selected)
+{
+    gcn::ListBox::setSelected(selected);
+    fireSelectionChangedEvent();
+}
+
+void ListBox::mousePress(int x, int y, int button)
+{
+    gcn::ListBox::mousePress(x, y, button);
+
+    if (button == gcn::MouseInput::LEFT && hasMouse())
+    {
+        mMousePressed = true;
+    }
+}
+
+void ListBox::mouseRelease(int x, int y, int button)
+{
+    gcn::ListBox::mouseRelease(x, y, button);
+
+    mMousePressed = false;
+}
+
+void ListBox::mouseMotion(int x, int y)
+{
+    gcn::ListBox::mouseMotion(x, y);
+
+    // Pretend mouse is pressed continuously while dragged. Causes list
+    // selection to be updated as is default in many GUIs.
+    if (mMousePressed)
+    {
+        mousePress(x, y, gcn::MouseInput::LEFT);
+    }
+}
+
+void ListBox::fireSelectionChangedEvent()
+{
+    SelectionEvent event(this);
+    SelectionListeners::iterator i_end = mListeners.end();
+    SelectionListeners::iterator i;
+
+    for (i = mListeners.begin(); i != i_end; ++i)
+    {
+        (*i)->selectionChanged(event);
+    }
+}
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 5999f7a7..c1932f54 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -26,10 +26,12 @@
 
 #include <guichan/widgets/listbox.hpp>
 
+class SelectionListener;
+
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
  * box except this one doesn't have a background, instead completely relying
- * on the scroll area.
+ * on the scroll area. It also adds selection listener functionality.
  *
  * \ingroup GUI
  */
@@ -45,6 +47,43 @@ class ListBox : public gcn::ListBox
          * Draws the list box.
          */
         void draw(gcn::Graphics *graphics);
+
+        void mousePress(int x, int y, int button);
+        void mouseRelease(int x, int y, int button);
+        void mouseMotion(int x, int y);
+
+        /**
+         * Adds a listener to the list that's notified each time a change to
+         * the selection occurs.
+         */
+        void addSelectionListener(SelectionListener *listener)
+        {
+            mListeners.push_back(listener);
+        }
+
+        /**
+         * Removes a listener from the list that's notified each time a change
+         * to the selection occurs.
+         */
+        void removeSelectionListener(SelectionListener *listener)
+        {
+            mListeners.remove(listener);
+        }
+
+        /**
+         * Sets the index of the selected element.
+         */
+        void setSelected(int selected);
+
+    private:
+        /**
+         * Sends out selection events to the list of selection listeners.
+         */
+        void fireSelectionChangedEvent();
+
+        bool mMousePressed;    /**< Keeps track of mouse pressed status. */
+
+        std::list<SelectionListener*> mListeners;
 };
 
 #endif
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index db6d4f15..69c5eb6e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -76,10 +76,10 @@ void Minimap::draw(gcn::Graphics *graphics)
                 mMapImage, getPadding(), getTitleBarHeight());
     }
 
-    Beings *beings = beingManager->getAll();
+    Beings &beings = beingManager->getAll();
     BeingIterator bi;
 
-    for (bi = beings->begin(); bi != beings->end(); bi++)
+    for (bi = beings.begin(); bi != beings.end(); bi++)
     {
         Being *being = (*bi);
         int dotSize = 1;
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index ba97d54c..46cd7e85 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -97,7 +97,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
     if (mHairStyle > 0 && mHairColor < NR_HAIR_COLORS &&
             mHairStyle < NR_HAIR_STYLES)
     {
-        int hf = 9 * mHairColor;
+        int hf = 5 * mHairColor;
         if (hf >= 0 && hf < (int)hairset[mHairStyle]->size()) {
             dynamic_cast<Graphics*>(graphics)->drawImage(
                     hairset[mHairStyle - 1]->get(hf), 35, 7);
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 59316de1..ab81f7d0 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -106,7 +106,7 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
     mBrowserBox->clearRows();
 
     // Floor item can be picked up (single option, candidate for removal)
-    std::string name = itemDb->getItemInfo(mFloorItem->getItemId())->getName();
+    std::string name = itemDb->getItemInfo(mFloorItem->getItemId()).getName();
     mBrowserBox->addRow("@@pickup|Pick Up " + name + "@@");
 
     //browserBox->addRow("@@look|Look To@@");
diff --git a/src/gui/selectionlistener.h b/src/gui/selectionlistener.h
new file mode 100644
index 00000000..a2fc6533
--- /dev/null
+++ b/src/gui/selectionlistener.h
@@ -0,0 +1,78 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: selectionlistener.h 2651 2006-09-03 16:47:48Z b_lindeijer $
+ */
+
+#ifndef _TMW_SELECTIONLISTENER_H__
+#define _TMW_SELECTIONLISTENER_H__
+
+#include <guichan/widget.hpp>
+
+/**
+ * An event that characterizes a change in the current selection.
+ *
+ * \ingroup GUI
+ */
+class SelectionEvent
+{
+    public:
+        /**
+         * Constructor.
+         */
+        SelectionEvent(gcn::Widget *source):
+            mSource(source)
+        {
+        }
+
+        /**
+         * The widget from which the event originated.
+         */
+        gcn::Widget* getSource() const
+        {
+            return mSource;
+        }
+
+    private:
+        gcn::Widget *mSource;
+};
+
+/**
+ * The listener that's notified when a selection value changes.
+ *
+ * \ingroup GUI
+ */
+class SelectionListener
+{
+    public:
+        /**
+         * Virtual destructor.
+         */
+        virtual ~SelectionListener() {}
+
+        /**
+         * Called whenever the value of the selection changes.
+         */
+        virtual void selectionChanged(const SelectionEvent &event) = 0;
+};
+
+typedef std::list<SelectionListener*> SelectionListeners;
+
+#endif
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 33813271..d6d8cad5 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -94,6 +94,7 @@ SellDialog::SellDialog():
     mSlider->setEventId("mSlider");
 
     mItemList->addActionListener(this);
+    mItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
     add(scrollArea);
@@ -141,7 +142,7 @@ void SellDialog::addItem(Item *item, int price)
 
     ITEM_SHOP item_shop;
 
-    item_shop.name = item->getInfo()->getName() + " " + toString(price) + " GP";
+    item_shop.name = item->getInfo().getName() + " " + toString(price) + " GP";
     item_shop.price = price;
     item_shop.index = item->getInvIndex();
     item_shop.id = item->getId();
@@ -155,7 +156,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 {
     int selectedItem = mItemList->getSelected();
 
-    if (eventId == "item") {
+    if (eventId == "item")
+    {
         mAmountItems = 0;
         mSlider->setValue(0);
         mDecreaseButton->setEnabled(false);
@@ -188,19 +190,22 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
     bool updateButtonsAndLabels = false;
 
-    if (eventId == "mSlider") {
+    if (eventId == "mSlider")
+    {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "+") {
+    else if (eventId == "+")
+    {
         assert(mAmountItems < mMaxItems);
         mAmountItems++;
         mSlider->setValue(double(mAmountItems)/double(mMaxItems));
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "-") {
+    else if (eventId == "-")
+    {
         assert(mAmountItems > 0);
         mAmountItems--;
 
@@ -208,7 +213,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "sell") {
+    else if (eventId == "sell")
+    {
         // Attempt sell
         assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
 
@@ -234,7 +240,8 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 
     // If anything changed, we need to update the buttons and labels
-    if (updateButtonsAndLabels) {
+    if (updateButtonsAndLabels)
+    {
         // Update labels
         mQuantityLabel->setCaption(toString(mAmountItems));
         mQuantityLabel->adjustSize();
@@ -250,16 +257,21 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
     }
 }
 
-void SellDialog::mouseClick(int x, int y, int button, int count)
+void SellDialog::selectionChanged(const SelectionEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
-
     int selectedItem = mItemList->getSelected();
+
     if (selectedItem > -1)
     {
-        mItemDescLabel->setCaption("Description: " +
-                itemDb->getItemInfo(mShopItems->at(selectedItem).id)->getDescription());
-        mItemEffectLabel->setCaption("Effect: " +
-                itemDb->getItemInfo(mShopItems->at(selectedItem).id)->getEffect());
+        const ItemInfo &info =
+            itemDb->getItemInfo(mShopItems->at(selectedItem).id);
+
+        mItemDescLabel->setCaption("Description: " + info.getDescription());
+        mItemEffectLabel->setCaption("Effect: " + info.getEffect());
+    }
+    else
+    {
+        mItemDescLabel->setCaption("Description");
+        mItemEffectLabel->setCaption("Effect");
     }
 }
diff --git a/src/gui/sell.h b/src/gui/sell.h
index be5185bd..69f8b089 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -27,19 +27,20 @@
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
+#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
 class Item;
 class ShopItems;
-
+class ListBox;
 
 /**
  * The sell dialog.
  *
  * \ingroup Interface
  */
-class SellDialog : public Window, public gcn::ActionListener
+class SellDialog : public Window, gcn::ActionListener, SelectionListener
 {
     public:
         /**
@@ -70,15 +71,17 @@ class SellDialog : public Window, public gcn::ActionListener
         void action(const std::string& eventId, gcn::Widget* widget);
 
         /**
-         * Mouse callback
+         * Updates labels according to selected item.
+         *
+         * @see SelectionListener::selectionChanged
          */
-        void mouseClick(int x, int y, int buton, int count);
+        void selectionChanged(const SelectionEvent &event);
 
     private:
         gcn::Button *mSellButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
-        gcn::ListBox *mItemList;
+        ListBox *mItemList;
         gcn::Label *mMoneyLabel;
         gcn::Label *mItemDescLabel;
         gcn::Label *mItemEffectLabel;
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d12ace75..78b10498 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,7 +43,7 @@ Setup::Setup():
     Window("Setup")
 {
     int width = 230;
-    int height = 225;
+    int height = 245;
     setContentSize(width, height);
 
     const char *buttonNames[] = {
@@ -58,7 +58,7 @@ Setup::Setup():
     }
 
     TabbedContainer *panel = new TabbedContainer();
-    panel->setDimension(gcn::Rectangle(5, 5, 220, 185));
+    panel->setDimension(gcn::Rectangle(5, 5, 220, 205));
     panel->setOpaque(false);
 
     SetupTab *tab;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 7c72975a..7a4aae03 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,7 +106,7 @@ Setup_Video::Setup_Video():
     mOpenGLEnabled(config.getValue("opengl", 0)),
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
-    mFps((int)config.getValue("fpslimit", 50)),
+    mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
@@ -121,7 +121,10 @@ Setup_Video::Setup_Video():
     mScrollLazinessField(new TextField()),
     mOriginalScrollRadius((int) config.getValue("ScrollRadius", 32)),
     mScrollRadiusSlider(new Slider(0, 128)),
-    mScrollRadiusField(new TextField())
+    mScrollRadiusField(new TextField()),
+    mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
+    mOverlayDetailSlider(new Slider(0, 2)),
+    mOverlayDetailField(new gcn::Label(""))
 {
     setOpaque(false);
 
@@ -163,6 +166,8 @@ Setup_Video::Setup_Video():
     mScrollRadiusField->setEventId("scrollradiusfield");
     mScrollLazinessSlider->setEventId("scrolllazinessslider");
     mScrollLazinessField->setEventId("scrolllazinessfield");
+    mOverlayDetailSlider->setEventId("overlaydetailslider");
+    mOverlayDetailField->setEventId("overlaydetailfield");
 
     mCustomCursorCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
@@ -173,6 +178,8 @@ Setup_Video::Setup_Video():
     mScrollRadiusField->addKeyListener(this);
     mScrollLazinessSlider->addActionListener(this);
     mScrollLazinessField->addKeyListener(this);
+    mOverlayDetailSlider->addActionListener(this);
+    mOverlayDetailField->addKeyListener(this);
 
     mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
     gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
@@ -190,6 +197,25 @@ Setup_Video::Setup_Video():
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
+    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
+    gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX");
+    overlayDetailLabel->setPosition(90, 160);
+    mOverlayDetailField->setPosition(180, 160);
+    mOverlayDetailField->setWidth(30);
+    switch (mOverlayDetail)
+    {
+        case 0:
+            mOverlayDetailField->setCaption("off");
+            break;
+        case 1:
+            mOverlayDetailField->setCaption("low");
+            break;
+        case 2:
+            mOverlayDetailField->setCaption("high");
+            break;
+    }
+    mOverlayDetailSlider->setValue(mOverlayDetail);
+
     add(scrollArea);
     add(mFsCheckBox);
     add(mOpenGLCheckBox);
@@ -205,6 +231,9 @@ Setup_Video::Setup_Video():
     add(mScrollLazinessSlider);
     add(scrollLazinessLabel);
     add(mScrollLazinessField);
+    add(mOverlayDetailSlider);
+    add(overlayDetailLabel);
+    add(mOverlayDetailField);
 }
 
 Setup_Video::~Setup_Video()
@@ -258,6 +287,7 @@ void Setup_Video::apply()
     mFullScreenEnabled = config.getValue("screen", 0);
     mCustomCursorEnabled = config.getValue("customcursor", 1);
     mOpacity = config.getValue("guialpha", 0.8);
+    mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
 }
 
@@ -288,6 +318,7 @@ void Setup_Video::cancel()
     mOpenGLCheckBox->setMarked(mOpenGLEnabled);
     mCustomCursorCheckBox->setMarked(mCustomCursorEnabled);
     mAlphaSlider->setValue(mOpacity);
+    mOverlayDetailSlider->setValue(mOverlayDetail);
 
     mScrollRadiusField->setText(toString(mOriginalScrollRadius));
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
@@ -328,6 +359,23 @@ void Setup_Video::action(const std::string &event, gcn::Widget *widget)
         mScrollLazinessField->setText(toString(val));
         config.setValue("ScrollLaziness", val);
     }
+    else if (event == "overlaydetailslider")
+    {
+        int val = (int)mOverlayDetailSlider->getValue();
+        switch (val)
+        {
+            case 0:
+                mOverlayDetailField->setCaption("off");
+                break;
+            case 1:
+                mOverlayDetailField->setCaption("low");
+                break;
+            case 2:
+                mOverlayDetailField->setCaption("high");
+                break;
+        }
+        config.setValue("OverlayDetail", val);
+    }
     else if (event == "fpslimitcheckbox")
     {
         if (mFpsCheckBox->isMarked())
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index a3fd8884..482d1c65 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -73,6 +73,10 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::Slider *mScrollRadiusSlider;
         gcn::TextField *mScrollRadiusField;
 
+        int mOverlayDetail;
+        gcn::Slider *mOverlayDetailSlider;
+        gcn::Label *mOverlayDetailField;
+
         void
         updateSliders(bool originalValues);
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 0cd49013..44efbdb1 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -58,12 +58,14 @@ TradeWindow::TradeWindow():
     mTradeButton = new Button("Trade", "trade", this);
 
     mMyItemContainer = new ItemContainer(mMyInventory.get());
+    mMyItemContainer->addSelectionListener(this);
     mMyItemContainer->setPosition(2, 2);
 
     mMyScroll = new ScrollArea(mMyItemContainer);
     mMyScroll->setPosition(8, 8);
 
     mPartnerItemContainer = new ItemContainer(mPartnerInventory.get());
+    mPartnerItemContainer->addSelectionListener(this);
     mPartnerItemContainer->setPosition(2, 58);
 
     mPartnerScroll = new ScrollArea(mPartnerItemContainer);
@@ -219,53 +221,54 @@ void TradeWindow::tradeItem(Item *item, int quantity)
     outMsg.writeLong(quantity);
 }
 
-void TradeWindow::mouseClick(int x, int y, int button, int count)
+void TradeWindow::selectionChanged(const SelectionEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
-
     Item *item;
 
-    // mMyItems selected
-    if (x >= mMyScroll->getX() + 3
-        && x <= mMyScroll->getX() + mMyScroll->getWidth() - 10
-        && y >= mMyScroll->getY() + 16
-        && y <= mMyScroll->getY() + mMyScroll->getHeight() + 15
-        && (item = mMyItemContainer->getItem()))
+    /* If an item is selected in one container, make sure no item is selected
+     * in the other container.
+     */
+    if (event.getSource() == mMyItemContainer &&
+            (item = mMyItemContainer->getItem()))
     {
-            mPartnerItemContainer->selectNone();
-    // mPartnerItems selected
+        mPartnerItemContainer->selectNone();
     }
-    else if (x >= mPartnerScroll->getX() + 3
-        && x <= mPartnerScroll->getX() + mPartnerScroll->getWidth() - 20
-        && y >= mPartnerScroll->getY() + 16
-        && y <= mPartnerScroll->getY() + mPartnerScroll->getHeight() + 15
-        && (item = mPartnerItemContainer->getItem()))
+    else if ((item = mPartnerItemContainer->getItem()))
     {
-            mMyItemContainer->selectNone();
-    } else {
-        return;
+        mMyItemContainer->selectNone();
     }
 
-    // Show Name and Description
-    std::string SomeText;
-    SomeText = "Name: " + item->getInfo()->getName();
-    mItemNameLabel->setCaption(SomeText);
-    mItemNameLabel->adjustSize();
-    SomeText = "Description: " + item->getInfo()->getDescription();
-    mItemDescriptionLabel->setCaption(SomeText);
-    mItemDescriptionLabel->adjustSize();
+    // Update name and description
+    if (!item)
+    {
+        mItemNameLabel->setCaption("Name:");
+        mItemDescriptionLabel->setCaption("Description:");
+    }
+    else
+    {
+        std::string SomeText;
+        SomeText = "Name: " + item->getInfo().getName();
+        mItemNameLabel->setCaption(SomeText);
+        mItemNameLabel->adjustSize();
+        SomeText = "Description: " + item->getInfo().getDescription();
+        mItemDescriptionLabel->setCaption(SomeText);
+        mItemDescriptionLabel->adjustSize();
+    }
 }
 
 void TradeWindow::action(const std::string &eventId, gcn::Widget *widget)
 {
     Item *item = inventoryWindow->getItem();
 
-    if (eventId == "add") {
-        if (!item) {
+    if (eventId == "add")
+    {
+        if (!item)
+        {
             return;
         }
 
-        if (mMyInventory->getFreeSlot() < 1) {
+        if (mMyInventory->getFreeSlot() < 1)
+        {
             return;
         }
 
diff --git a/src/gui/trade.h b/src/gui/trade.h
index fe60aac5..ebd05a52 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -29,6 +29,7 @@
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
+#include "selectionlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -42,7 +43,7 @@ class ScrollArea;
  *
  * \ingroup Interface
  */
-class TradeWindow : public Window, gcn::ActionListener
+class TradeWindow : public Window, gcn::ActionListener, SelectionListener
 {
     public:
         /**
@@ -102,14 +103,15 @@ class TradeWindow : public Window, gcn::ActionListener
         tradeItem(Item *item, int quantity);
 
         /**
-         * Called on mouse click.
+         * Updates the labels and makes sure only one item is selected in
+         * either my inventory or partner inventory.
          */
-        void mouseClick(int x, int y, int button, int count);
+        void selectionChanged(const SelectionEvent &event);
 
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const std::string &eventId, gcn::Widget *widget);
 
     private:
         typedef std::auto_ptr<Inventory> InventoryPtr;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 77a026fe..00b10406 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -48,9 +48,9 @@ UpdaterWindow::UpdaterWindow():
     Window("Updating..."),
     mThread(NULL), mMutex(NULL), mDownloadStatus(UPDATE_NEWS),
     mUpdateHost(""), mCurrentFile("news.txt"), mBasePath(""),
-    mStoreInMemory(true), mDownloadComplete(true), mDownloadedBytes(0),
-    mMemoryBuffer(NULL), mCurlError(new char[CURL_ERROR_SIZE]),
-    mFileIndex(0)
+    mStoreInMemory(true), mDownloadComplete(true), mUserCancel(false), 
+    mDownloadedBytes(0), mMemoryBuffer(NULL), 
+    mCurlError(new char[CURL_ERROR_SIZE]), mFileIndex(0)
 {
     mCurlError[0] = 0;
 
@@ -133,6 +133,8 @@ void UpdaterWindow::action(const std::string &eventId, gcn::Widget *widget)
 {
     if (eventId == "cancel")
     {
+        // Register the user cancel
+        mUserCancel=true;
         // Skip the updating process
         if (mDownloadStatus == UPDATE_COMPLETE)
         {
@@ -329,7 +331,15 @@ void UpdaterWindow::logic()
         case UPDATE_ERROR:
             if (mThread)
             {
-                SDL_WaitThread(mThread, NULL);
+                if(mUserCancel){
+                    // Kill the thread, because user has canceled
+                    SDL_KillThread(mThread);
+                    // Set the flag to false again
+                    mUserCancel = false;
+                }
+                else{
+                    SDL_WaitThread(mThread, NULL);
+                }
                 mThread = NULL;
             }
             addRow("");
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 8a168be8..5016036d 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -162,6 +162,11 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     bool mDownloadComplete;
 
     /**
+     * Flag that show if the user has canceled the update
+     */
+    bool mUserCancel;
+
+    /**
      * Byte count currently downloaded in mMemoryBuffer.
      */
     int mDownloadedBytes;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 2172baa8..c7860021 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -249,16 +249,18 @@ void Window::setSticky(bool sticky)
     mSticky = sticky;
 }
 
-bool Window::isSticky() {
+bool Window::isSticky()
+{
     return mSticky;
 }
 
-void Window::setVisible(bool visible) {
-    if(isSticky()) 
+void Window::setVisible(bool visible)
+{
+    if (isSticky())
     {
         gcn::Window::setVisible(true);
-    } 
-    else 
+    }
+    else
     {
         gcn::Window::setVisible(visible);
     }