Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

34 files changed, 218 insertions, 208 deletions

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index a06b9a6e..6614feb9 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -243,6 +243,9 @@ void BrowserBox::mouseMoved(gcn::MouseEvent &event)
 
 void BrowserBox::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     if (mOpaque)
     {
         graphics->setColor(gcn::Color(BGCOLOR));
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 5ad2e26c..fbbc6101 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -23,6 +23,7 @@
 
 #include "button.h"
 #include "confirm_dialog.h"
+#include "gui.h"
 #include "scrollarea.h"
 #include "textbox.h"
 
@@ -49,14 +50,16 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
     int numRows = mTextBox->getNumberOfRows();
     int width = getFont()->getWidth(title);
     int inWidth = yesButton->getWidth() + noButton->getWidth() + 5;
+    const int fontHeight = getFont()->getHeight();
 
     if (numRows > 1)
     {
-        // 15 == height of each line of text (based on font heights)
+        // fontHeight == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
-        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + noButton->getHeight());
+        setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) * 
+                       fontHeight) + noButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
-                                               3 + (numRows * 14)));
+                                               3 + (numRows * fontHeight)));
     }
     else
     {
@@ -64,16 +67,17 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
             width = getFont()->getWidth(msg);
         if (width < inWidth)
             width = inWidth;
-        setContentSize(width + 15, 30 + noButton->getHeight());
+        setContentSize(width + fontHeight, (2 * fontHeight) + 
+                       noButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
     }
 
     yesButton->setPosition(
             (mTextBox->getMinWidth() - inWidth) / 2,
-            (numRows * 14) + noButton->getHeight() - 8);
+            ((numRows - 1) * fontHeight) + noButton->getHeight() + 2);
     noButton->setPosition(
             yesButton->getX() + yesButton->getWidth() + 5,
-            (numRows * 14) + noButton->getHeight() - 8);
+            ((numRows - 1) * fontHeight) + noButton->getHeight() + 2);
 
     add(mTextArea);
     add(yesButton);
@@ -104,7 +108,5 @@ void ConfirmDialog::action(const gcn::ActionEvent &event)
 
     // Can we receive anything else anyway?
     if (event.getId() == "yes" || event.getId() == "no")
-    {
         scheduleDelete();
-    }
 }
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 42f2f110..99b36fe4 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL_mouse.h>
-
 #include <guichan/widgets/label.hpp>
 
 #include "debugwindow.h"
@@ -54,28 +52,27 @@ DebugWindow::DebugWindow():
 
     place(0, 0, mFPSLabel);
     place(3, 0, mTileMouseLabel);
-    place(0, 1, mMusicFileLabel, 2);
+    place(0, 1, mMusicFileLabel, 3);
     place(3, 1, mParticleCountLabel);
-    place(0, 2, mMapLabel, 2);
-    place(0, 3, mMiniMapLabel, 2);
+    place(0, 2, mMapLabel, 4);
+    place(0, 3, mMiniMapLabel, 4);
 
     reflowLayout(375, 0);
 }
 
 void DebugWindow::logic()
 {
+    if (!isVisible())
+        return;
+
     // Get the current mouse position
-    int mouseX, mouseY;
-    SDL_GetMouseState(&mouseX, &mouseY);
-    int mouseTileX = (mouseX + viewport->getCameraX()) / 32;
-    int mouseTileY = (mouseY + viewport->getCameraY()) / 32;
+    int mouseTileX = (viewport->getMouseX() + viewport->getCameraX()) / 32;
+    int mouseTileY = (viewport->getMouseY() + viewport->getCameraY()) / 32;
 
     mFPSLabel->setCaption(toString(fps) + " FPS");
-    mFPSLabel->adjustSize();
 
-    mTileMouseLabel->setCaption("Mouse: " +
-            toString(mouseTileX) + ", " + toString(mouseTileY));
-    mTileMouseLabel->adjustSize();
+    mTileMouseLabel->setCaption("Tile: (" + toString(mouseTileX) + ", " + 
+                                toString(mouseTileY) + ")");
 
     Map *currentMap = engine->getCurrentMap();
     if (currentMap)
@@ -83,20 +80,16 @@ void DebugWindow::logic()
         const std::string music =
             "Music: " + currentMap->getProperty("music");
         mMusicFileLabel->setCaption(music);
-        mMusicFileLabel->adjustSize();
 
         const std::string minimap =
             "MiniMap: " + currentMap->getProperty("minimap");
         mMiniMapLabel->setCaption(minimap);
-        mMiniMapLabel->adjustSize();
 
         const std::string map =
             "Map: " + currentMap->getProperty("_filename");
         mMapLabel->setCaption(map);
-        mMapLabel->adjustSize();
     }
 
     mParticleCountLabel->setCaption("Particle count: " +
                                     toString(Particle::particleCount));
-    mParticleCountLabel->adjustSize();
 }
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index e22b031b..ad3f5c83 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -78,13 +78,14 @@ EmoteContainer::~EmoteContainer()
 
 void EmoteContainer::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     int columns = getWidth() / gridWidth;
 
     // Have at least 1 column
     if (columns < 1)
-    {
         columns = 1;
-    }
 
     for (int i = 0; i < mMaxEmote ; i++)
     {
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index a0739723..df1bf74c 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -75,6 +75,15 @@ EmoteShortcutContainer::~EmoteShortcutContainer()
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+        mBackgroundImg->setAlpha(mAlpha);
+    }
+
     Graphics *g = static_cast<Graphics*>(graphics);
 
     graphics->setFont(getFont());
@@ -94,7 +103,8 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 
         if (emoteShortcut->getEmote(i))
         {
-            mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2, emoteY + 10);
+            mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2,
+                                                            emoteY + 10);
         }
 
     }
@@ -111,12 +121,6 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
             sprite->draw(g, tPosX, tPosY);
         }
     }
-
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-    {
-        mAlpha = config.getValue("guialpha", 0.8);
-        mBackgroundImg->setAlpha(mAlpha);
-    }
 }
 
 void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
@@ -129,9 +133,7 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
             const int emoteId = emoteShortcut->getEmote(index);
 
             if (index == -1)
-            {
                 return;
-            }
 
             if (emoteId)
             {
@@ -152,19 +154,17 @@ void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
     const int index = getIndexFromGrid(event.getX(), event.getY());
 
     if (index == -1)
-    {
-         return;
-    }
+        return;
 
     // Stores the selected emote if there is one.
     if (emoteShortcut->isEmoteSelected())
     {
-         emoteShortcut->setEmote(index);
-         emoteShortcut->setEmoteSelected(0);
+        emoteShortcut->setEmote(index);
+        emoteShortcut->setEmoteSelected(0);
     }
     else if (emoteShortcut->getEmote(index))
     {
-         mEmoteClicked = true;
+        mEmoteClicked = true;
     }
 }
 
@@ -175,9 +175,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
         const int index = getIndexFromGrid(event.getX(), event.getY());
 
         if (emoteShortcut->isEmoteSelected())
-        {
             emoteShortcut->setEmoteSelected(0);
-        }
 
         if (index == -1)
         {
@@ -196,9 +194,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
         }
 
         if (mEmoteClicked)
-        {
             mEmoteClicked = false;
-        }
     }
 }
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 02a0729b..9a00f7a7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -98,6 +98,9 @@ EquipmentWindow::~EquipmentWindow()
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     // Draw window graphics
     Window::draw(graphics);
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e4896063..e5450748 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -113,6 +113,9 @@ InventoryWindow::~InventoryWindow()
 
 void InventoryWindow::logic()
 {
+    if (!isVisible())
+        return;
+
     Window::logic();
 
     // It would be nicer if this update could be event based, needs some
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index eed31f7a..8285a491 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -19,14 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "itemcontainer.h"
-
-#include "itempopup.h"
-
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include <SDL_mouse.h>
+#include "itemcontainer.h"
+#include "itempopup.h"
+#include "viewport.h"
 
 #include "../graphics.h"
 #include "../inventory.h"
@@ -72,6 +70,9 @@ ItemContainer::~ItemContainer()
 
 void ItemContainer::logic()
 {
+    if (!isVisible())
+        return;
+
     gcn::Widget::logic();
 
     int i = mInventory->getLastUsedSlot() - 1; // Count from 0, usage from 2
@@ -85,18 +86,19 @@ void ItemContainer::logic()
 
 void ItemContainer::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     int columns = getWidth() / gridWidth;
 
     // Have at least 1 column
     if (columns < 1)
-    {
         columns = 1;
-    }
 
     /*
-     * mOffset is used to compensate for some weirdness that eAthena inherited from
-     * Ragnarok Online.  Inventory slots and cart slots are +2 from their actual index,
-     * while storage slots are +1.
+     * mOffset is used to compensate for some weirdness that eAthena inherited
+     * from Ragnarok Online.  Inventory slots and cart slots are +2 from their
+     * actual index, while storage slots are +1.
      */
     for (int i = mOffset; i < mInventory->getSize(); i++)
     {
@@ -105,31 +107,25 @@ void ItemContainer::draw(gcn::Graphics *graphics)
         if (!item || item->getQuantity() <= 0)
             continue;
 
-        int itemX = ((i - 2) % columns) * gridWidth;
-        int itemY = ((i - 2) / columns) * gridHeight;
+        int itemX = ((i - mOffset) % columns) * gridWidth;
+        int itemY = ((i - mOffset) / columns) * gridHeight;
 
         // Draw selection image below selected item
         if (mSelectedItemIndex == i)
-        {
-            static_cast<Graphics*>(graphics)->drawImage(
-                    mSelImg, itemX, itemY);
-        }
+            static_cast<Graphics*>(graphics)->drawImage(mSelImg, itemX, itemY);
 
         // Draw item icon
         Image* image = item->getImage();
+
         if (image)
-        {
-            static_cast<Graphics*>(graphics)->drawImage(
-                    image, itemX, itemY);
-        }
+            static_cast<Graphics*>(graphics)->drawImage(image, itemX, itemY);
 
         // Draw item caption
         graphics->setFont(getFont());
         graphics->setColor(gcn::Color(0, 0, 0));
         graphics->drawText(
                 (item->isEquipped() ? "Eq." : toString(item->getQuantity())),
-                itemX + gridWidth / 2,
-                itemY + gridHeight - 11,
+                itemX + gridWidth / 2, itemY + gridHeight - 11,
                 gcn::Graphics::CENTER);
     }
 }
@@ -258,12 +254,9 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
 
     if (item)
     {
-        int mouseX, mouseY;
-        SDL_GetMouseState(&mouseX, &mouseY);
-
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
-        mItemPopup->view(mouseX, mouseY);
+        mItemPopup->view(viewport->getMouseX(), viewport->getMouseY());
     }
     else
     {
diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
index 4060b303..bd8985dc 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/itemlinkhandler.cpp
@@ -22,10 +22,9 @@
 #include <sstream>
 #include <string>
 
-#include <SDL_mouse.h>
-
 #include "itemlinkhandler.h"
 #include "itempopup.h"
+#include "viewport.h"
 
 #include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
@@ -49,15 +48,12 @@ void ItemLinkHandler::handleLink(const std::string &link)
     if (id > 0)
     {
         const ItemInfo &iteminfo = ItemDB::get(id);
-        int mouseX, mouseY;
-
-        SDL_GetMouseState(&mouseX, &mouseY);
 
         mItemPopup->setItem(iteminfo);
 
         if (mItemPopup->isVisible())
             mItemPopup->setVisible(false);
         else
-            mItemPopup->view(mouseX, mouseY);
+            mItemPopup->view(viewport->getMouseX(), viewport->getMouseY());
     }
 }
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 48aa7c8c..0e0dd9e6 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -105,6 +105,9 @@ ItemPopup::~ItemPopup()
 
 void ItemPopup::setItem(const ItemInfo &item)
 {
+    if (item.getName() == mItemName->getCaption())
+        return;
+
     mItemName->setCaption(item.getName());
     mItemName->setForegroundColor(getColor(item.getType()));
     mItemName->setWidth(boldFont->getWidth(item.getName()));
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index e5990a28..603e7e50 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -18,7 +18,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <SDL_mouse.h>
 
 #include "itemshortcutcontainer.h"
 #include "itempopup.h"
@@ -66,6 +65,9 @@ ItemShortcutContainer::~ItemShortcutContainer()
 
 void ItemShortcutContainer::logic()
 {
+    if (!isVisible())
+        return;
+
     gcn::Widget::logic();
 
     int i = itemShortcut->getItemCount();
@@ -79,6 +81,15 @@ void ItemShortcutContainer::logic()
 
 void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
+    if (config.getValue("guialpha", 0.8) != mAlpha)
+    {
+        mAlpha = config.getValue("guialpha", 0.8);
+        mBackgroundImg->setAlpha(mAlpha);
+    }
+
     Graphics *g = static_cast<Graphics*>(graphics);
 
     graphics->setColor(gcn::Color(0, 0, 0));
@@ -102,23 +113,23 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
         Item *item =
             player_node->getInventory()->findItem(itemShortcut->getItem(i));
-        if (item) {
+
+        if (item)
+        {
             // Draw item icon.
-            const std::string label =
-                item->isEquipped() ? "Eq." : toString(item->getQuantity());
             Image* image = item->getImage();
-            if (image) {
+
+            if (image)
+            {
                 const std::string label =
                     item->isEquipped() ? "Eq." : toString(item->getQuantity());
                 g->drawImage(image, itemX, itemY);
-                g->drawText(
-                        label,
-                        itemX + mBoxWidth / 2,
-                        itemY + mBoxHeight - 14,
-                        gcn::Graphics::CENTER);
+                g->drawText(label, itemX + mBoxWidth / 2,
+                            itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
             }
         }
     }
+
     if (mItemMoved)
     {
         // Draw the item image being dragged by the cursor.
@@ -129,18 +140,11 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
             const int tPosY = mCursorPosY - (image->getHeight() / 2);
 
             g->drawImage(image, tPosX, tPosY);
-            g->drawText(
-                    toString(mItemMoved->getQuantity()),
-                    tPosX + mBoxWidth / 2,
-                    tPosY + mBoxHeight - 14,
-                    gcn::Graphics::CENTER);
+            g->drawText(toString(mItemMoved->getQuantity()),
+                        tPosX + mBoxWidth / 2, tPosY + mBoxHeight - 14,
+                        gcn::Graphics::CENTER);
         }
     }
-
-    if (config.getValue("guialpha", 0.8) != mAlpha)
-    {
-        mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
-    }
 }
 
 void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
@@ -152,10 +156,7 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
             const int index = getIndexFromGrid(event.getX(), event.getY());
             const int itemId = itemShortcut->getItem(index);
 
-            if (index == -1)
-                return;
-
-            if (itemId < 0)
+            if (index == -1 || itemId < 0)
                 return;
 
             Item *item = player_node->getInventory()->findItem(itemId);
@@ -166,7 +167,8 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
                 itemShortcut->removeItem(index);
             }
         }
-        if (mItemMoved) {
+        if (mItemMoved)
+        {
             mCursorPosX = event.getX();
             mCursorPosY = event.getY();
         }
@@ -176,6 +178,7 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
+
     if (index == -1)
         return;
 
@@ -199,12 +202,9 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
         if (!item)
             return;
 
-        /* Convert relative to the window coordinates to absolute screen
-         * coordinates.
-         */
-        int mx, my;
-        SDL_GetMouseState(&mx, &my);
-        viewport->showPopup(mx, my, item);
+        // Convert relative to the window coordinates to absolute screen
+        // coordinates.
+        viewport->showPopup(viewport->getMouseX(), viewport->getMouseY(), item);
     }
 }
 
@@ -230,6 +230,7 @@ void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
         {
             itemShortcut->useItem(index);
         }
+
         if (mItemClicked)
             mItemClicked = false;
     }
@@ -241,22 +242,16 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     const int index = getIndexFromGrid(event.getX(), event.getY());
     const int itemId = itemShortcut->getItem(index);
 
-    if (index == -1)
-         return;
-
-    if (itemId < 0)
+    if (index == -1 || itemId < 0)
         return;
 
     Item *item = player_node->getInventory()->findItem(itemId);
 
     if (item)
     {
-        int mouseX, mouseY;
-        SDL_GetMouseState(&mouseX, &mouseY);
-
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
-        mItemPopup->view(mouseX, mouseY);
+        mItemPopup->view(viewport->getMouseX(), viewport->getMouseY());
     }
     else
     {
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 64c8be85..2f7d2f7f 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -38,7 +38,7 @@ ListBox::ListBox(gcn::ListModel *listModel):
 
 void ListBox::draw(gcn::Graphics *graphics)
 {
-    if (!mListModel)
+    if (!mListModel || !isVisible())
         return;
 
     if (config.getValue("guialpha", 0.8) != mAlpha)
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 0dcc999f..97553586 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -89,7 +89,6 @@ void MenuWindow::draw(gcn::Graphics *graphics)
     drawChildren(graphics);
 }
 
-
 void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 55c6b3c5..57fd7457 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -112,6 +112,9 @@ void Minimap::draw(gcn::Graphics *graphics)
 {
     setVisible(mShow);
 
+    if (!isVisible())
+        return;
+
     Window::draw(graphics);
 
     if (!mShow)
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 4df3fa07..d73c7d7c 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -22,6 +22,7 @@
 #include <guichan/font.hpp>
 
 #include "button.h"
+#include "gui.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
 #include "textbox.h"
@@ -46,14 +47,15 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     mTextBox->setTextWrapped(msg, 260);
 
     int numRows = mTextBox->getNumberOfRows();
+    const int fontHeight = getFont()->getHeight();
 
     if (numRows > 1)
     {
-        // 15 == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
-        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight());
+        setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) * 
+                       fontHeight) + okButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
-                                               3 + (numRows * 14)));
+                                               3 + (numRows * fontHeight)));
     }
     else
     {
@@ -62,12 +64,12 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
             width = getFont()->getWidth(msg);
         if (width < okButton->getWidth())
             width = okButton->getWidth();
-        setContentSize(width + 15, 30 + okButton->getHeight());
+        setContentSize(width + fontHeight, 30 + okButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
     }
 
     okButton->setPosition((mTextBox->getMinWidth() - okButton->getWidth()) / 2,
-                          (numRows * 14) + okButton->getHeight() - 8);
+                          ((numRows - 1) * fontHeight) + okButton->getHeight() + 2);
 
     add(mTextArea);
     add(okButton);
@@ -92,7 +94,6 @@ void OkDialog::action(const gcn::ActionEvent &event)
     }
 
     // Can we receive anything else anyway?
-    if (event.getId() == "ok") {
+    if (event.getId() == "ok")
         scheduleDelete();
-    }
 }
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index f99ce6ef..7223c453 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -78,6 +78,9 @@ PlayerBox::~PlayerBox()
 
 void PlayerBox::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     if (mPlayer)
     {
         // Draw character
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 62e44794..4577baee 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -73,7 +73,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
     {
         case Being::PLAYER:
             {
-                // Players can be traded with. Later also attack, follow and
+                // Players can be traded with. Later also follow and
                 // add as buddy will be options in this menu.
                 const std::string &name = being->getName();
                 mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 2c1b22da..5526589c 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -107,6 +107,7 @@ class ProgressBar : public gcn::Widget
         Uint8 mRed, mGreen, mBlue;
         Uint8 mRedToGo, mGreenToGo, mBlueToGo;
         std::string mText;
+        bool mUpdated;
 
         static ImageRect mBorder;
         static int mInstances;
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index c8ae2fad..52ceb837 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -69,6 +69,9 @@ RadioButton::~RadioButton()
 
 void RadioButton::drawBox(gcn::Graphics* graphics)
 {
+    if (!isVisible())
+        return;
+
     if (config.getValue("guialpha", 0.8) != mAlpha)
     {
         mAlpha = config.getValue("guialpha", 0.8);
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 70504a03..44ef929b 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -145,6 +145,9 @@ void ScrollArea::init()
 
 void ScrollArea::logic()
 {
+    if (!isVisible())
+        return;
+
     gcn::ScrollArea::logic();
     gcn::Widget *content = getContent();
 
@@ -167,6 +170,9 @@ void ScrollArea::logic()
 
 void ScrollArea::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     if (mVBarVisible)
     {
         drawUpButton(graphics);
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index c0c8f7a1..64c97246 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -57,7 +57,7 @@ void ShopListBox::setPlayersMoney(int money)
 
 void ShopListBox::draw(gcn::Graphics *gcnGraphics)
 {
-    if (!mListModel)
+    if (!mListModel || !isVisible())
         return;
 
     if (config.getValue("guialpha", 0.8) != mAlpha)
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 74609fa1..f149266b 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -38,34 +38,28 @@ ShortcutContainer::ShortcutContainer():
 void ShortcutContainer::widgetResized(const gcn::Event &event)
 {
     mGridWidth = getWidth() / mBoxWidth;
+
     if (mGridWidth < 1)
-    {
         mGridWidth = 1;
-    }
-
-    setHeight((mMaxItems / mGridWidth +
-                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 
     mGridHeight = getHeight() / mBoxHeight;
+
     if (mGridHeight < 1)
-    {
         mGridHeight = 1;
-    }
+
+    setHeight((mMaxItems / mGridWidth +
+              (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 }
 
 int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
-    const gcn::Rectangle tRect = gcn::Rectangle(
-        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-    if (!tRect.isPointInRect(pointX, pointY))
-    {
-        return -1;
-    }
-    const int index = ((pointY / mBoxHeight) * mGridWidth) +
-        pointX / mBoxWidth;
-    if (index >= mMaxItems)
-    {
-        return -1;
-    }
+    const gcn::Rectangle tRect = gcn::Rectangle(0, 0, mGridWidth * mBoxWidth,
+                                                mGridHeight * mBoxHeight);
+
+    int index = ((pointY / mBoxHeight) * mGridWidth) + pointX / mBoxWidth;
+
+    if (!tRect.isPointInRect(pointX, pointY) || index >= mMaxItems)
+        index = -1;
+
     return index;
 }
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index f63b02c3..9ee91166 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -31,7 +31,8 @@
 #include "../utils/gettext.h"
 
 SpeechBubble::SpeechBubble():
-    Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml")
+    Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml"),
+    mText("")
 {
     setContentSize(140, 46);
     setShowTitle(false);
@@ -66,10 +67,13 @@ void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color)
     mCaption->setForegroundColor(color);
 }
 
-void SpeechBubble::setText(std::string mText, bool showName)
+void SpeechBubble::setText(std::string text, bool showName)
 {
+    if ((text == mText) && (mCaption->getWidth() <= mSpeechBox->getMinWidth()))
+        return;
+
     int width = mCaption->getWidth();
-    mSpeechBox->setTextWrapped(mText, 130 > width ? 130 : width);
+    mSpeechBox->setTextWrapped(text, 130 > width ? 130 : width);
 
     const int fontHeight = getFont()->getHeight();
     const int numRows = showName ? mSpeechBox->getNumberOfRows() + 1 :
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 6daff8fb..573e61f0 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -34,11 +34,12 @@ class SpeechBubble : public Window
 
         void setCaption(const std::string &name,
                         const gcn::Color &color = 0x000000);
-        void setText(std::string mText, bool showName = true);
+        void setText(std::string text, bool showName = true);
         void setLocation(int x, int y);
         unsigned int getNumRows();
 
     private:
+        std::string mText;
         gcn::Label *mCaption;
         TextBox *mSpeechBox;
         ScrollArea *mSpeechArea;
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 0528a439..ff0c8563 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -255,6 +255,9 @@ void StatusWindow::update()
 
 void StatusWindow::draw(gcn::Graphics *g)
 {
+    if (!isVisible())
+        return;
+
     update();
 
     Window::draw(g);
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 68f36329..1371a78e 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -264,7 +264,7 @@ void GuiTable::installActionListeners()
 // -- widget ops
 void GuiTable::draw(gcn::Graphics* graphics)
 {
-    if (!mModel)
+    if (!mModel || !isVisible())
         return;
 
     if (config.getValue("guialpha", 0.8) != mAlpha)
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 99a95a2e..0e839b1f 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -83,7 +83,11 @@ TextField::~TextField()
 
 void TextField::draw(gcn::Graphics *graphics)
 {
-    if (isFocused()) {
+    if (!isVisible())
+        return;
+
+    if (isFocused())
+    {
         drawCaret(graphics,
                 getFont()->getWidth(mText.substr(0, mCaretPosition)) -
                 mXScroll);
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 2f6007a9..2deabbf2 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -117,7 +117,6 @@ void TradeWindow::widgetResized(const gcn::Event &event)
     Window::widgetResized(event);
 }
 
-
 void TradeWindow::addMoney(int amount)
 {
     mMoneyLabel->setCaption(strprintf(_("You get %s."),
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index cba52cf9..7f97d98c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -43,6 +43,8 @@ extern volatile int tick_time;
 
 Viewport::Viewport():
     mMap(0),
+    mMouseX(0),
+    mMouseY(0),
     mPixelViewX(0.0f),
     mPixelViewY(0.0f),
     mTileViewX(0),
@@ -150,18 +152,14 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     int viewYmax = (mMap->getHeight() * 32) - graphics->getHeight();
     if (mMap)
     {
-        if (mPixelViewX < 0) {
+        if (mPixelViewX < 0)
             mPixelViewX = 0;
-        }
-        if (mPixelViewY < 0) {
+        if (mPixelViewY < 0)
             mPixelViewY = 0;
-        }
-        if (mPixelViewX > viewXmax) {
+        if (mPixelViewX > viewXmax)
             mPixelViewX = viewXmax;
-        }
-        if (mPixelViewY > viewYmax) {
+        if (mPixelViewY > viewYmax)
             mPixelViewY = viewYmax;
-        }
     }
 
     mTileViewX = (int) (mPixelViewX + 16) / 32;
@@ -177,11 +175,10 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
         if (mShowDebugPath)
         {
             // Get the current mouse position
-            int mouseX, mouseY;
-            SDL_GetMouseState(&mouseX, &mouseY);
+            SDL_GetMouseState(&mMouseX, &mMouseY);
 
-            int mouseTileX = mouseX / 32 + mTileViewX;
-            int mouseTileY = mouseY / 32 + mTileViewY;
+            int mouseTileX = mMouseX / 32 + mTileViewX;
+            int mouseTileY = mMouseY / 32 + mTileViewY;
 
             Path debugPath = mMap->findPath(player_node->mX, player_node->mY,
                                             mouseTileX, mouseTileY);
@@ -206,7 +203,6 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
         player_node->setName(player_node->getName());
     }
 
-
     // Draw text
     if (textManager)
     {
@@ -217,8 +213,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
-        (*i)->drawSpeech(-(int) mPixelViewX, -(int) mPixelViewY);
-        (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
+        (*i)->drawSpeech((int) mPixelViewX, (int) mPixelViewY);
+        (*i)->drawEmotion(graphics, (int) mPixelViewX, (int) mPixelViewY);
     }
 
     if (miniStatusWindow)
@@ -235,14 +231,13 @@ void Viewport::logic()
     if (!mMap || !player_node)
         return;
 
-    int mouseX, mouseY;
-    Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
+    Uint8 button = SDL_GetMouseState(&mMouseX, &mMouseY);
 
     if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
             mWalkTime != player_node->mWalkTime)
     {
-        player_node->setDestination(mouseX / 32 + mTileViewX,
-                                    mouseY / 32 + mTileViewY);
+        player_node->setDestination(mMouseX / 32 + mTileViewX,
+                                    mMouseY / 32 + mTileViewY);
         mWalkTime = player_node->mWalkTime;
     }
 }
@@ -349,9 +344,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                                                               Being::MONSTER);
 
         if (target)
-        {
              player_node->setTarget(target);
-        }
     }
 }
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 522ea734..6e7a2370 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -115,29 +115,41 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int getCameraY() const { return (int) mPixelViewY; }
 
         /**
+         * Returns mouse x in pixels.
+         */
+        int getMouseX() const { return mMouseX; }
+
+        /**
+         * Returns mouse y in pixels.
+         */
+        int getMouseY() const { return mMouseY; }
+
+        /**
          * Changes viewpoint by relative pixel coordinates.
          */
         void scrollBy(float x, float y) { mPixelViewX += x; mPixelViewY += y; }
 
     private:
-        Map *mMap;                 /**< The current map. */
+        Map *mMap;                   /**< The current map. */
 
         int mScrollRadius;
         int mScrollLaziness;
         int mScrollCenterOffsetX;
         int mScrollCenterOffsetY;
-        float mPixelViewX;              /**< Current viewpoint in pixels. */
-        float mPixelViewY;              /**< Current viewpoint in pixels. */
+        int mMouseX;                 /**< Current mouse position in pixels. */
+        int mMouseY;                 /**< Current mouse position in pixels. */
+        float mPixelViewX;           /**< Current viewpoint in pixels. */
+        float mPixelViewY;           /**< Current viewpoint in pixels. */
         int mTileViewX;              /**< Current viewpoint in tiles. */
         int mTileViewY;              /**< Current viewpoint in tiles. */
-        bool mShowDebugPath;       /**< Show a path from player to pointer. */
+        bool mShowDebugPath;         /**< Show a path from player to pointer. */
 
         bool mPlayerFollowMouse;
         int mWalkTime;
 
-        PopupMenu *mPopupMenu;     /**< Popup menu. */
+        PopupMenu *mPopupMenu;       /**< Popup menu. */
 };
 
-extern Viewport *viewport;                    /**< The viewport */
+extern Viewport *viewport;           /**< The viewport */
 
 #endif
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 92837603..eef9ae33 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -74,12 +74,15 @@ DropDown::DropDown(gcn::ListModel *listModel, gcn::ScrollArea *scrollArea,
         int gridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
-                skin.grid[a] = boxBorder->getSubImage(
-                        gridx[x], gridy[y],
-                        gridx[x + 1] - gridx[x] + 1,
-                        gridy[y + 1] - gridy[y] + 1);
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                skin.grid[a] = boxBorder->getSubImage(gridx[x], gridy[y], 
+                                                      gridx[x + 1] - 
+                                                      gridx[x] + 1,
+                                                      gridy[y + 1] - 
+                                                      gridy[y] + 1);
                 skin.grid[a]->setAlpha(mAlpha);
                 a++;
             }
@@ -108,16 +111,15 @@ DropDown::~DropDown()
 
 void DropDown::draw(gcn::Graphics* graphics)
 {
+    if (!isVisible())
+        return;
+
     int h;
 
     if (mDroppedDown)
-    {
         h = mFoldedUpHeight;
-    }
     else
-    {
         h = getHeight();
-    }
 
     if (config.getValue("guialpha", 0.8) != mAlpha)
     {
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 21402c89..3a79dd91 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -35,7 +35,7 @@
 int Tab::mInstances = 0;
 float Tab::mAlpha = config.getValue("guialpha", 0.8);
 
-enum{
+enum {
     TAB_STANDARD,    // 0
     TAB_HIGHLIGHTED, // 1
     TAB_SELECTED,     // 2
@@ -94,8 +94,10 @@ void Tab::init()
         {
             tab[mode] = resman->getImage(data[mode].file);
             a = 0;
-            for (y = 0; y < 3; y++) {
-                for (x = 0; x < 3; x++) {
+            for (y = 0; y < 3; y++)
+            {
+                for (x = 0; x < 3; x++)
+                {
                     tabImg[mode].grid[a] = tab[mode]->getSubImage(
                             data[x].gridX, data[y].gridY,
                             data[x + 1].gridX - data[x].gridX + 1,
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index ce11fe69..a8f2b6f0 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -40,9 +40,8 @@ Tab* TabbedArea::getTab(const std::string &name)
     while (itr != itr_end)
     {
         if ((*itr).first->getCaption() == name)
-        {
             return static_cast<Tab*>((*itr).first);
-        }
+
         ++itr;
     }
     return NULL;
@@ -51,9 +50,7 @@ Tab* TabbedArea::getTab(const std::string &name)
 void TabbedArea::draw(gcn::Graphics *graphics)
 {
     if (mTabs.empty())
-    {
         return;
-    }
 
     drawChildren(graphics);
 }
@@ -64,9 +61,8 @@ gcn::Widget* TabbedArea::getWidget(const std::string &name)
     while (itr != itr_end)
     {
         if ((*itr).first->getCaption() == name)
-        {
             return (*itr).second;
-        }
+
         ++itr;
     }
 
@@ -91,9 +87,7 @@ void TabbedArea::addTab(Tab *tab, gcn::Widget *widget)
     mTabs.push_back(std::pair<Tab*, gcn::Widget*>(tab, widget));
 
     if (!mSelectedTab)
-    {
         setSelectedTab(tab);
-    }
 
     adjustTabPositions();
     adjustSize();
@@ -107,15 +101,10 @@ void TabbedArea::removeTab(Tab *tab)
     {
         int index = getSelectedTabIndex();
 
-        if (index == (int)mTabs.size() - 1
-                 && mTabs.size() == 1)
-        {
+        if (index == (int)mTabs.size() - 1 && mTabs.size() == 1)
             tabIndexToBeSelected = -1;
-        }
         else
-        {
             tabIndexToBeSelected = index - 1;
-        }
     }
 
     TabContainer::iterator iter;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index ee5613bc..48229ec8 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -168,6 +168,9 @@ void Window::setWindowContainer(WindowContainer *wc)
 
 void Window::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     Graphics *g = static_cast<Graphics*>(graphics);
 
     g->drawImageRect(0, 0, getWidth(), getHeight(), border);