From aa4229cbb9f2b264ca96c3beedc66b1c79ccc1f5 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 5 Mar 2009 23:13:55 -0700
Subject: Made some optimizations based on some profiling done by Octalot, as
 well as some other optimizations that I could see that cut down on some
 unneeded redraws, which in turn improved frame rates slightly.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/window.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 516b4138..e285c3c4 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -169,6 +169,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);
-- 
cgit v1.2.3-70-g09d2


From 6ea994477c58912785729e7922eb90862a1ab13c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 6 Mar 2009 08:50:11 -0700
Subject: Cut down on redundant constant int declarations in the windows
 skinning code. While this shouldn't do too much, if anything, for
 performance, it makes maintenence easier in the future if only one set of
 ints needs to be modified rather than 9 when they do the same thing.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/window.cpp | 74 +++++-------------------------------------------------
 1 file changed, 6 insertions(+), 68 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e285c3c4..0869368d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -569,7 +569,7 @@ void Window::loadSkin(const std::string &filename)
     if (!skinSetImage.empty())
     {
         logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
-        dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png");
+        dBorders = resman->getImage("graphics/gui/" + skinSetImage);
     }
     else
     {
@@ -593,104 +593,42 @@ void Window::loadSkin(const std::string &filename)
             for_each_xml_child_node(partNode, widgetNode)
             {
                 if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
-                {
                     continue;
-                }
 
                 std::string partType;
                 partType = XML::getProperty(partNode, "type", "unknown");
                 // TOP ROW
-                if (partType == "top-left-corner")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
+                const int xPos = XML::getProperty(partNode, "xpos", 0);
+                const int yPos = XML::getProperty(partNode, "ypos", 0);
+                const int width = XML::getProperty(partNode, "width", 1);
+                const int height = XML::getProperty(partNode, "height", 1);
 
+                if (partType == "top-left-corner")
                     border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "top-edge")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "top-right-corner")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
 
                 // MIDDLE ROW
                 else if (partType == "left-edge")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "bg-quad")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "right-edge")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
 
                 // BOTTOM ROW
                 else if (partType == "bottom-left-corner")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "bottom-edge")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
                 else if (partType == "bottom-right-corner")
-                {
-                    const int xPos = XML::getProperty(partNode, "xpos", 0);
-                    const int yPos = XML::getProperty(partNode, "ypos", 0);
-                    const int width = XML::getProperty(partNode, "width", 1);
-                    const int height = XML::getProperty(partNode, "height", 1);
-
                     border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
-                }
 
                 // Part is of an uknown type.
                 else
-                {
                     logger->log("Window::loadSkin(): Unknown Part Type '%s'", partType.c_str());
-                }
             }
         }
         // Widget is of an uknown type.
-- 
cgit v1.2.3-70-g09d2


From 40883938ceb60b0999f9b693dadbe2239e83f139 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 9 Mar 2009 01:23:14 -0600
Subject: Got rid of an ugly and unified interface breaking cancel button in
 favor of adding overridable close functionality to the Window class. Now, if
 you need a close button, but need to do something different, or in addition
 to the Window close functionality, you can override it and do that action.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/storagewindow.cpp | 9 ++-------
 src/gui/storagewindow.h   | 2 +-
 src/gui/window.cpp        | 7 ++++++-
 src/gui/window.h          | 2 ++
 src/inventory.cpp         | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 856f9166..d3bc7ef8 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -59,11 +59,11 @@ StorageWindow::StorageWindow(Network *network, int invSize):
 {
     setWindowName("Storage");
     setResizable(true);
+    setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 375, 300);
 
-    mCancelButton = new Button(_("Close"), "close", this);
     mStoreButton = new Button(_("Store"), "store", this);
     mRetrieveButton = new Button(_("Retrieve"), "retrieve", this);
 
@@ -85,7 +85,6 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     place(0, 0, mSlotsLabel).setPadding(3);
     place(1, 0, mSlotsBar, 3);
     place(0, 1, mInvenScroll, 4, 4);
-    place(0, 5, mCancelButton);
     place(2, 5, mStoreButton);
     place(3, 5, mRetrieveButton);
 
@@ -121,11 +120,7 @@ void StorageWindow::logic()
 
 void StorageWindow::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "close")
-    {
-        close();
-    }
-    else if (event.getId() == "store")
+    if (event.getId() == "store")
     {
         Item *item = inventoryWindow->getSelectedItem();
 
diff --git a/src/gui/storagewindow.h b/src/gui/storagewindow.h
index 23142ac1..86451bfe 100644
--- a/src/gui/storagewindow.h
+++ b/src/gui/storagewindow.h
@@ -88,7 +88,7 @@ class StorageWindow : public Window, gcn::ActionListener, gcn::SelectionListener
 
         std::string mSlots;
         std::string mUsedSlots;
-        gcn::Button *mCancelButton, *mStoreButton, *mRetrieveButton;
+        gcn::Button *mStoreButton, *mRetrieveButton;
         gcn::ScrollArea *mInvenScroll;
 
         gcn::Label *mSlotsLabel;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 0869368d..2b422f86 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -328,7 +328,7 @@ void Window::mousePressed(gcn::MouseEvent &event)
 
             if (closeButtonRect.isPointInRect(x, y))
             {
-                setVisible(false);
+                close();
             }
         }
 
@@ -337,6 +337,11 @@ void Window::mousePressed(gcn::MouseEvent &event)
     }
 }
 
+void Window::close()
+{
+    setVisible(false);
+}
+
 void Window::mouseReleased(gcn::MouseEvent &event)
 {
     if (mGrip && mouseResize)
diff --git a/src/gui/window.h b/src/gui/window.h
index a4f56e05..3a92ac17 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -276,6 +276,8 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         ContainerPlacer getPlacer(int x, int y);
 
+        virtual void close();
+
     protected:
         /** The window container windows add themselves to. */
         static WindowContainer *windowContainer;
diff --git a/src/inventory.cpp b/src/inventory.cpp
index d72e0e4a..3d1a4786 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -128,7 +128,7 @@ bool Inventory::contains(Item *item) const
 
 int Inventory::getFreeSlot() const
 {
-    Item **i = std::find_if(mItems, mItems + mSize,
+    Item **i = std::find_if(mItems + mOffset, mItems + mSize,
             std::not1(SlotUsed()));
     return (i == mItems + mSize) ? -1 : (i - mItems);
 }
-- 
cgit v1.2.3-70-g09d2


From 443a10db52e909c4c2a33543795ec8837547e973 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 08:11:48 -0600
Subject: Made it so that when windows load previous states, they are never
 smaller than the minimum width and height (a check that should have been
 enforced in the first place), as well as modified the NPC list and text
 dialogs to remember where they were when they were moved or resized last.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp      | 11 +++++++++--
 src/gui/npc_text.h        | 13 +++++++++++++
 src/gui/npclistdialog.cpp |  6 +++++-
 src/gui/npclistdialog.h   |  3 ++-
 src/gui/window.cpp        | 41 +++++++++++++++++++++++++----------------
 src/gui/window.h          |  6 ++++++
 src/net/npchandler.cpp    |  3 +--
 7 files changed, 61 insertions(+), 22 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index ec8a4b6e..58aa0c5e 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -35,10 +35,10 @@
 #include "../utils/gettext.h"
 
 NpcTextDialog::NpcTextDialog(Network *network):
-    Window(_("NPC")), mNetwork(network)
+    Window("NPC"), mNetwork(network)
 {
+    setWindowName(_("NPC"));
     setResizable(true);
-    setCloseButton(true);
 
     setMinWidth(200);
     setMinHeight(150);
@@ -89,6 +89,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
     {
         clearText();
         setVisible(false);
+        saveWindowState();
 
         if (current_npc)
             nextDialog();
@@ -118,3 +119,9 @@ void NpcTextDialog::widgetResized(const gcn::Event &event)
     setText(mText);
 }
 
+void NpcTextDialog::requestFocus()
+{
+    loadWindowState();
+    setVisible(true);
+}
+
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 615902db..f01e3602 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -74,10 +74,23 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void addText(const std::string &string);
 
+        /**
+         * Notifies the server that the client has performed a next action.
+         */
         void nextDialog(int npcID = current_npc);
 
+        /**
+         * Notifies the server that the client has performed a close action.
+         */
         void closeDialog(int npcID = current_npc);
 
+        /**
+         * Initializes window width to the last known setting. Since the dialog
+         * doesn't need any extra focus outside of what it's given in the Game
+         * class, this is all it does for now.
+         */
+        void requestFocus();
+
         /**
          * Called when resizing the window.
          *
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index c639411d..f049cba7 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -37,8 +37,9 @@
 #include "../utils/gettext.h"
 
 NpcListDialog::NpcListDialog(Network *network):
-    Window(_("NPC")), mNetwork(network)
+    Window("NPC"), mNetwork(network)
 {
+    setWindowName(_("NPC"));
     setResizable(true);
 
     setMinWidth(200);
@@ -114,6 +115,7 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
     if (choice)
     {
         setVisible(false);
+        saveWindowState();
         reset();
 
         MessageOut outMsg(mNetwork);
@@ -129,4 +131,6 @@ void NpcListDialog::requestFocus()
 {
     mItemList->requestFocus();
     mItemList->setSelected(0);
+    loadWindowState();
+    setVisible(true);
 }
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 0a0e9813..e3cf375b 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -76,7 +76,8 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         void reset();
 
         /**
-         * Requests the listbox to take focus for input.
+         * Requests the listbox to take focus for input and sets window width
+         * to the last known setting.
          */
         void requestFocus();
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 2b422f86..8faf63a0 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -118,21 +118,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
 Window::~Window()
 {
     logger->log("Window::~Window(\"%s\")", getCaption().c_str());
-    const std::string &name = mWindowName;
 
-    // Saving X, Y and Width and Height for resizables in the config
-    if (!name.empty())
-    {
-        config.setValue(name + "WinX", getX());
-        config.setValue(name + "WinY", getY());
-        config.setValue(name + "Visible", isVisible());
-
-        if (mGrip)
-        {
-            config.setValue(name + "WinWidth", getWidth());
-            config.setValue(name + "WinHeight", getHeight());
-        }
-    }
+    saveWindowState();
 
     delete mLayout;
 
@@ -478,8 +465,13 @@ void Window::loadWindowState()
 
     if (mGrip)
     {
-        setSize((int) config.getValue(name + "WinWidth", mDefaultWidth),
-                (int) config.getValue(name + "WinHeight", mDefaultHeight));
+        const int width = (int) config.getValue(name + "WinWidth",
+                                                mDefaultWidth);
+        const int height = (int) config.getValue(name + "WinHeight",
+                                                 mDefaultHeight);
+
+        setSize(width < getMinWidth() ? getMinWidth() : width,
+                height < getMinHeight() ? getMinHeight() : height);
     }
     else
     {
@@ -487,6 +479,23 @@ void Window::loadWindowState()
     }
 }
 
+void Window::saveWindowState()
+{
+    // Saving X, Y and Width and Height for resizables in the config
+    if (!mWindowName.empty())
+    {
+        config.setValue(mWindowName + "WinX", getX());
+        config.setValue(mWindowName + "WinY", getY());
+        config.setValue(mWindowName + "Visible", isVisible());
+
+        if (mGrip)
+        {
+            config.setValue(mWindowName + "WinWidth", getWidth());
+            config.setValue(mWindowName + "WinHeight", getHeight());
+        }
+    }
+}
+
 void Window::setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight)
 {
diff --git a/src/gui/window.h b/src/gui/window.h
index 3a92ac17..bf15dedb 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -233,6 +233,12 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void loadWindowState();
 
+        /**
+         * Saves the window state so that when the window is reloaded, it'll
+         * maintain its previous state and location.
+         */
+        void saveWindowState();
+
         /**
          * Set the default win pos and size.
          * (which can be different of the actual ones.)
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 41af4467..60a77af1 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -60,7 +60,6 @@ void NPCHandler::handleMessage(MessageIn *msg)
             current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
-            npcListDialog->setVisible(true);
             npcListDialog->requestFocus();
             break;
 
@@ -69,7 +68,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
             current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
             npcTextDialog->addText(msg->readString(msg->getLength() - 8));
-            npcTextDialog->setVisible(true);
+            npcTextDialog->requestFocus();
             break;
 
          case SMSG_NPC_CLOSE:
-- 
cgit v1.2.3-70-g09d2


From 67ea3716f8b01484527ead747c0cc6af3ac0cd76 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 08:29:49 -0600
Subject: Moved enforcement of minimum widths and heights to the Window class.
 This was needed in the Minimap class, but not migrated out to the Window
 class until now.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/login.cpp   | 28 +++++++++-------------------
 src/gui/minimap.cpp | 12 ------------
 src/gui/window.cpp  | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 53 insertions(+), 40 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index cd331322..ce13aaf0 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -117,11 +117,10 @@ LoginDialog::LoginDialog(LoginData *loginData):
     setLocationRelativeTo(getParent());
     setVisible(true);
 
-    if (mUserField->getText().empty()) {
+    if (mUserField->getText().empty())
         mUserField->requestFocus();
-    } else {
+    else
         mPassField->requestFocus();
-    }
 
     mOkButton->setEnabled(canSubmit());
 }
@@ -156,14 +155,12 @@ void LoginDialog::action(const gcn::ActionEvent &event)
     {
         // Transfer these fields on to the register dialog
         mLoginData->hostname = mServerField->getText();
+
         if (isUShort(mPortField->getText()))
-        {
             mLoginData->port = getUShort(mPortField->getText());
-        }
         else
-        {
             mLoginData->port = 6901;
-        }
+
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
 
@@ -196,14 +193,12 @@ bool LoginDialog::isUShort(const std::string &str)
          strPtr != strEnd; ++strPtr)
     {
         if (*strPtr < '0' || *strPtr > '9')
-        {
             return false;
-        }
+
         l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+
         if (l > 65535)
-        {
             return false;
-        }
     }
     return true;
 }
@@ -279,9 +274,7 @@ void LoginDialog::DropDownList::save(const std::string &server,
          ++sPtr, ++pPtr)
     {
         if (*sPtr != server || *pPtr != port)
-        {
             saveEntry(*sPtr, *pPtr, position);
-        }
     }
 }
 
@@ -293,26 +286,23 @@ int LoginDialog::DropDownList::getNumberOfElements()
 std::string LoginDialog::DropDownList::getElementAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
-    {
       return "";
-    }
+
     return getServerAt(i) + ":" + getPortAt(i);
 }
 
 std::string LoginDialog::DropDownList::getServerAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
-    {
         return "";
-    }
+
     return mServers.at(i);
 }
 
 std::string LoginDialog::DropDownList::getPortAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
-    {
         return "";
-    }
+
     return mPorts.at(i);
 }
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 2a97b949..ecda29ce 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -80,18 +80,6 @@ void Minimap::setMapImage(Image *img)
                     mMapImage->getWidth() + offsetX : titleWidth);
         setMaxHeight(mMapImage->getHeight() + offsetY);
 
-        // Make sure the window is within the minimum and maximum boundaries
-        // TODO: Shouldn't this be happening automatically within the Window
-        // class?
-        if (getMinWidth() > getWidth())
-            setWidth(getMinWidth());
-        else if (getMaxWidth() < getWidth())
-            setWidth(getMaxWidth());
-        if (getMinHeight() > getHeight())
-            setHeight(getMinHeight());
-        else if (getMaxHeight() < getHeight())
-            setHeight(getMaxHeight());
-
         setContentSize(getWidth() - offsetX, getHeight() - offsetY);
         setDefaultSize(getX(), getY(), getWidth(), getHeight());
         resetToDefaultSize();
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 8faf63a0..5253dd2e 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -193,8 +193,19 @@ void Window::draw(gcn::Graphics *graphics)
 
 void Window::setContentSize(int width, int height)
 {
-    setSize(width + 2 * getPadding(),
-            height + getPadding() + getTitleBarHeight());
+    width = width + 2 * getPadding();
+    height = height + getPadding() + getTitleBarHeight();
+
+    if (getMinWidth() > width)
+        width = getMinWidth();
+    else if (getMaxWidth() < width)
+        width = getMaxWidth();
+    if (getMinHeight() > height)
+        height = getMinHeight();
+    else if (getMaxHeight() < height)
+        height = getMaxHeight();
+
+    setSize(width, height);
 }
 
 void Window::setLocationRelativeTo(gcn::Widget *widget)
@@ -465,13 +476,19 @@ void Window::loadWindowState()
 
     if (mGrip)
     {
-        const int width = (int) config.getValue(name + "WinWidth",
-                                                mDefaultWidth);
-        const int height = (int) config.getValue(name + "WinHeight",
-                                                 mDefaultHeight);
-
-        setSize(width < getMinWidth() ? getMinWidth() : width,
-                height < getMinHeight() ? getMinHeight() : height);
+        int width = (int) config.getValue(name + "WinWidth", mDefaultWidth);
+        int height = (int) config.getValue(name + "WinHeight", mDefaultHeight);
+
+        if (getMinWidth() > width)
+            width = getMinWidth();
+        else if (getMaxWidth() < width)
+            width = getMaxWidth();
+        if (getMinHeight() > height)
+            height = getMinHeight();
+        else if (getMaxHeight() < height)
+            height = getMaxHeight();
+
+        setSize(width, height);
     }
     else
     {
@@ -490,6 +507,15 @@ void Window::saveWindowState()
 
         if (mGrip)
         {
+            if (getMinWidth() > getWidth())
+                setWidth(getMinWidth());
+            else if (getMaxWidth() < getWidth())
+                setWidth(getMaxWidth());
+            if (getMinHeight() > getHeight())
+                setHeight(getMinHeight());
+            else if (getMaxHeight() < getHeight())
+                setHeight(getMaxHeight());
+
             config.setValue(mWindowName + "WinWidth", getWidth());
             config.setValue(mWindowName + "WinHeight", getHeight());
         }
@@ -499,6 +525,15 @@ void Window::saveWindowState()
 void Window::setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight)
 {
+    if (getMinWidth() > defaultWidth)
+        defaultWidth = getMinWidth();
+    else if (getMaxWidth() < defaultWidth)
+        defaultWidth = getMaxWidth();
+    if (getMinHeight() > defaultHeight)
+        defaultHeight = getMinHeight();
+    else if (getMaxHeight() < defaultHeight)
+        defaultHeight = getMaxHeight();
+
     mDefaultX = defaultX;
     mDefaultY = defaultY;
     mDefaultWidth = defaultWidth;
-- 
cgit v1.2.3-70-g09d2


From 6b0659b6cc921aa6589681820b431af44f458440 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 08:37:10 -0600
Subject: Fixed setContentSize in the window class to only care about exceeding
 the maximum width and height. Exceeding the minumum width and height is a
 desireable case in some situations.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/window.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 5253dd2e..3c73a586 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -196,13 +196,9 @@ void Window::setContentSize(int width, int height)
     width = width + 2 * getPadding();
     height = height + getPadding() + getTitleBarHeight();
 
-    if (getMinWidth() > width)
-        width = getMinWidth();
-    else if (getMaxWidth() < width)
+    if (getMaxWidth() < width)
         width = getMaxWidth();
-    if (getMinHeight() > height)
-        height = getMinHeight();
-    else if (getMaxHeight() < height)
+    if (getMaxHeight() < height)
         height = getMaxHeight();
 
     setSize(width, height);
-- 
cgit v1.2.3-70-g09d2


From 1570fb33d5909786ef2997246ada7c46dd6de9e4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 08:43:26 -0600
Subject: Reverted last commit (since I confused it with something else) as
 well as removed a redundant call for sizing in the minimap class.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 1 -
 src/gui/window.cpp  | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index ecda29ce..f3da52c6 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -80,7 +80,6 @@ void Minimap::setMapImage(Image *img)
                     mMapImage->getWidth() + offsetX : titleWidth);
         setMaxHeight(mMapImage->getHeight() + offsetY);
 
-        setContentSize(getWidth() - offsetX, getHeight() - offsetY);
         setDefaultSize(getX(), getY(), getWidth(), getHeight());
         resetToDefaultSize();
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 3c73a586..5253dd2e 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -196,9 +196,13 @@ void Window::setContentSize(int width, int height)
     width = width + 2 * getPadding();
     height = height + getPadding() + getTitleBarHeight();
 
-    if (getMaxWidth() < width)
+    if (getMinWidth() > width)
+        width = getMinWidth();
+    else if (getMaxWidth() < width)
         width = getMaxWidth();
-    if (getMaxHeight() < height)
+    if (getMinHeight() > height)
+        height = getMinHeight();
+    else if (getMaxHeight() < height)
         height = getMaxHeight();
 
     setSize(width, height);
-- 
cgit v1.2.3-70-g09d2


From 3aa9e681e466b1596a99b0361277975476790c3f Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 09:35:26 -0600
Subject: Allow NPCList dialog to use it's old location

---
 src/gui/npclistdialog.cpp | 2 +-
 src/gui/window.cpp        | 4 ++--
 src/gui/window.h          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 94dfabeb..95fe5983 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -69,7 +69,7 @@ NpcListDialog::NpcListDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    resetToDefaultSize();
+    resetToDefaultSize(false);
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 48229ec8..8eaaf31d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -490,9 +490,9 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
-void Window::resetToDefaultSize()
+void Window::resetToDefaultSize(bool changePosition)
 {
-    setPosition(mDefaultX, mDefaultY);
+    if (changePosition) setPosition(mDefaultX, mDefaultY);
     setSize(mDefaultWidth, mDefaultHeight);
 }
 
diff --git a/src/gui/window.h b/src/gui/window.h
index 518de6e9..9977aff4 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -243,7 +243,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
          */
-        void resetToDefaultSize();
+        void resetToDefaultSize(bool changePosition = true);
 
         /**
          * Gets the layout handler for this window.
-- 
cgit v1.2.3-70-g09d2


From 58ee835c3763e7bf088fa6c7e31dda1d687589cc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 11:50:27 -0600
Subject: Extended window layout to take relative positions, as well as offsets
 to that position. This makes it so that when resolutions are changed, the
 default locations stay relative to the window's position, and not the 800x600
 screen resolution.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/graphics.cpp             | 30 ++++++--------
 src/graphics.h               | 13 ++++++
 src/gui/buy.cpp              |  3 +-
 src/gui/buysell.cpp          |  1 -
 src/gui/chat.cpp             |  2 +-
 src/gui/debugwindow.cpp      |  2 +-
 src/gui/emotewindow.cpp      |  2 +-
 src/gui/equipmentwindow.cpp  |  2 +-
 src/gui/inventorywindow.cpp  |  3 +-
 src/gui/npc_text.cpp         |  3 +-
 src/gui/npcintegerdialog.cpp |  7 +++-
 src/gui/npclistdialog.cpp    |  3 +-
 src/gui/npcstringdialog.cpp  |  7 +++-
 src/gui/recorder.cpp         |  8 ++--
 src/gui/sell.cpp             |  3 +-
 src/gui/shortcutwindow.cpp   | 13 ++----
 src/gui/skill.cpp            |  2 +-
 src/gui/status.cpp           |  3 +-
 src/gui/storagewindow.cpp    |  3 +-
 src/gui/trade.cpp            |  2 +-
 src/gui/window.cpp           | 99 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/window.h             | 16 ++++++-
 src/openglgraphics.cpp       | 42 ++++++++++---------
 23 files changed, 194 insertions(+), 75 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 3c507f4b..48fd1340 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -50,30 +50,25 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     mFullscreen = fs;
     mHWAccel = hwaccel;
 
-    if (fs) {
+    if (fs)
         displayFlags |= SDL_FULLSCREEN;
-    }
 
-    if (hwaccel) {
+    if (hwaccel)
         displayFlags |= SDL_HWSURFACE | SDL_DOUBLEBUF;
-    } else {
+    else
         displayFlags |= SDL_SWSURFACE;
-    }
 
     mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags);
 
-    if (!mScreen) {
+    if (!mScreen)
         return false;
-    }
 
     char videoDriverName[64];
 
-    if (SDL_VideoDriverName(videoDriverName, 64)) {
+    if (SDL_VideoDriverName(videoDriverName, 64))
         logger->log("Using video driver: %s", videoDriverName);
-    }
-    else {
+    else
         logger->log("Using video driver: unknown");
-    }
 
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 
@@ -104,9 +99,8 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
 
 bool Graphics::setFullscreen(bool fs)
 {
-    if (mFullscreen == fs) {
+    if (mFullscreen == fs)
         return true;
-    }
 
     return setVideoMode(mScreen->w, mScreen->h,
             mScreen->format->BitsPerPixel, fs, mHWAccel);
@@ -128,7 +122,7 @@ bool Graphics::drawImage(Image *image, int x, int y)
 }
 
 bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
-        int width, int height, bool)
+                         int width, int height, bool)
 {
     // Check that preconditions for blitting are met.
     if (!mScreen || !image || !image->mImage) return false;
@@ -150,7 +144,7 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
 }
 
 void Graphics::drawImage(gcn::Image const *image, int srcX, int srcY,
-               int dstX, int dstY, int width, int height)
+                         int dstX, int dstY, int width, int height)
 {
     ProxyImage const *srcImage =
         dynamic_cast< ProxyImage const * >(image);
@@ -167,8 +161,10 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h)
     int px = 0;                       // X position on pattern plane
     int py = 0;                       // Y position on pattern plane
 
-    while (py < h) {
-        while (px < w) {
+    while (py < h)
+    {
+        while (px < w)
+        {
             int dw = (px + iw >= w) ? w - px : iw;
             int dh = (py + ih >= h) ? h - py : ih;
             drawImage(image, 0, 0, x + px, y + py, dw, dh);
diff --git a/src/graphics.h b/src/graphics.h
index 3ad3b85c..ec0b5e9c 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -49,6 +49,19 @@ struct SDL_Surface;
  */
 struct ImageRect
 {
+    enum ImagePosition
+    {
+        UPPER_LEFT = 0,
+        UPPER_CENTER = 1,
+        UPPER_RIGHT = 2,
+        LEFT = 3,
+        CENTER = 4,
+        RIGHT = 5,
+        LOWER_LEFT = 6,
+        LOWER_CENTER = 7,
+        LOWER_RIGHT = 8,
+    };
+
     Image *grid[9];
 };
 
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 5a57dcc6..2b5aeeb7 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -47,7 +47,7 @@ BuyDialog::BuyDialog(Network *network):
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
-    setDefaultSize(0, 0, 260, 230);
+    setDefaultSize(260, 230, ImageRect::CENTER);
 
     mShopItems = new ShopItems;
 
@@ -90,7 +90,6 @@ BuyDialog::BuyDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 BuyDialog::~BuyDialog()
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index dc7deef6..f7684670 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -50,7 +50,6 @@ BuySellDialog::BuySellDialog(Network *network):
     buyButton->requestFocus();
 
     setContentSize(x, 2 * y + buyButton->getHeight());
-    setLocationRelativeTo(getParent());
 
     requestFocus();
 }
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 5cf8b739..098d4e46 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -55,7 +55,7 @@ Window(""), mNetwork(network), mTmpVisible(false)
     setWindowName(_("Chat"));
 
     setResizable(true);
-    setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
+    setDefaultSize(600, 123, ImageRect::LOWER_LEFT);
     setMinWidth(150);
     setMinHeight(90);
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index dafd604a..71855977 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -41,7 +41,7 @@ DebugWindow::DebugWindow():
 
     setResizable(true);
     setCloseButton(true);
-    setDefaultSize(0, 0, 400, 60);
+    setDefaultSize(400, 60, ImageRect::CENTER);
 
     mFPSLabel = new gcn::Label("0 FPS");
     mMusicFileLabel = new gcn::Label("Music: ");
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 30129941..77168993 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -40,7 +40,7 @@ EmoteWindow::EmoteWindow():
     setCloseButton(true);
     setMinWidth(80);
     setMinHeight(130);
-    setDefaultSize(115, 25, 322, 200);
+    setDefaultSize(322, 200, ImageRect::CENTER);
 
     mUseButton = new Button(_("Use"), "use", this);
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 27ea38ff..0d2097f8 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -71,7 +71,7 @@ EquipmentWindow::EquipmentWindow():
 
     setWindowName("Equipment");
     setCloseButton(true);
-    setDefaultSize(5, 195, 180, 300);
+    setDefaultSize(180, 300, ImageRect::CENTER);
     loadWindowState();
 
     mUnequip = new Button(_("Unequip"), "unequip", this);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 226b3178..7e75411e 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,7 @@ InventoryWindow::InventoryWindow(int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 375, 300);
+    setDefaultSize(375, 300, ImageRect::CENTER);
 
     std::string longestUseString = getFont()->getWidth(_("Equip")) >
                                    getFont()->getWidth(_("Use")) ?
@@ -103,7 +103,6 @@ InventoryWindow::InventoryWindow(int invSize):
     layout.setRowHeight(0,  mDropButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 InventoryWindow::~InventoryWindow()
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 58aa0c5e..f524f8ea 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -43,7 +43,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 200);
+    setDefaultSize(260, 200, ImageRect::CENTER);
 
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
@@ -63,7 +63,6 @@ NpcTextDialog::NpcTextDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 void NpcTextDialog::setText(const std::string &text)
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 132a7608..5b3e05aa 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -37,6 +37,9 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     Window(_("NPC Number Request")), mNetwork(network)
 {
     mValueField = new IntTextField();
+    setWindowName("NPCInput");
+
+    setDefaultSize(175, 75, ImageRect::CENTER);
 
     mDecButton = new Button("-", "decvalue", this);
     mIncButton = new Button("+", "incvalue", this);
@@ -58,9 +61,9 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(0, 0, resetButton);
     place(2, 0, cancelButton);
     place(3, 0, okButton);
-    reflowLayout(175, 0);
+    //reflowLayout(175, 0);
 
-    setLocationRelativeTo(getParent());
+    loadWindowState();
 }
 
 void NpcIntegerDialog::setRange(const int min, const int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index f049cba7..505912ac 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -45,7 +45,7 @@ NpcListDialog::NpcListDialog(Network *network):
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 200);
+    setDefaultSize(260, 200, ImageRect::CENTER);
 
     mItemList = new ListBox(this);
     mItemList->setWrappingEnabled(true);
@@ -66,7 +66,6 @@ NpcListDialog::NpcListDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index f2c7434c..58a5c0c8 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -36,17 +36,20 @@
 NpcStringDialog::NpcStringDialog(Network *network):
     Window(_("NPC Text Request")), mNetwork(network)
 {
+    setWindowName("NPCInput");
     mValueField = new TextField("");
 
+    setDefaultSize(175, 75, ImageRect::CENTER);
+
     okButton = new Button(_("OK"), "ok", this);
     cancelButton = new Button(_("Cancel"), "cancel", this);
 
     place(0, 0, mValueField, 3);
     place(1, 1, cancelButton);
     place(2, 1, okButton);
-    reflowLayout(175, 0);
+    //reflowLayout(175, 0);
 
-    setLocationRelativeTo(getParent());
+    loadWindowState();
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index ff8825ef..9320e020 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -40,9 +40,11 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
 
     mChat = chat;
     Button *button = new Button(buttonTxt, "activate", this);
-    setDefaultSize(0, windowContainer->getHeight() - 123 - button->getHeight() -
-                   offsetY,  button->getWidth() + offsetX, button->getHeight() +
-                   offsetY);
+
+    // 123 is the default chat window height. If you change this in Chat, please
+    // change it here as well
+    setDefaultSize(button->getWidth() + offsetX, button->getHeight() +
+                   offsetY, ImageRect::LOWER_LEFT, 0, 123);
 
     place(0, 0, button);
 
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 154d1a57..397e29a6 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -48,7 +48,7 @@ SellDialog::SellDialog(Network *network):
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
-    setDefaultSize(0, 0, 260, 230);
+    setDefaultSize(260, 230, ImageRect::CENTER);
 
     // Create a ShopItems instance, that is aware of duplicate entries.
     mShopItems = new ShopItems(true);
@@ -94,7 +94,6 @@ SellDialog::SellDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 SellDialog::~SellDialog()
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index ee32ca70..c2df1f9c 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -40,22 +40,17 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
 
     mItems = content;
 
-    mInstances++;
-
     const int border = SCROLL_PADDING * 2 + getPadding() * 2;
     setMinWidth(mItems->getBoxWidth() + border);
     setMinHeight(mItems->getBoxHeight() + border);
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
     setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
 
-    const int width = (int) config.getValue("screenwidth", 800);
-    const int height = (int) config.getValue("screenheight", 600);
+    setDefaultSize(mItems->getBoxWidth() + border, (mItems->getBoxHeight() *
+                   mItems->getMaxItems()) + border, ImageRect::LOWER_RIGHT,
+                   mInstances * mItems->getBoxWidth(), 0);
 
-    setDefaultSize(width - (mInstances * mItems->getBoxWidth()) -
-                   (mInstances * border),  height - (mItems->getBoxHeight() *
-                   mItems->getMaxItems()) - border, mItems->getBoxWidth() +
-                   border, (mItems->getBoxHeight() * mItems->getMaxItems()) +
-                   border);
+    mInstances++;
 
     mScrollArea = new ScrollArea(mItems);
     mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 42ac4d86..a8250fce 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -135,7 +135,7 @@ SkillDialog::SkillDialog():
 
     setWindowName(_("Skills"));
     setCloseButton(true);
-    setDefaultSize(windowContainer->getWidth() - 260, 25, 255, 260);
+    setDefaultSize(255, 260, ImageRect::CENTER);
 
     setMinHeight(50 + mTableModel->getHeight());
     setMinWidth(200);
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 6419eabb..e534edb8 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -41,8 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 {
     setWindowName(_("Status"));
     setCloseButton(true);
-    setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 400, 345);
+    setDefaultSize(400, 345, ImageRect::CENTER);
 
     // ----------------------
     // Status Part
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index d3bc7ef8..ca7a547f 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -62,7 +62,7 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 375, 300);
+    setDefaultSize(375, 300, ImageRect::CENTER);
 
     mStoreButton = new Button(_("Store"), "store", this);
     mRetrieveButton = new Button(_("Retrieve"), "retrieve", this);
@@ -92,7 +92,6 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     layout.setRowHeight(0, mStoreButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 StorageWindow::~StorageWindow()
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 76795688..a28ff0f9 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -53,7 +53,7 @@ TradeWindow::TradeWindow(Network *network):
     mPartnerInventory(new Inventory(INVENTORY_SIZE, 2))
 {
     setWindowName(_("Trade"));
-    setDefaultSize(115, 227, 342, 209);
+    setDefaultSize(342, 209, ImageRect::CENTER);
     setResizable(true);
 
     setMinWidth(342);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 5253dd2e..f1316b4c 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -220,6 +220,53 @@ void Window::setLocationRelativeTo(gcn::Widget *widget)
                 getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
 }
 
+void Window::setLocationRelativeTo(ImageRect::ImagePosition position)
+{
+    int x = 0, y = 0;
+
+    if (position == ImageRect::UPPER_LEFT)
+    {
+    }
+    else if (position == ImageRect::UPPER_CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+    }
+    else if (position == ImageRect::UPPER_RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+    }
+    else if (position == ImageRect::LEFT)
+    {
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::LOWER_LEFT)
+    {
+        y = windowContainer->getHeight() - getHeight();
+    }
+    else if (position == ImageRect::LOWER_CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+        y = windowContainer->getHeight() - getHeight();
+    }
+    else if (position == ImageRect::LOWER_RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+        y = windowContainer->getHeight() - getHeight();
+    }
+
+    setPosition(x, y);
+}
+
 void Window::setMinWidth(unsigned int width)
 {
     mMinWinWidth = width;
@@ -540,6 +587,58 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
+void Window::setDefaultSize(int defaultWidth, int defaultHeight,
+                            ImageRect::ImagePosition position,
+                            int offsetX, int offsetY)
+{
+    int x = 0, y = 0;
+
+    if (position == ImageRect::UPPER_LEFT)
+    {
+    }
+    else if (position == ImageRect::UPPER_CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+    }
+    else if (position == ImageRect::UPPER_RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+    }
+    else if (position == ImageRect::LEFT)
+    {
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::LOWER_LEFT)
+    {
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+    else if (position == ImageRect::LOWER_CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+    else if (position == ImageRect::LOWER_RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+
+    mDefaultX = x - offsetX;
+    mDefaultY = y - offsetY;
+    mDefaultWidth = defaultWidth;
+    mDefaultHeight = defaultHeight;
+}
+
 void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
diff --git a/src/gui/window.h b/src/gui/window.h
index bf15dedb..c24bde76 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -34,7 +34,6 @@ class ConfigListener;
 class GCContainer;
 class ContainerPlacer;
 class Image;
-class ImageRect;
 class Layout;
 class LayoutCell;
 class ResizeGrip;
@@ -90,6 +89,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void setLocationRelativeTo(gcn::Widget *widget);
 
+        /**
+         * Sets the location relative to the given enumerated position.
+         */
+        void setLocationRelativeTo(ImageRect::ImagePosition position);
+
         /**
          * Sets whether or not the window can be resized.
          */
@@ -246,6 +250,16 @@ class Window : public gcn::Window, gcn::WidgetListener
         void setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight);
 
+        /**
+         * Set the default win pos and size.
+         * (which can be different of the actual ones.)
+         * This version of setDefaultSize sets the window's position based
+         * on a relative enumerated position, rather than a coordinate position.
+         */
+        void setDefaultSize(int defaultWidth, int defaultHeight,
+                            ImageRect::ImagePosition position,
+                            int offsetx = 0, int offsetY = 0);
+
         /**
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 71ab2fe3..9bd3ab2f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -63,18 +63,17 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     mFullscreen = fs;
     mHWAccel = hwaccel;
 
-    if (fs) {
+    if (fs)
         displayFlags |= SDL_FULLSCREEN;
-    }
 
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-    if (!(mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags))) {
+    if (!(mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags)))
         return false;
-    }
 
 #ifdef __APPLE__
-    if (mSync) {
+    if (mSync)
+    {
         const GLint VBL = 1;
         CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
     }
@@ -158,9 +157,7 @@ bool OpenGLGraphics::drawImage(Image *image, int srcX, int srcY,
     glEnd();
 
     if (!useColor)
-    {
         glColor4ub(mColor.r, mColor.g, mColor.b, mColor.a);
-    }
 
     return true;
 }
@@ -206,9 +203,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot()
             w, h, 24,
             0xff0000, 0x00ff00, 0x0000ff, 0x000000);
 
-    if (SDL_MUSTLOCK(screenshot)) {
+    if (SDL_MUSTLOCK(screenshot))
         SDL_LockSurface(screenshot);
-    }
 
     // Grap the pixel buffer and write it to the SDL surface
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
@@ -230,9 +226,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot()
 
     free(buf);
 
-    if (SDL_MUSTLOCK(screenshot)) {
+    if (SDL_MUSTLOCK(screenshot))
         SDL_UnlockSurface(screenshot);
-    }
 
     return screenshot;
 }
@@ -242,7 +237,8 @@ bool OpenGLGraphics::pushClipArea(gcn::Rectangle area)
     int transX = 0;
     int transY = 0;
 
-    if (!mClipStack.empty()) {
+    if (!mClipStack.empty())
+    {
         transX = -mClipStack.top().xOffset;
         transY = -mClipStack.top().yOffset;
     }
@@ -267,9 +263,7 @@ void OpenGLGraphics::popClipArea()
     gcn::Graphics::popClipArea();
 
     if (mClipStack.empty())
-    {
         return;
-    }
 
     glPopMatrix();
     glScissor(mClipStack.top().x,
@@ -325,8 +319,10 @@ void OpenGLGraphics::setTargetPlane(int width, int height)
 
 void OpenGLGraphics::setTexturingAndBlending(bool enable)
 {
-    if (enable) {
-        if (!mTexture) {
+    if (enable)
+    {
+        if (!mTexture)
+        {
             glEnable(Image::mTextureType);
             mTexture = true;
         }
@@ -336,16 +332,22 @@ void OpenGLGraphics::setTexturingAndBlending(bool enable)
             glEnable(GL_BLEND);
             mAlpha = true;
         }
-    } else {
-        if (mAlpha && !mColorAlpha) {
+    }
+    else
+    {
+        if (mAlpha && !mColorAlpha)
+        {
             glDisable(GL_BLEND);
             mAlpha = false;
-        } else if (!mAlpha && mColorAlpha) {
+        }
+        else if (!mAlpha && mColorAlpha)
+        {
             glEnable(GL_BLEND);
             mAlpha = true;
         }
 
-        if (mTexture) {
+        if (mTexture)
+        {
             glDisable(Image::mTextureType);
             mTexture = false;
         }
-- 
cgit v1.2.3-70-g09d2


From 0540c611b48fd8dee14066b13755138192b7084b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 12:09:53 -0600
Subject: Allow for offsets for the enumerated position version of
 setLocationRelativeTo as well. Signed-off-by: Ira Rice <irarice@gmail.com>

---
 src/gui/window.cpp | 31 +++++++++++++++----------------
 src/gui/window.h   |  3 ++-
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index f1316b4c..bf1ec01c 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -220,51 +220,50 @@ void Window::setLocationRelativeTo(gcn::Widget *widget)
                 getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
 }
 
-void Window::setLocationRelativeTo(ImageRect::ImagePosition position)
+void Window::setLocationRelativeTo(ImageRect::ImagePosition position,
+                                   int offsetX, int offsetY)
 {
-    int x = 0, y = 0;
-
     if (position == ImageRect::UPPER_LEFT)
     {
     }
     else if (position == ImageRect::UPPER_CENTER)
     {
-        x = (windowContainer->getWidth() - getWidth()) / 2;
+        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
     }
     else if (position == ImageRect::UPPER_RIGHT)
     {
-        x = windowContainer->getWidth() - getWidth();
+        offsetX += windowContainer->getWidth() - getWidth();
     }
     else if (position == ImageRect::LEFT)
     {
-        y = (windowContainer->getHeight() - getHeight()) / 2;
+        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::CENTER)
     {
-        x = (windowContainer->getWidth() - getWidth()) / 2;
-        y = (windowContainer->getHeight() - getHeight()) / 2;
+        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
+        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::RIGHT)
     {
-        x = windowContainer->getWidth() - getWidth();
-        y = (windowContainer->getHeight() - getHeight()) / 2;
+        offsetX += windowContainer->getWidth() - getWidth();
+        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::LOWER_LEFT)
     {
-        y = windowContainer->getHeight() - getHeight();
+        offsetY += windowContainer->getHeight() - getHeight();
     }
     else if (position == ImageRect::LOWER_CENTER)
     {
-        x = (windowContainer->getWidth() - getWidth()) / 2;
-        y = windowContainer->getHeight() - getHeight();
+        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
+        offsetY += windowContainer->getHeight() - getHeight();
     }
     else if (position == ImageRect::LOWER_RIGHT)
     {
-        x = windowContainer->getWidth() - getWidth();
-        y = windowContainer->getHeight() - getHeight();
+        offsetX += windowContainer->getWidth() - getWidth();
+        offsetY += windowContainer->getHeight() - getHeight();
     }
 
-    setPosition(x, y);
+    setPosition(offsetX, offsetY);
 }
 
 void Window::setMinWidth(unsigned int width)
diff --git a/src/gui/window.h b/src/gui/window.h
index c24bde76..4fc6c862 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -92,7 +92,8 @@ class Window : public gcn::Window, gcn::WidgetListener
         /**
          * Sets the location relative to the given enumerated position.
          */
-        void setLocationRelativeTo(ImageRect::ImagePosition position);
+        void setLocationRelativeTo(ImageRect::ImagePosition position,
+                                   int offsetX = 0, int offsetY = 0);
 
         /**
          * Sets whether or not the window can be resized.
-- 
cgit v1.2.3-70-g09d2


From 17f9d5abcb05da185486ccfba293f3a8c9eab437 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 12:23:50 -0600
Subject: Fix some mem leaks

---
 src/beingmanager.cpp     |  5 +++++
 src/beingmanager.h       |  4 +++-
 src/game.cpp             |  5 +++--
 src/gui/chat.cpp         |  2 ++
 src/gui/setup.cpp        | 11 +++++++++--
 src/gui/setup.h          |  4 ++++
 src/gui/setup_colors.cpp |  5 ++---
 src/gui/skill.cpp        |  2 +-
 src/gui/table.cpp        |  1 +
 src/gui/window.cpp       |  2 ++
 src/main.cpp             |  1 -
 src/player_relations.cpp | 24 ++++++++++++++----------
 src/player_relations.h   |  2 ++
 13 files changed, 48 insertions(+), 20 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 73fa683a..23d91526 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -54,6 +54,11 @@ BeingManager::BeingManager(Network *network):
 {
 }
 
+BeingManager::~BeingManager()
+{
+    clear();
+}
+
 void BeingManager::setMap(Map *map)
 {
     mMap = map;
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 6c0e0fda..d0690798 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -36,6 +36,8 @@ class BeingManager
     public:
         BeingManager(Network *network);
 
+        ~BeingManager();
+
         /**
          * Sets the map on which beings are created
          */
@@ -112,7 +114,7 @@ class BeingManager
         void logic();
 
         /**
-         * Destroys all beings except the local player and current NPC (if any)
+         * Destroys all beings except the local player
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index 74a52ddf..ae708adf 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -204,7 +204,6 @@ void createGuiWindows(Network *network)
     npcListDialog = new NpcListDialog(network);
     npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog;
-    setupWindow = new Setup;
     minimap = new Minimap;
     equipmentWindow = new EquipmentWindow;
     tradeWindow = new TradeWindow(network);
@@ -341,11 +340,12 @@ Game::Game(Network *network):
     msg.writeInt32(tick_time);
 
     engine->changeMap(map_path);
+
+    setupWindow->setInGame(true);
 }
 
 Game::~Game()
 {
-    delete player_node;
     destroyGuiWindows();
 
     delete beingManager;
@@ -353,6 +353,7 @@ Game::~Game()
     delete joystick;
     delete particleEngine;
     delete engine;
+    delete player_node;
 
     beingManager = NULL;
     floorItemManager = NULL;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 8ecb5f63..55bc2696 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -108,6 +108,8 @@ ChatWindow::~ChatWindow()
     config.setValue("PartyPrefix", partyPrefix);
     config.setValue("ReturnToggles", mReturnToggles ? "1" : "0");
     delete mRecorder;
+    delete mItemLinkHandler;
+    delete mParty;
 }
 
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 148e8b75..62d79d4d 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -64,9 +64,9 @@ Setup::Setup():
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
 
-        // Disable this button when the windows aren't created yet
+        // Store this button, as it needs to be enabled/disabled
         if (!strcmp(*curBtn, "Reset Windows"))
-            btn->setEnabled(statusWindow != NULL);
+            mResetWindows = btn;
     }
 
     TabbedArea *panel = new TabbedArea;
@@ -101,6 +101,8 @@ Setup::Setup():
     add(panel);
 
     setLocationRelativeTo(getParent());
+
+    setInGame(false);
 }
 
 Setup::~Setup()
@@ -140,3 +142,8 @@ void Setup::action(const gcn::ActionEvent &event)
         tradeWindow->resetToDefaultSize();
     }
 }
+
+void Setup::setInGame(bool inGame)
+{
+    mResetWindows->setEnabled(inGame);
+}
\ No newline at end of file
diff --git a/src/gui/setup.h b/src/gui/setup.h
index e4eb0902..075c88bf 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -31,6 +31,7 @@
 #include "../guichanfwd.h"
 
 class SetupTab;
+class Button;
 
 /**
  * The setup dialog.
@@ -50,6 +51,8 @@ class Setup : public Window, public gcn::ActionListener
          */
         ~Setup();
 
+        void setInGame(bool inGame);
+
         /**
          * Event handling method.
          */
@@ -57,6 +60,7 @@ class Setup : public Window, public gcn::ActionListener
 
     private:
         std::list<SetupTab*> mTabs;
+        gcn::Button *mResetWindows;
 };
 
 #endif
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 49c99996..2610be03 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -57,9 +57,8 @@ Setup_Colors::Setup_Colors() :
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
     mPreview->setOpaque(false);
 
-    // Replace this later with a more appropriate link handler. For now, this'll
-    // do, as it'll do nothing when clicked on.
-    mPreview->setLinkHandler(new ItemLinkHandler);
+    // don't do anything with links
+    mPreview->setLinkHandler(NULL);
 
     mPreviewBox = new ScrollArea(mPreview);
     mPreviewBox->setHeight(20);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 61bb9ce9..6112f0e3 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -163,7 +163,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    delete mTable;
+    delete_all(mSkillList);
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 1371a78e..274f9a48 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -98,6 +98,7 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
 
 GuiTable::~GuiTable()
 {
+    uninstallActionListeners();
     delete mModel;
 }
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 8eaaf31d..be63ff21 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -142,6 +142,8 @@ Window::~Window()
         delete(w);
     }
 
+    removeWidgetListener(this);
+
     instances--;
 
     // Clean up static resources
diff --git a/src/main.cpp b/src/main.cpp
index 2c2ff0b6..06093946 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1027,7 +1027,6 @@ int main(int argc, char *argv[])
                     delete progressBar;
                     delete progressLabel;
                     delete setup;
-                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index c82876e1..14df3f01 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -28,6 +28,8 @@
 #include "player.h"
 #include "player_relations.h"
 
+#include "utils/dtor.h"
+
 #define PLAYER_IGNORE_STRATEGY_NOP "nop"
 #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
 #define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0
@@ -37,7 +39,6 @@
 
 #define IGNORE_EMOTE_TIME 100
 
-
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -92,6 +93,11 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
+PlayerRelationsManager::~PlayerRelationsManager()
+{
+    delete_all(mIgnoreStrategies);
+}
+
 void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
@@ -345,24 +351,22 @@ private:
 
 
 
-static std::vector<PlayerIgnoreStrategy *> player_ignore_strategies;
-
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
-    if (player_ignore_strategies.size() == 0) {
+    if (mIgnoreStrategies.size() == 0) {
         // not initialised yet?
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
                                                          "floating '...' bubble",
                                                          PLAYER_IGNORE_STRATEGY_EMOTE0));
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
                                                          "floating bubble",
                                                          "emote1"));
-        player_ignore_strategies.push_back(new PIS_nothing());
-        player_ignore_strategies.push_back(new PIS_dotdotdot());
-        player_ignore_strategies.push_back(new PIS_blinkname());
+        mIgnoreStrategies.push_back(new PIS_nothing());
+        mIgnoreStrategies.push_back(new PIS_dotdotdot());
+        mIgnoreStrategies.push_back(new PIS_blinkname());
     }
-    return &player_ignore_strategies;
+    return &mIgnoreStrategies;
 }
 
 
diff --git a/src/player_relations.h b/src/player_relations.h
index 1eb4ede6..dd363d41 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -94,6 +94,7 @@ class PlayerRelationsManager
 {
 public:
     PlayerRelationsManager();
+    ~PlayerRelationsManager();
 
     /**
      * Initialise player relations manager (load config file etc.)
@@ -232,6 +233,7 @@ private:
     PlayerIgnoreStrategy *mIgnoreStrategy;
     std::map<std::string, PlayerRelation *> mRelations;
     std::list<PlayerRelationsListener *> mListeners;
+    std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies;
 };
 
 
-- 
cgit v1.2.3-70-g09d2


From 75fc8e62d25ff1d39408588f76d95df4a9a7e663 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 12:23:50 -0600
Subject: Fix some mem leaks

---
 src/beingmanager.cpp     |  5 +++++
 src/beingmanager.h       |  4 +++-
 src/game.cpp             |  5 +++--
 src/gui/chat.cpp         |  2 ++
 src/gui/setup.cpp        | 11 +++++++++--
 src/gui/setup.h          |  4 ++++
 src/gui/setup_colors.cpp |  5 ++---
 src/gui/skill.cpp        |  2 +-
 src/gui/table.cpp        |  1 +
 src/gui/window.cpp       |  2 ++
 src/main.cpp             |  1 -
 src/player_relations.cpp | 24 ++++++++++++++----------
 src/player_relations.h   |  2 ++
 13 files changed, 48 insertions(+), 20 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 0c7a310a..e5836aa7 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -52,6 +52,11 @@ BeingManager::BeingManager(Network *network):
 {
 }
 
+BeingManager::~BeingManager()
+{
+    clear();
+}
+
 void BeingManager::setMap(Map *map)
 {
     mMap = map;
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 472e2c83..3284ce16 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -37,6 +37,8 @@ class BeingManager
     public:
         BeingManager(Network *network);
 
+        ~BeingManager();
+
         /**
          * Sets the map on which beings are created
          */
@@ -113,7 +115,7 @@ class BeingManager
         void logic();
 
         /**
-         * Destroys all beings except the local player and current NPC (if any)
+         * Destroys all beings except the local player
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index 144b059f..3e626d87 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -205,7 +205,6 @@ void createGuiWindows(Network *network)
     npcListDialog = new NpcListDialog(network);
     npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog();
-    setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow();
     tradeWindow = new TradeWindow(network);
@@ -339,11 +338,12 @@ Game::Game(Network *network):
     msg.writeInt32(tick_time);
 
     engine->changeMap(map_path);
+
+    setupWindow->setInGame(true);
 }
 
 Game::~Game()
 {
-    delete player_node;
     destroyGuiWindows();
 
     delete beingManager;
@@ -351,6 +351,7 @@ Game::~Game()
     delete joystick;
     delete particleEngine;
     delete engine;
+    delete player_node;
 
     beingManager = NULL;
     floorItemManager = NULL;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 098d4e46..44e08052 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -109,6 +109,8 @@ ChatWindow::~ChatWindow()
     config.setValue("PartyPrefix", partyPrefix);
     config.setValue("ReturnToggles", mReturnToggles ? "1" : "0");
     delete mRecorder;
+    delete mItemLinkHandler;
+    delete mParty;
 }
 
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 4798f598..b24aeb5d 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -65,9 +65,9 @@ Setup::Setup():
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
 
-        // Disable this button when the windows aren't created yet
+        // Store this button, as it needs to be enabled/disabled
         if (!strcmp(*curBtn, "Reset Windows"))
-            btn->setEnabled(statusWindow != NULL);
+            mResetWindows = btn;
     }
 
     TabbedArea *panel = new TabbedArea();
@@ -102,6 +102,8 @@ Setup::Setup():
     add(panel);
 
     setLocationRelativeTo(getParent());
+
+    setInGame(false);
 }
 
 Setup::~Setup()
@@ -141,3 +143,8 @@ void Setup::action(const gcn::ActionEvent &event)
         tradeWindow->resetToDefaultSize();
     }
 }
+
+void Setup::setInGame(bool inGame)
+{
+    mResetWindows->setEnabled(inGame);
+}
\ No newline at end of file
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 9f1bafc7..d798162c 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -32,6 +32,7 @@
 #include "../guichanfwd.h"
 
 class SetupTab;
+class Button;
 
 /**
  * The setup dialog.
@@ -51,6 +52,8 @@ class Setup : public Window, public gcn::ActionListener
          */
         ~Setup();
 
+        void setInGame(bool inGame);
+
         /**
          * Event handling method.
          */
@@ -58,6 +61,7 @@ class Setup : public Window, public gcn::ActionListener
 
     private:
         std::list<SetupTab*> mTabs;
+        gcn::Button *mResetWindows;
 };
 
 #endif
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 31b56b51..ecb5bcf7 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -57,9 +57,8 @@ Setup_Colors::Setup_Colors() :
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
     mPreview->setOpaque(false);
 
-    // Replace this later with a more appropriate link handler. For now, this'll
-    // do, as it'll do nothing when clicked on.
-    mPreview->setLinkHandler(new ItemLinkHandler());
+    // don't do anything with links
+    mPreview->setLinkHandler(NULL);
 
     mPreviewBox = new ScrollArea(mPreview);
     mPreviewBox->setHeight(20);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index a8250fce..c29b70ab 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -162,7 +162,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    delete mTable;
+    delete_all(mSkillList);
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index b2571495..7d0fd48a 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -99,6 +99,7 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
 
 GuiTable::~GuiTable(void)
 {
+    uninstallActionListeners();
     delete mModel;
 }
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index bf1ec01c..b0bf1c59 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -130,6 +130,8 @@ Window::~Window()
         delete(w);
     }
 
+    removeWidgetListener(this);
+
     instances--;
 
     // Clean up static resources
diff --git a/src/main.cpp b/src/main.cpp
index f7468d84..a43544bc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1015,7 +1015,6 @@ int main(int argc, char *argv[])
                     delete progressBar;
                     delete progressLabel;
                     delete setup;
-                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 1c1ba669..65219626 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -29,6 +29,8 @@
 #include "player.h"
 #include "player_relations.h"
 
+#include "utils/dtor.h"
+
 #define PLAYER_IGNORE_STRATEGY_NOP "nop"
 #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
 #define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0
@@ -38,7 +40,6 @@
 
 #define IGNORE_EMOTE_TIME 100
 
-
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -93,6 +94,11 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
+PlayerRelationsManager::~PlayerRelationsManager()
+{
+    delete_all(mIgnoreStrategies);
+}
+
 void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
@@ -346,24 +352,22 @@ private:
 
 
 
-static std::vector<PlayerIgnoreStrategy *> player_ignore_strategies;
-
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
-    if (player_ignore_strategies.size() == 0) {
+    if (mIgnoreStrategies.size() == 0) {
         // not initialised yet?
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
                                                          "floating '...' bubble",
                                                          PLAYER_IGNORE_STRATEGY_EMOTE0));
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
                                                          "floating bubble",
                                                          "emote1"));
-        player_ignore_strategies.push_back(new PIS_nothing());
-        player_ignore_strategies.push_back(new PIS_dotdotdot());
-        player_ignore_strategies.push_back(new PIS_blinkname());
+        mIgnoreStrategies.push_back(new PIS_nothing());
+        mIgnoreStrategies.push_back(new PIS_dotdotdot());
+        mIgnoreStrategies.push_back(new PIS_blinkname());
     }
-    return &player_ignore_strategies;
+    return &mIgnoreStrategies;
 }
 
 
diff --git a/src/player_relations.h b/src/player_relations.h
index 0440cace..edfa9b28 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -95,6 +95,7 @@ class PlayerRelationsManager
 {
 public:
     PlayerRelationsManager();
+    ~PlayerRelationsManager();
 
     /**
      * Initialise player relations manager (load config file etc.)
@@ -233,6 +234,7 @@ private:
     PlayerIgnoreStrategy *mIgnoreStrategy;
     std::map<std::string, PlayerRelation *> mRelations;
     std::list<PlayerRelationsListener *> mListeners;
+    std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies;
 };
 
 
-- 
cgit v1.2.3-70-g09d2


From cabb9735f2e31b9f1f64b2496e1775d54861da36 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 12:23:50 -0600
Subject: Fix some mem leaks

---
 src/beingmanager.cpp     |  5 -----
 src/beingmanager.h       |  4 +---
 src/game.cpp             |  5 ++---
 src/gui/chat.cpp         |  2 --
 src/gui/setup.cpp        | 11 ++---------
 src/gui/setup.h          |  4 ----
 src/gui/setup_colors.cpp |  5 +++--
 src/gui/skill.cpp        |  2 +-
 src/gui/table.cpp        |  1 -
 src/gui/window.cpp       |  2 --
 src/main.cpp             |  1 +
 src/player_relations.cpp | 24 ++++++++++--------------
 src/player_relations.h   |  2 --
 13 files changed, 20 insertions(+), 48 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index e5836aa7..0c7a310a 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -52,11 +52,6 @@ BeingManager::BeingManager(Network *network):
 {
 }
 
-BeingManager::~BeingManager()
-{
-    clear();
-}
-
 void BeingManager::setMap(Map *map)
 {
     mMap = map;
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 3284ce16..472e2c83 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -37,8 +37,6 @@ class BeingManager
     public:
         BeingManager(Network *network);
 
-        ~BeingManager();
-
         /**
          * Sets the map on which beings are created
          */
@@ -115,7 +113,7 @@ class BeingManager
         void logic();
 
         /**
-         * Destroys all beings except the local player
+         * Destroys all beings except the local player and current NPC (if any)
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index 3e626d87..144b059f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -205,6 +205,7 @@ void createGuiWindows(Network *network)
     npcListDialog = new NpcListDialog(network);
     npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog();
+    setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow();
     tradeWindow = new TradeWindow(network);
@@ -338,12 +339,11 @@ Game::Game(Network *network):
     msg.writeInt32(tick_time);
 
     engine->changeMap(map_path);
-
-    setupWindow->setInGame(true);
 }
 
 Game::~Game()
 {
+    delete player_node;
     destroyGuiWindows();
 
     delete beingManager;
@@ -351,7 +351,6 @@ Game::~Game()
     delete joystick;
     delete particleEngine;
     delete engine;
-    delete player_node;
 
     beingManager = NULL;
     floorItemManager = NULL;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 44e08052..098d4e46 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -109,8 +109,6 @@ ChatWindow::~ChatWindow()
     config.setValue("PartyPrefix", partyPrefix);
     config.setValue("ReturnToggles", mReturnToggles ? "1" : "0");
     delete mRecorder;
-    delete mItemLinkHandler;
-    delete mParty;
 }
 
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b24aeb5d..4798f598 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -65,9 +65,9 @@ Setup::Setup():
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
 
-        // Store this button, as it needs to be enabled/disabled
+        // Disable this button when the windows aren't created yet
         if (!strcmp(*curBtn, "Reset Windows"))
-            mResetWindows = btn;
+            btn->setEnabled(statusWindow != NULL);
     }
 
     TabbedArea *panel = new TabbedArea();
@@ -102,8 +102,6 @@ Setup::Setup():
     add(panel);
 
     setLocationRelativeTo(getParent());
-
-    setInGame(false);
 }
 
 Setup::~Setup()
@@ -143,8 +141,3 @@ void Setup::action(const gcn::ActionEvent &event)
         tradeWindow->resetToDefaultSize();
     }
 }
-
-void Setup::setInGame(bool inGame)
-{
-    mResetWindows->setEnabled(inGame);
-}
\ No newline at end of file
diff --git a/src/gui/setup.h b/src/gui/setup.h
index d798162c..9f1bafc7 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -32,7 +32,6 @@
 #include "../guichanfwd.h"
 
 class SetupTab;
-class Button;
 
 /**
  * The setup dialog.
@@ -52,8 +51,6 @@ class Setup : public Window, public gcn::ActionListener
          */
         ~Setup();
 
-        void setInGame(bool inGame);
-
         /**
          * Event handling method.
          */
@@ -61,7 +58,6 @@ class Setup : public Window, public gcn::ActionListener
 
     private:
         std::list<SetupTab*> mTabs;
-        gcn::Button *mResetWindows;
 };
 
 #endif
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index ecb5bcf7..31b56b51 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -57,8 +57,9 @@ Setup_Colors::Setup_Colors() :
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
     mPreview->setOpaque(false);
 
-    // don't do anything with links
-    mPreview->setLinkHandler(NULL);
+    // Replace this later with a more appropriate link handler. For now, this'll
+    // do, as it'll do nothing when clicked on.
+    mPreview->setLinkHandler(new ItemLinkHandler());
 
     mPreviewBox = new ScrollArea(mPreview);
     mPreviewBox->setHeight(20);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index c29b70ab..a8250fce 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -162,7 +162,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    delete_all(mSkillList);
+    delete mTable;
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 7d0fd48a..b2571495 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -99,7 +99,6 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
 
 GuiTable::~GuiTable(void)
 {
-    uninstallActionListeners();
     delete mModel;
 }
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index b0bf1c59..bf1ec01c 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -130,8 +130,6 @@ Window::~Window()
         delete(w);
     }
 
-    removeWidgetListener(this);
-
     instances--;
 
     // Clean up static resources
diff --git a/src/main.cpp b/src/main.cpp
index a43544bc..f7468d84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1015,6 +1015,7 @@ int main(int argc, char *argv[])
                     delete progressBar;
                     delete progressLabel;
                     delete setup;
+                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 65219626..1c1ba669 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -29,8 +29,6 @@
 #include "player.h"
 #include "player_relations.h"
 
-#include "utils/dtor.h"
-
 #define PLAYER_IGNORE_STRATEGY_NOP "nop"
 #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
 #define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0
@@ -40,6 +38,7 @@
 
 #define IGNORE_EMOTE_TIME 100
 
+
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -94,11 +93,6 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
-PlayerRelationsManager::~PlayerRelationsManager()
-{
-    delete_all(mIgnoreStrategies);
-}
-
 void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
@@ -352,22 +346,24 @@ private:
 
 
 
+static std::vector<PlayerIgnoreStrategy *> player_ignore_strategies;
+
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
-    if (mIgnoreStrategies.size() == 0) {
+    if (player_ignore_strategies.size() == 0) {
         // not initialised yet?
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
+        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
                                                          "floating '...' bubble",
                                                          PLAYER_IGNORE_STRATEGY_EMOTE0));
-        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
+        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
                                                          "floating bubble",
                                                          "emote1"));
-        mIgnoreStrategies.push_back(new PIS_nothing());
-        mIgnoreStrategies.push_back(new PIS_dotdotdot());
-        mIgnoreStrategies.push_back(new PIS_blinkname());
+        player_ignore_strategies.push_back(new PIS_nothing());
+        player_ignore_strategies.push_back(new PIS_dotdotdot());
+        player_ignore_strategies.push_back(new PIS_blinkname());
     }
-    return &mIgnoreStrategies;
+    return &player_ignore_strategies;
 }
 
 
diff --git a/src/player_relations.h b/src/player_relations.h
index edfa9b28..0440cace 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -95,7 +95,6 @@ class PlayerRelationsManager
 {
 public:
     PlayerRelationsManager();
-    ~PlayerRelationsManager();
 
     /**
      * Initialise player relations manager (load config file etc.)
@@ -234,7 +233,6 @@ private:
     PlayerIgnoreStrategy *mIgnoreStrategy;
     std::map<std::string, PlayerRelation *> mRelations;
     std::list<PlayerRelationsListener *> mListeners;
-    std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies;
 };
 
 
-- 
cgit v1.2.3-70-g09d2


From 265172dc1e7b97611c485752dc10345545c4e296 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 17:33:32 -0600
Subject: Introduced in a Skin holder class, to reduce the amount of needed XML
 skin loads.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/window.cpp | 97 +++++++++++++++++++++++++++++++++---------------------
 src/gui/window.h   | 35 ++++++++++++++++++--
 2 files changed, 91 insertions(+), 41 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index bf1ec01c..0e91b68d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -40,15 +40,15 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/dtor.h"
 #include "../utils/xml.h"
 
 ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
-//ImageRect Window::border;
-Image *Window::closeImage = NULL;
 bool Window::mAlphaChanged = false;
+Window::Skins mSkins;
 
 class WindowConfigListener : public ConfigListener
 {
@@ -58,6 +58,24 @@ class WindowConfigListener : public ConfigListener
     }
 };
 
+Skin::Skin():
+    closeImage(NULL),
+    instances(0)
+{
+}
+
+Skin::~Skin()
+{
+    // Clean up static resources
+    for (int i = 0; i < 9; i++)
+    {
+        delete border.grid[i];
+        border.grid[i] = NULL;
+    }
+
+    closeImage->decRef();
+}
+
 Window::Window(const std::string& caption, bool modal, Window *parent, const std::string& skin):
     gcn::Window(caption),
     mGrip(0),
@@ -71,8 +89,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     mMinWinWidth(100),
     mMinWinHeight(40),
     mMaxWinWidth(INT_MAX),
-    mMaxWinHeight(INT_MAX),
-    mSkin(skin)
+    mMaxWinHeight(INT_MAX)
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
@@ -82,7 +99,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     }
 
     // Loads the skin
-    loadSkin(mSkin);
+    loadSkin(skin);
 
     setGuiAlpha();
 
@@ -132,20 +149,14 @@ Window::~Window()
 
     instances--;
 
-    // Clean up static resources
-    for (int i = 0; i < 9; i++)
-    {
-        delete border.grid[i];
-        border.grid[i] = NULL;
-    }
+    mSkin->instances--;
 
     if (instances == 0)
     {
         config.removeListener("guialpha", windowConfigListener);
         delete windowConfigListener;
         windowConfigListener = NULL;
-
-        closeImage->decRef();
+        delete_all(mSkins);
     }
 }
 
@@ -161,7 +172,7 @@ void Window::draw(gcn::Graphics *graphics)
 
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    g->drawImageRect(0, 0, getWidth(), getHeight(), border);
+    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->border);
 
     // Draw title
     if (mShowTitle)
@@ -174,8 +185,8 @@ void Window::draw(gcn::Graphics *graphics)
     // Draw Close Button
     if (mCloseButton)
     {
-        g->drawImage(closeImage,
-            getWidth() - closeImage->getWidth() - getPadding(),
+        g->drawImage(mSkin->closeImage,
+            getWidth() - mSkin->closeImage->getWidth() - getPadding(),
             getPadding()
         );
     }
@@ -183,10 +194,10 @@ void Window::draw(gcn::Graphics *graphics)
     // Update window alpha values
     if (mAlphaChanged)
     {
-        for_each(border.grid, border.grid + 9,
+        for_each(mSkin->border.grid, mSkin->border.grid + 9,
                  std::bind2nd(std::mem_fun(&Image::setAlpha),
                  config.getValue("guialpha", 0.8)));
-        closeImage->setAlpha(config.getValue("guialpha", 0.8));
+        mSkin->closeImage->setAlpha(config.getValue("guialpha", 0.8));
     }
     drawChildren(graphics);
 }
@@ -365,10 +376,10 @@ void Window::mousePressed(gcn::MouseEvent &event)
         if (mCloseButton)
         {
             gcn::Rectangle closeButtonRect(
-                getWidth() - closeImage->getWidth() - getPadding(),
+                getWidth() - mSkin->closeImage->getWidth() - getPadding(),
                 getPadding(),
-                closeImage->getWidth(),
-                closeImage->getHeight());
+                mSkin->closeImage->getWidth(),
+                mSkin->closeImage->getHeight());
 
             if (closeButtonRect.isPointInRect(x, y))
             {
@@ -679,7 +690,7 @@ void Window::setGuiAlpha()
     for (int i = 0; i < 9; i++)
     {
         //logger->log("Window::setGuiAlpha: Border Image (%i)", i);
-        border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
+        mSkin->border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
     }
 
     mAlphaChanged = false;
@@ -687,14 +698,24 @@ void Window::setGuiAlpha()
 
 void Window::loadSkin(const std::string &filename)
 {
+    SkinIterator skinIterator = mSkins.find(filename);
+
+    if (mSkins.end() != skinIterator)
+    {
+        skinIterator->second->instances++;
+        mSkin = skinIterator->second;
+        return;
+    }
+
     const std::string windowId = Window::getId();
 
+    mSkin = new Skin();
+
     ResourceManager *resman = ResourceManager::getInstance();
 
     logger->log("Loading Window Skin '%s'.", filename.c_str());
     logger->log("Loading Window ID '%s'.", windowId.c_str());
 
-
     if (filename.empty())
         logger->error("Window::loadSkin(): Invalid File Name.");
 
@@ -706,16 +727,15 @@ void Window::loadSkin(const std::string &filename)
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
-    {
         logger->error("Widget Skinning error");
-    }
 
     std::string skinSetImage;
     skinSetImage = XML::getProperty(rootNode, "image", "");
     Image *dBorders = NULL;
     if (!skinSetImage.empty())
     {
-        logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
+        logger->log("Window::loadSkin(): <skinset> defines "
+                    "'%s' as a skin image.", skinSetImage.c_str());
         dBorders = resman->getImage("graphics/gui/" + skinSetImage);
     }
     else
@@ -735,8 +755,8 @@ void Window::loadSkin(const std::string &filename)
         {
             // Iterate through <part>'s
             // LEEOR / TODO:
-            // We need to make provisions to load in a CloseButton image. For now it
-            // can just be hard-coded.
+            // We need to make provisions to load in a CloseButton image. For 
+            // now it can just be hard-coded.
             for_each_xml_child_node(partNode, widgetNode)
             {
                 if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
@@ -751,27 +771,27 @@ void Window::loadSkin(const std::string &filename)
                 const int height = XML::getProperty(partNode, "height", 1);
 
                 if (partType == "top-left-corner")
-                    border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "top-edge")
-                    border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "top-right-corner")
-                    border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // MIDDLE ROW
                 else if (partType == "left-edge")
-                    border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bg-quad")
-                    border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "right-edge")
-                    border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // BOTTOM ROW
                 else if (partType == "bottom-left-corner")
-                    border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bottom-edge")
-                    border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bottom-right-corner")
-                    border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
+                    mSkin->border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // Part is of an uknown type.
                 else
@@ -789,7 +809,8 @@ void Window::loadSkin(const std::string &filename)
     logger->log("Finished loading Window Skin.");
 
     // Hard-coded for now until we update the above code to look for window buttons.
-    closeImage = resman->getImage("graphics/gui/close_button.png");
+    mSkin->closeImage = resman->getImage("graphics/gui/close_button.png");
+    mSkins[filename] = mSkin;
 }
 
 Layout &Window::getLayout()
diff --git a/src/gui/window.h b/src/gui/window.h
index 4fc6c862..c5660c58 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -23,6 +23,8 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
+#include <map>
+
 #include <guichan/widgetlistener.hpp>
 
 #include <guichan/widgets/window.hpp>
@@ -39,6 +41,18 @@ class LayoutCell;
 class ResizeGrip;
 class WindowContainer;
 
+class Skin
+{
+    public:
+        Skin();
+        ~Skin();
+
+        std::string mName;         /**< Name of the skin to use */
+        ImageRect border;          /**< The window border and background */
+        Image *closeImage;  /**< Close Button Image */
+        int instances;
+};
+
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
  * invisible by default.
@@ -297,7 +311,23 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         ContainerPlacer getPlacer(int x, int y);
 
+        /**
+         * Overrideable functionality for when the window is to close. This
+         * allows for class implementations to clean up or do certain actions
+         * on window close they couldn't do otherwise.
+         */
         virtual void close();
+        
+        /**
+         * Map containing all window skins
+         */
+        typedef std::map<std::string, Skin*> Skins;
+
+        /**
+         * Iterator for window skins
+         */
+        typedef Skins::iterator SkinIterator;
+
 
     protected:
         /** The window container windows add themselves to. */
@@ -341,7 +371,6 @@ class Window : public gcn::Window, gcn::WidgetListener
         int mDefaultY;             /**< Default window Y position */
         int mDefaultWidth;         /**< Default window width */
         int mDefaultHeight;        /**< Default window height */
-        std::string mSkin;         /**< Name of the skin to use */
 
         /**
          * The config listener that listens to changes relevant to all windows.
@@ -350,8 +379,8 @@ class Window : public gcn::Window, gcn::WidgetListener
 
         static int mouseResize;    /**< Active resize handles */
         static int instances;      /**< Number of Window instances */
-        ImageRect border;   /**< The window border and background */
-        static Image *closeImage;  /**< Close Button Image */
+
+        Skin* mSkin;               /**< Skin in use by this window */
 
         /**
          * The width of the resize border. Is independent of the actual window
-- 
cgit v1.2.3-70-g09d2


From 2a6b52f6467bfb4babb2a33205752f58554b651b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 11 Mar 2009 14:38:26 -0600
Subject: Moved the Skin class outside of the Window class, in order to allow
 other widget containers to use skins as well, and to make it easier to extend
 later.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp        |   2 +
 src/CMakeLists.txt |   2 +
 src/Makefile.am    |   2 +
 src/game.cpp       |   1 -
 src/gui/gui.cpp    |   1 +
 src/gui/skin.cpp   | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/skin.h     |  67 +++++++++++++++++++++
 src/gui/window.cpp | 156 +++--------------------------------------------
 src/gui/window.h   |  33 +---------
 src/main.cpp       |  54 +++++++++--------
 10 files changed, 288 insertions(+), 204 deletions(-)
 create mode 100644 src/gui/skin.cpp
 create mode 100644 src/gui/skin.h

(limited to 'src/gui/window.cpp')

diff --git a/aethyra.cbp b/aethyra.cbp
index 46034040..6bae4561 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -236,6 +236,8 @@
 		<Unit filename="src\gui\shortcutwindow.h" />
 		<Unit filename="src\gui\skill.cpp" />
 		<Unit filename="src\gui\skill.h" />
+		<Unit filename="src\gui\skin.cpp" />
+		<Unit filename="src\gui\skin.h" />
 		<Unit filename="src\gui\slider.cpp" />
 		<Unit filename="src\gui\slider.h" />
 		<Unit filename="src\gui\speechbubble.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7003946..171ec7ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -185,6 +185,8 @@ SET(SRCS
     gui/shortcutcontainer.h
     gui/skill.cpp
     gui/skill.h
+    gui/skin.cpp
+    gui/skin.h
     gui/slider.cpp
     gui/slider.h
     gui/speechbubble.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 963e41fb..440c020e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,6 +135,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/shortcutcontainer.h \
 	      gui/skill.cpp \
 	      gui/skill.h \
+	      gui/skin.cpp \
+	      gui/skin.h \
 	      gui/slider.cpp \
 	      gui/slider.h \
 	      gui/speechbubble.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 13be3663..3b621acd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -345,7 +345,6 @@ Game::~Game()
     destroyGuiWindows();
 
     delete beingManager;
-    delete player_node;
     delete floorItemManager;
     delete joystick;
     delete particleEngine;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 85a33218..2c0ddee9 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -27,6 +27,7 @@
 #include "focushandler.h"
 #include "gui.h"
 #include "sdlinput.h"
+#include "skin.h"
 #include "truetypefont.h"
 #include "viewport.h"
 #include "window.h"
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
new file mode 100644
index 00000000..e9d081e9
--- /dev/null
+++ b/src/gui/skin.cpp
@@ -0,0 +1,174 @@
+/*
+ *  Aethyra
+ *  Copyright (C) 2009  Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "skin.h"
+
+#include "../log.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/dtor.h"
+#include "../utils/xml.h"
+
+SkinLoader* skinLoader = NULL;
+
+Skin::Skin():
+    closeImage(NULL),
+    instances(0)
+{
+}
+
+Skin::~Skin()
+{
+    // Clean up static resources
+    for (int i = 0; i < 9; i++)
+    {
+        delete border.grid[i];
+        border.grid[i] = NULL;
+    }
+
+    closeImage->decRef();
+}
+
+Skin* SkinLoader::load(const std::string &filename)
+{
+    SkinIterator skinIterator = mSkins.find(filename);
+
+    if (mSkins.end() != skinIterator)
+    {
+        skinIterator->second->instances++;
+        return skinIterator->second;
+    }
+
+    Skin* skin = new Skin();
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    logger->log("Loading Skin '%s'.", filename.c_str());
+
+    if (filename.empty())
+        logger->error("SkinLoader::load(): Invalid File Name.");
+
+    // TODO:
+    // If there is an error loading the specified file, we should try to revert
+    // to a 'default' skin file. Only if the 'default' skin file can't be loaded
+    // should we have a terminating error.
+    XML::Document doc(filename);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
+        logger->error("Widget Skinning error");
+
+    std::string skinSetImage;
+    skinSetImage = XML::getProperty(rootNode, "image", "");
+    Image *dBorders = NULL;
+    if (!skinSetImage.empty())
+    {
+        logger->log("SkinLoader::load(): <skinset> defines "
+                    "'%s' as a skin image.", skinSetImage.c_str());
+        dBorders = resman->getImage("graphics/gui/" + skinSetImage);
+    }
+    else
+    {
+        logger->error("SkinLoader::load(): Skinset does not define an image!");
+    }
+
+    //iterate <widget>'s
+    for_each_xml_child_node(widgetNode, rootNode)
+    {
+        if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget"))
+            continue;
+
+        std::string widgetType;
+        widgetType = XML::getProperty(widgetNode, "type", "unknown");
+        if (widgetType == "Window")
+        {
+            // Iterate through <part>'s
+            // LEEOR / TODO:
+            // We need to make provisions to load in a CloseButton image. For 
+            // now it can just be hard-coded.
+            for_each_xml_child_node(partNode, widgetNode)
+            {
+                if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
+                    continue;
+
+                std::string partType;
+                partType = XML::getProperty(partNode, "type", "unknown");
+                // TOP ROW
+                const int xPos = XML::getProperty(partNode, "xpos", 0);
+                const int yPos = XML::getProperty(partNode, "ypos", 0);
+                const int width = XML::getProperty(partNode, "width", 1);
+                const int height = XML::getProperty(partNode, "height", 1);
+
+                if (partType == "top-left-corner")
+                    skin->border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "top-edge")
+                    skin->border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "top-right-corner")
+                    skin->border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
+
+                // MIDDLE ROW
+                else if (partType == "left-edge")
+                    skin->border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "bg-quad")
+                    skin->border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "right-edge")
+                    skin->border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
+
+                // BOTTOM ROW
+                else if (partType == "bottom-left-corner")
+                    skin->border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "bottom-edge")
+                    skin->border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
+                else if (partType == "bottom-right-corner")
+                    skin->border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
+
+                // Part is of an uknown type.
+                else
+                    logger->log("SkinLoader::load(): Unknown Part Type '%s'", partType.c_str());
+            }
+        }
+        // Widget is of an uknown type.
+        else
+        {
+            logger->log("SkinLoader::load(): Unknown Widget Type '%s'", widgetType.c_str());
+        }
+    }
+    dBorders->decRef();
+
+    logger->log("Finished loading Skin.");
+
+    // Hard-coded for now until we update the above code to look for window buttons.
+    skin->closeImage = resman->getImage("graphics/gui/close_button.png");
+    mSkins[filename] = skin;
+    return skin;
+}
+
+SkinLoader::SkinLoader()
+{
+}
+
+SkinLoader::~SkinLoader()
+{
+    delete_all(mSkins);
+}
+
diff --git a/src/gui/skin.h b/src/gui/skin.h
new file mode 100644
index 00000000..6dddb4a8
--- /dev/null
+++ b/src/gui/skin.h
@@ -0,0 +1,67 @@
+/*
+ *  Aethyra
+ *  Copyright (C) 2009  Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SKIN_H
+#define SKIN_H
+
+#include <map>
+#include <string>
+
+#include "../graphics.h"
+
+class Image;
+
+class Skin
+{
+    public:
+        Skin();
+        ~Skin();
+
+        std::string mName;         /**< Name of the skin to use */
+        ImageRect border;          /**< The window border and background */
+        Image *closeImage;         /**< Close Button Image */
+        int instances;
+};
+
+// Map containing all window skins
+typedef std::map<std::string, Skin*> Skins;
+
+// Iterator for window skins
+typedef Skins::iterator SkinIterator;
+
+class SkinLoader
+{
+    public:
+        SkinLoader();
+        ~SkinLoader();
+
+        /**
+         * Loads a skin
+         */
+        Skin* load(const std::string &filename);
+
+    private:
+        Skins mSkins;
+};
+
+extern SkinLoader* skinLoader;
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 0e91b68d..def81c53 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -27,6 +27,7 @@
 #include <guichan/exception.hpp>
 
 #include "gui.h"
+#include "skin.h"
 #include "window.h"
 #include "windowcontainer.h"
 
@@ -38,17 +39,12 @@
 #include "../log.h"
 
 #include "../resources/image.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/dtor.h"
-#include "../utils/xml.h"
 
 ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
 bool Window::mAlphaChanged = false;
-Window::Skins mSkins;
 
 class WindowConfigListener : public ConfigListener
 {
@@ -58,24 +54,6 @@ class WindowConfigListener : public ConfigListener
     }
 };
 
-Skin::Skin():
-    closeImage(NULL),
-    instances(0)
-{
-}
-
-Skin::~Skin()
-{
-    // Clean up static resources
-    for (int i = 0; i < 9; i++)
-    {
-        delete border.grid[i];
-        border.grid[i] = NULL;
-    }
-
-    closeImage->decRef();
-}
-
 Window::Window(const std::string& caption, bool modal, Window *parent, const std::string& skin):
     gcn::Window(caption),
     mGrip(0),
@@ -94,17 +72,11 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
     if (!windowContainer)
-    {
         throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
-    }
-
-    // Loads the skin
-    loadSkin(skin);
-
-    setGuiAlpha();
 
     if (instances == 0)
     {
+        skinLoader = new SkinLoader();
         windowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
         windowConfigListener->optionChanged("guialpha");
@@ -117,6 +89,11 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     setPadding(3);
     setTitleBarHeight(20);
 
+    // Loads the skin
+    mSkin = skinLoader->load(skin);
+
+    setGuiAlpha();
+
     // Add this window to the window container
     windowContainer->add(this);
 
@@ -153,10 +130,10 @@ Window::~Window()
 
     if (instances == 0)
     {
+        delete skinLoader;
         config.removeListener("guialpha", windowConfigListener);
         delete windowConfigListener;
         windowConfigListener = NULL;
-        delete_all(mSkins);
     }
 }
 
@@ -696,123 +673,6 @@ void Window::setGuiAlpha()
     mAlphaChanged = false;
 }
 
-void Window::loadSkin(const std::string &filename)
-{
-    SkinIterator skinIterator = mSkins.find(filename);
-
-    if (mSkins.end() != skinIterator)
-    {
-        skinIterator->second->instances++;
-        mSkin = skinIterator->second;
-        return;
-    }
-
-    const std::string windowId = Window::getId();
-
-    mSkin = new Skin();
-
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    logger->log("Loading Window Skin '%s'.", filename.c_str());
-    logger->log("Loading Window ID '%s'.", windowId.c_str());
-
-    if (filename.empty())
-        logger->error("Window::loadSkin(): Invalid File Name.");
-
-    // TODO:
-    // If there is an error loading the specified file, we should try to revert
-    // to a 'default' skin file. Only if the 'default' skin file can't be loaded
-    // should we have a terminating error.
-    XML::Document doc(filename);
-    xmlNodePtr rootNode = doc.rootNode();
-
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
-        logger->error("Widget Skinning error");
-
-    std::string skinSetImage;
-    skinSetImage = XML::getProperty(rootNode, "image", "");
-    Image *dBorders = NULL;
-    if (!skinSetImage.empty())
-    {
-        logger->log("Window::loadSkin(): <skinset> defines "
-                    "'%s' as a skin image.", skinSetImage.c_str());
-        dBorders = resman->getImage("graphics/gui/" + skinSetImage);
-    }
-    else
-    {
-        logger->error("Window::loadSkin(): Skinset does not define an image!");
-    }
-
-    //iterate <widget>'s
-    for_each_xml_child_node(widgetNode, rootNode)
-    {
-        if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget"))
-            continue;
-
-        std::string widgetType;
-        widgetType = XML::getProperty(widgetNode, "type", "unknown");
-        if (widgetType == "Window")
-        {
-            // Iterate through <part>'s
-            // LEEOR / TODO:
-            // We need to make provisions to load in a CloseButton image. For 
-            // now it can just be hard-coded.
-            for_each_xml_child_node(partNode, widgetNode)
-            {
-                if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
-                    continue;
-
-                std::string partType;
-                partType = XML::getProperty(partNode, "type", "unknown");
-                // TOP ROW
-                const int xPos = XML::getProperty(partNode, "xpos", 0);
-                const int yPos = XML::getProperty(partNode, "ypos", 0);
-                const int width = XML::getProperty(partNode, "width", 1);
-                const int height = XML::getProperty(partNode, "height", 1);
-
-                if (partType == "top-left-corner")
-                    mSkin->border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "top-edge")
-                    mSkin->border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "top-right-corner")
-                    mSkin->border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
-
-                // MIDDLE ROW
-                else if (partType == "left-edge")
-                    mSkin->border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "bg-quad")
-                    mSkin->border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "right-edge")
-                    mSkin->border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
-
-                // BOTTOM ROW
-                else if (partType == "bottom-left-corner")
-                    mSkin->border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "bottom-edge")
-                    mSkin->border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
-                else if (partType == "bottom-right-corner")
-                    mSkin->border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
-
-                // Part is of an uknown type.
-                else
-                    logger->log("Window::loadSkin(): Unknown Part Type '%s'", partType.c_str());
-            }
-        }
-        // Widget is of an uknown type.
-        else
-        {
-            logger->log("Window::loadSkin(): Unknown Widget Type '%s'", widgetType.c_str());
-        }
-    }
-    dBorders->decRef();
-
-    logger->log("Finished loading Window Skin.");
-
-    // Hard-coded for now until we update the above code to look for window buttons.
-    mSkin->closeImage = resman->getImage("graphics/gui/close_button.png");
-    mSkins[filename] = mSkin;
-}
-
 Layout &Window::getLayout()
 {
     if (!mLayout) mLayout = new Layout;
diff --git a/src/gui/window.h b/src/gui/window.h
index c5660c58..7ae7ebba 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -23,8 +23,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <map>
-
 #include <guichan/widgetlistener.hpp>
 
 #include <guichan/widgets/window.hpp>
@@ -35,24 +33,13 @@
 class ConfigListener;
 class GCContainer;
 class ContainerPlacer;
-class Image;
 class Layout;
 class LayoutCell;
 class ResizeGrip;
+class Skin;
+class SkinLoader;
 class WindowContainer;
 
-class Skin
-{
-    public:
-        Skin();
-        ~Skin();
-
-        std::string mName;         /**< Name of the skin to use */
-        ImageRect border;          /**< The window border and background */
-        Image *closeImage;  /**< Close Button Image */
-        int instances;
-};
-
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
  * invisible by default.
@@ -296,11 +283,6 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void reflowLayout(int w = 0, int h = 0);
 
-        /**
-         * Loads a window skin
-         */
-        void loadSkin(const std::string &filename);
-
         /**
          * Adds a widget to the window and sets it at given cell.
          */
@@ -317,17 +299,6 @@ class Window : public gcn::Window, gcn::WidgetListener
          * on window close they couldn't do otherwise.
          */
         virtual void close();
-        
-        /**
-         * Map containing all window skins
-         */
-        typedef std::map<std::string, Skin*> Skins;
-
-        /**
-         * Iterator for window skins
-         */
-        typedef Skins::iterator SkinIterator;
-
 
     protected:
         /** The window container windows add themselves to. */
diff --git a/src/main.cpp b/src/main.cpp
index 9e7c91c0..a7032fb1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -437,16 +437,18 @@ void init_engine(const Options &options)
     state = LOGIN_STATE; /**< Initial game state */
 
     // Initialize sound engine
-    try {
-        if (config.getValue("sound", 0) == 1) {
+    try
+    {
+        if (config.getValue("sound", 0) == 1)
             sound.init();
-        }
+
         sound.setSfxVolume((int) config.getValue("sfxVolume",
                     defaultSfxVolume));
         sound.setMusicVolume((int) config.getValue("musicVolume",
                     defaultMusicVolume));
     }
-    catch (const char *err) {
+    catch (const char *err)
+    {
         state = ERROR_STATE;
         errorMessage = err;
         logger->log("Warning: %s", err);
@@ -830,17 +832,18 @@ int main(int argc, char *argv[])
     while (state != EXIT_STATE)
     {
         // Handle SDL events
-        while (SDL_PollEvent(&event)) {
-            switch (event.type) {
+        while (SDL_PollEvent(&event))
+        {
+            switch (event.type)
+            {
                 case SDL_QUIT:
                     state = EXIT_STATE;
                     break;
 
                 case SDL_KEYDOWN:
                     if (event.key.keysym.sym == SDLK_ESCAPE)
-                    {
                         state = EXIT_STATE;
-                    }
+
                     break;
             }
 
@@ -855,11 +858,10 @@ int main(int argc, char *argv[])
         {
             state = ERROR_STATE;
 
-            if (!network->getError().empty()) {
+            if (!network->getError().empty()) 
                 errorMessage = network->getError();
-            } else {
+            else
                 errorMessage = _("Got disconnected from server!");
-            }
         }
 
         if (progressBar->isVisible())
@@ -882,7 +884,8 @@ int main(int argc, char *argv[])
         gui->draw();
         graphics->updateScreen();
 
-        if (state != oldstate) {
+        if (state != oldstate)
+        {
             switch (oldstate)
             {
                 case UPDATE_STATE:
@@ -913,12 +916,14 @@ int main(int argc, char *argv[])
             oldstate = state;
 
             if (currentDialog && state != ACCOUNT_STATE &&
-                    state != CHAR_CONNECT_STATE) {
+                    state != CHAR_CONNECT_STATE)
+            {
                 delete currentDialog;
                 currentDialog = NULL;
             }
 
-            switch (state) {
+            switch (state)
+            {
                 case LOADDATA_STATE:
                     logger->log("State: LOADDATA");
 
@@ -941,10 +946,13 @@ int main(int argc, char *argv[])
                 case LOGIN_STATE:
                     logger->log("State: LOGIN");
 
-                    if (!loginData.password.empty()) {
+                    if (!loginData.password.empty())
+                    {
                         loginData.registerLogin = false;
                         state = ACCOUNT_STATE;
-                    } else {
+                    }
+                    else
+                    {
                         currentDialog = new LoginDialog(&loginData);
                         positionDialog(currentDialog, screenWidth,
                                                       screenHeight);
@@ -1029,9 +1037,12 @@ int main(int argc, char *argv[])
                     break;
 
                 case UPDATE_STATE:
-                    if (options.skipUpdate) {
+                    if (options.skipUpdate)
+                    {
                         state = LOADDATA_STATE;
-                    } else {
+                    }
+                    else
+                    {
                         // Determine which source to use for the update host
                         if (!options.updateHost.empty())
                             updateHost = options.updateHost;
@@ -1109,9 +1120,8 @@ int main(int argc, char *argv[])
     SDLNet_Quit();
 
     if (nullFile)
-    {
         fclose(nullFile);
-    }
+
     logger->log("State: EXIT");
     exit_engine();
     PHYSFS_deinit();
@@ -1123,16 +1133,12 @@ void SetupListener::action(const gcn::ActionEvent &event)
     Window *window = NULL;
 
     if (event.getId() == "Setup")
-    {
         window = setupWindow;
-    }
 
     if (window)
     {
         window->setVisible(!window->isVisible());
         if (window->isVisible())
-        {
             window->requestMoveToTop();
-        }
     }
 }
-- 
cgit v1.2.3-70-g09d2


From c2ae6d9cea9fc3d861e73d4cf7eca5284519758e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 11 Mar 2009 18:06:30 -0600
Subject: Added a new Popup class, which overall is functionally similar to the
 Window class, but stripped down to the bare essential functionality to just
 draw and position them. This means no resizing, no close buttons, no ability
 to move them, etc. This should help reduce the overhead in drawing speech
 bubbles, as well as other popup type dialogs, but is also not a drop in
 replacement for the Window class as well.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp                       |   2 +
 src/CMakeLists.txt                |   2 +
 src/Makefile.am                   |   2 +
 src/game.cpp                      |   4 +-
 src/gui/itempopup.cpp             |  13 +--
 src/gui/itempopup.h               |   4 +-
 src/gui/itemshortcutcontainer.cpp |   2 +-
 src/gui/menuwindow.cpp            |  13 +--
 src/gui/menuwindow.h              |   4 +-
 src/gui/ministatus.cpp            |  15 +--
 src/gui/ministatus.h              |   4 +-
 src/gui/popup.cpp                 | 211 ++++++++++++++++++++++++++++++++++++++
 src/gui/popup.h                   | 196 +++++++++++++++++++++++++++++++++++
 src/gui/popupmenu.cpp             |  10 +-
 src/gui/speechbubble.cpp          |   5 +-
 src/gui/speechbubble.h            |   4 +-
 src/gui/window.cpp                |  61 ++++++-----
 src/gui/window.h                  |   4 -
 src/gui/windowcontainer.cpp       |   2 +
 src/gui/windowcontainer.h         |   7 ++
 20 files changed, 479 insertions(+), 86 deletions(-)
 create mode 100644 src/gui/popup.cpp
 create mode 100644 src/gui/popup.h

(limited to 'src/gui/window.cpp')

diff --git a/aethyra.cbp b/aethyra.cbp
index 6bae4561..aa1737b7 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -195,6 +195,8 @@
 		<Unit filename="src\gui\passwordfield.h" />
 		<Unit filename="src\gui\playerbox.cpp" />
 		<Unit filename="src\gui\playerbox.h" />
+		<Unit filename="src\gui\popup.cpp" />
+		<Unit filename="src\gui\popup.h" />
 		<Unit filename="src\gui\popupmenu.cpp" />
 		<Unit filename="src\gui\popupmenu.h" />
 		<Unit filename="src\gui\progressbar.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 171ec7ff..9fdca23a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,6 +144,8 @@ SET(SRCS
     gui/passwordfield.h
     gui/playerbox.cpp
     gui/playerbox.h
+    gui/popup.cpp
+    gui/popup.h
     gui/popupmenu.cpp
     gui/popupmenu.h
     gui/progressbar.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 440c020e..c4265dec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,6 +94,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/passwordfield.h \
 	      gui/playerbox.cpp \
 	      gui/playerbox.h \
+	      gui/popup.cpp \
+	      gui/popup.h \
 	      gui/popupmenu.cpp \
 	      gui/popupmenu.h \
 	      gui/progressbar.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 3b621acd..47f4ffd2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -220,12 +220,12 @@ void createGuiWindows(Network *network)
     chatWindow->setVisible((bool) config.getValue(
         chatWindow->getWindowName() + "Visible", true));
     miniStatusWindow->setVisible((bool) config.getValue(
-        miniStatusWindow->getWindowName() + "Visible", true));
+        miniStatusWindow->getPopupName() + "Visible", true));
     buyDialog->setVisible(false);
     sellDialog->setVisible(false);
     tradeWindow->setVisible(false);
     menuWindow->setVisible((bool) config.getValue(
-        menuWindow->getWindowName() + "Visible", true));
+        menuWindow->getPopupName() + "Visible", true));
     itemShortcutWindow->setVisible((bool) config.getValue(
         itemShortcutWindow->getWindowName() + "Visible", true));
     emoteShortcutWindow->setVisible((bool) config.getValue(
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 0f7e2d11..ebbc6af3 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -29,9 +29,8 @@
 #include "itempopup.h"
 #include "scrollarea.h"
 #include "textbox.h"
-#include "windowcontainer.h"
 
-#include "widgets/layout.h"
+#include "../graphics.h"
 
 #include "../resources/iteminfo.h"
 
@@ -39,12 +38,8 @@
 #include "../utils/stringutils.h"
 
 ItemPopup::ItemPopup():
-    Window()
+    Popup()
 {
-    setResizable(false);
-    setShowTitle(false);
-    setTitleBarHeight(0);
-
     // Item Name
     mItemName = new gcn::Label("Label");
     mItemName->setFont(boldFont);
@@ -208,8 +203,8 @@ unsigned int ItemPopup::getNumRows()
 
 void ItemPopup::view(int x, int y)
 {
-    if (windowContainer->getWidth() < (x + getWidth() + 5))
-	x = windowContainer->getWidth() - getWidth();
+    if (graphics->getWidth() < (x + getWidth() + 5))
+	x = graphics->getWidth() - getWidth();
     if ((y - getHeight() - 10) < 0)
 	y = 0;
     else
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index a91d8c6f..97da4cbb 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -24,13 +24,13 @@
 #ifndef ITEMPOPUP_H
 #define ITEMPOPUP_H
 
-#include "window.h"
+#include "popup.h"
 
 class ItemInfo;
 class ScrollArea;
 class TextBox;
 
-class ItemPopup : public Window
+class ItemPopup : public Popup
 {
     public:
         ItemPopup();
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index cb709227..c1baca76 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -231,7 +231,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 
     Item *item = player_node->getInventory()->findItem(itemId);
 
-    if (item && inventoryWindow->isVisible())
+    if (item)
     {
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 8a695865..e1be908b 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -26,7 +26,9 @@
 
 #include "button.h"
 #include "menuwindow.h"
-#include "windowcontainer.h"
+#include "window.h"
+
+#include "../graphics.h"
 
 #include "../utils/gettext.h"
 
@@ -50,13 +52,8 @@ namespace {
 }
 
 MenuWindow::MenuWindow():
-    Window("")
+    Popup("Menu")
 {
-    setResizable(false);
-    setWindowName("Menu");
-    setMovable(false);
-    setTitleBarHeight(0);
-
     // Buttons
     static const char *buttonNames[] =
     {
@@ -81,7 +78,7 @@ MenuWindow::MenuWindow():
         h = btn->getHeight();
     }
 
-    setPosition(windowContainer->getWidth() - x - 3, 3);
+    setPosition(graphics->getWidth() - x - 3, 3);
     setContentSize(x - 3, h);
 }
 
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index f70a332e..e8dc0b2e 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -23,14 +23,14 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include "window.h"
+#include "popup.h"
 
 /**
  * The Button Menu.
  *
  * \ingroup Interface
  */
-class MenuWindow : public Window
+class MenuWindow : public Popup
 {
     public:
         /**
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 6537b48e..18b9d714 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -31,13 +31,8 @@
 #include "../utils/stringutils.h"
 
 MiniStatusWindow::MiniStatusWindow():
-    Window("")
+    Popup("MiniStatus")
 {
-    setWindowName("MiniStatus");
-    setResizable(false);
-    setMovable(false);
-    setTitleBarHeight(0);
-
     mHpBar = new ProgressBar(1.0f, 100, 20, 0, 171, 34);
     mMpBar = new ProgressBar(1.0f, 100, 20, 26, 102, 230);
     mXpBar = new ProgressBar(1.0f, 100, 20, 143, 192, 211);
@@ -52,25 +47,17 @@ MiniStatusWindow::MiniStatusWindow():
 
     setContentSize(mXpBar->getX() + mXpBar->getWidth(),
                    mXpBar->getY() + mXpBar->getHeight());
-    setDefaultSize(0, 0, getWidth(), getHeight());
-    loadWindowState();
 }
 
 void MiniStatusWindow::update()
 {
     // HP Bar coloration
     if (player_node->mHp < int(player_node->mMaxHp / 3))
-    {
         mHpBar->setColor(223, 32, 32); // Red
-    }
     else if (player_node->mHp < int((player_node->mMaxHp / 3) * 2))
-    {
         mHpBar->setColor(230, 171, 34); // Orange
-    }
     else
-    {
         mHpBar->setColor(0, 171, 34); // Green
-    }
 
     float xp = (float) player_node->getXp() / player_node->mXpForNextLevel;
 
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 33ee548d..b3fc58fc 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -23,7 +23,7 @@
 #ifndef MINISTATUS_H
 #define MINISTATUS_H
 
-#include "window.h"
+#include "popup.h"
 
 class ProgressBar;
 
@@ -32,7 +32,7 @@ class ProgressBar;
  *
  * \ingroup Interface
  */
-class MiniStatusWindow : public Window
+class MiniStatusWindow : public Popup
 {
     public:
         /**
diff --git a/src/gui/popup.cpp b/src/gui/popup.cpp
new file mode 100644
index 00000000..906f7a2e
--- /dev/null
+++ b/src/gui/popup.cpp
@@ -0,0 +1,211 @@
+/*
+ *  Aethyra
+ *  Copyright (C) 2009  Aethyra Development Team
+ *
+ *  This file is part of Aethyra based on original code
+ *  from The Mana World.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <algorithm>
+#include <cassert>
+#include <climits>
+
+#include <guichan/exception.hpp>
+
+#include "gui.h"
+#include "skin.h"
+#include "popup.h"
+#include "window.h"
+#include "windowcontainer.h"
+
+#include "../configlistener.h"
+#include "../configuration.h"
+#include "../log.h"
+
+#include "../resources/image.h"
+
+ConfigListener *Popup::popupConfigListener = 0;
+int Popup::instances = 0;
+bool Popup::mAlphaChanged = false;
+
+class PopupConfigListener : public ConfigListener
+{
+    void optionChanged(const std::string &)
+    {
+        Popup::mAlphaChanged = true;
+    }
+};
+
+Popup::Popup(const std::string& name, Window *parent,
+             const std::string& skin):
+    mParent(parent),
+    mPopupName(name),
+    mMinWidth(100),
+    mMinHeight(40),
+    mMaxWidth(INT_MAX),
+    mMaxHeight(INT_MAX)
+{
+    logger->log("Popup::Popup(\"%s\")", name.c_str());
+
+    if (!windowContainer)
+        throw GCN_EXCEPTION("Popup::Popup(): no windowContainer set");
+
+    if (instances == 0)
+    {
+        popupConfigListener = new PopupConfigListener();
+        // Send GUI alpha changed for initialization
+        popupConfigListener->optionChanged("guialpha");
+        config.addListener("guialpha", popupConfigListener);
+    }
+
+    setPadding(3);
+
+    instances++;
+
+    // Loads the skin
+    mSkin = skinLoader->load(skin);
+
+    setGuiAlpha();
+
+    // Add this window to the window container
+    windowContainer->add(this);
+
+    // Popups are invisible by default
+    setVisible(false);
+
+    addWidgetListener(this);
+}
+
+Popup::~Popup()
+{
+    logger->log("Popup::~Popup(\"%s\")", mPopupName.c_str());
+
+    while (!mWidgets.empty())
+    {
+        gcn::Widget *w = mWidgets.front();
+        remove(w);
+        delete(w);
+    }
+
+    instances--;
+
+    mSkin->instances--;
+
+    if (instances == 0)
+    {
+        config.removeListener("guialpha", popupConfigListener);
+        delete popupConfigListener;
+        popupConfigListener = NULL;
+    }
+}
+
+void Popup::setWindowContainer(WindowContainer *wc)
+{
+    windowContainer = wc;
+}
+
+void Popup::draw(gcn::Graphics *graphics)
+{
+    if (!isVisible())
+        return;
+
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->border);
+
+    // Update Popup alpha values
+    if (mAlphaChanged)
+    {
+        for_each(mSkin->border.grid, mSkin->border.grid + 9,
+                 std::bind2nd(std::mem_fun(&Image::setAlpha),
+                 config.getValue("guialpha", 0.8)));
+    }
+    drawChildren(graphics);
+}
+
+gcn::Rectangle Popup::getChildrenArea()
+{
+    return gcn::Rectangle(getPadding(), 0, getWidth() - getPadding() * 2,
+                          getHeight() - getPadding() * 2);
+}
+
+void Popup::setContentSize(int width, int height)
+{
+    width += 2 * getPadding();
+    height += 2 * getPadding();
+
+    if (getMinWidth() > width)
+        width = getMinWidth();
+    else if (getMaxWidth() < width)
+        width = getMaxWidth();
+    if (getMinHeight() > height)
+        height = getMinHeight();
+    else if (getMaxHeight() < height)
+        height = getMaxHeight();
+
+    setSize(width, height);
+}
+
+void Popup::setLocationRelativeTo(gcn::Widget *widget)
+{
+    int wx, wy;
+    int x, y;
+
+    widget->getAbsolutePosition(wx, wy);
+    getAbsolutePosition(x, y);
+
+    setPosition(getX() + (wx + (widget->getWidth() - getWidth()) / 2 - x),
+                getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
+}
+
+void Popup::setMinWidth(unsigned int width)
+{
+    mMinWidth = width;
+}
+
+void Popup::setMinHeight(unsigned int height)
+{
+    mMinHeight = height;
+}
+
+void Popup::setMaxWidth(unsigned int width)
+{
+    mMaxWidth = width;
+}
+
+void Popup::setMaxHeight(unsigned int height)
+{
+    mMaxHeight = height;
+}
+
+void Popup::scheduleDelete()
+{
+    windowContainer->scheduleDelete(this);
+}
+
+void Popup::setGuiAlpha()
+{
+    //logger->log("Popup::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8));
+    for (int i = 0; i < 9; i++)
+    {
+        //logger->log("Popup::setGuiAlpha: Border Image (%i)", i);
+        mSkin->border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
+    }
+
+    mAlphaChanged = false;
+}
+
diff --git a/src/gui/popup.h b/src/gui/popup.h
new file mode 100644
index 00000000..0f7eebbf
--- /dev/null
+++ b/src/gui/popup.h
@@ -0,0 +1,196 @@
+/*
+ *  Aethyra
+ *  Copyright (C) 2009  Aethyra Development Team
+ *
+ *  This file is part of Aethyra based on original code
+ *  from The Mana World.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef POPUP_H
+#define POPUP_H
+
+#include <guichan/widgetlistener.hpp>
+
+#include <guichan/widgets/container.hpp>
+
+#include "../graphics.h"
+#include "../guichanfwd.h"
+
+class ConfigListener;
+class Skin;
+class SkinLoader;
+class Window;
+class WindowContainer;
+
+/**
+ * A rather reduced down version of the Window class that is particularly suited
+ * for 
+ *
+ * \ingroup GUI
+ */
+class Popup : public gcn::Container, gcn::WidgetListener
+{
+    public:
+        friend class PopupConfigListener;
+
+        /**
+         * Constructor. Initializes the title to the given text and hooks
+         * itself into the popup container.
+         *
+         * @param name    A human readable name for the popup. Only useful for
+         *                debugging purposes.
+         * @param parent  The parent Window. This is the Window standing above
+         *                this one in the Window hiearchy. When reordering,
+         *                a Popup will never go below its parent Window.
+         * @param skin    The location where the Popup's skin XML can be found.
+         */
+        Popup(const std::string& name = "", Window *parent = NULL,
+              const std::string &skin = "graphics/gui/gui.xml");
+
+        /**
+         * Destructor. Deletes all the added widgets.
+         */
+        ~Popup();
+
+        /**
+         * Sets the window container to be used by new popups.
+         */
+        static void setWindowContainer(WindowContainer *windowContainer);
+
+        /**
+         * Draws the popup.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Sets the size of this popup.
+         */
+        void setContentSize(int width, int height);
+
+        /**
+         * Sets the location relative to the given widget.
+         */
+        void setLocationRelativeTo(gcn::Widget *widget);
+
+        /**
+         * Sets the minimum width of the popup.
+         */
+        void setMinWidth(unsigned int width);
+
+        /**
+         * Sets the minimum height of the popup.
+         */
+        void setMinHeight(unsigned int height);
+
+        /**
+         * Sets the maximum width of the popup.
+         */
+        void setMaxWidth(unsigned int width);
+
+        /**
+         * Sets the minimum height of the popup.
+         */
+        void setMaxHeight(unsigned int height);
+
+        /**
+         * Gets the minimum width of the popup.
+         */
+        int getMinWidth() { return mMinWidth; }
+
+        /**
+         * Gets the minimum height of the popup.
+         */
+        int getMinHeight() { return mMinHeight; }
+
+        /**
+         * Gets the maximum width of the popup.
+         */
+        int getMaxWidth() { return mMaxWidth; }
+
+        /**
+         * Gets the minimum height of the popup.
+         */
+        int getMaxHeight() { return mMaxHeight; }
+
+        /**
+         * Gets the padding of the popup. The padding is the distance between
+         * the popup border and the content.
+         *
+         * @return The padding of the popup.
+         * @see setPadding
+         */
+        unsigned int getPadding() const { return mPadding; }
+
+        /**
+         * Sets the padding of the popup. The padding is the distance between the
+         * popup border and the content.
+         *
+         * @param padding The padding of the popup.
+         * @see getPadding
+         */
+        void setPadding(unsigned int padding) { mPadding = padding; }
+
+        /**
+         * Returns the parent Window.
+         *
+         * @return The parent Window or <code>NULL</code> if there is none.
+         */
+        Window* getParentWindow() { return mParent; }
+
+        /**
+         * Sets the name of the popup. This is only useful for debug purposes.
+         */
+        void setPopupName(const std::string &name) { mPopupName = name; }
+
+        /**
+         * Returns the name of the popup. This is only useful for debug purposes.
+         */
+        const std::string& getPopupName() { return mPopupName; }
+
+        /**
+         * Schedule this popup for deletion. It will be deleted at the start
+         * of the next logic update.
+         */
+        void scheduleDelete();
+
+        // Inherited from BasicContainer
+
+        virtual gcn::Rectangle getChildrenArea();
+
+    private:
+        void setGuiAlpha();
+
+        Window *mParent;           /**< The parent Window (if there is one) */
+        std::string mPopupName;    /**< Name of the Popup */
+        static bool mAlphaChanged; /**< Whether the alpha percent was changed */
+        int mMinWidth;             /**< Minimum Popup width */
+        int mMinHeight;            /**< Minimum Popup height */
+        int mMaxWidth;             /**< Maximum Popup width */
+        int mMaxHeight;            /**< Maximum Popup height */
+        unsigned int mPadding;     /**< Holds the padding of the window. */ 
+
+        /**
+         * The config listener that listens to changes relevant to all Popups.
+         */
+        static ConfigListener *popupConfigListener;
+
+        static int instances;      /**< Number of Popup instances */
+
+        Skin* mSkin;               /**< Skin in use by this Popup */
+};
+
+#endif
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index cead20ed..02be3055 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -27,11 +27,11 @@
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "popupmenu.h"
-#include "windowcontainer.h"
 
 #include "../being.h"
 #include "../beingmanager.h"
 #include "../floor_item.h"
+#include "../graphics.h"
 #include "../item.h"
 #include "../localplayer.h"
 #include "../npc.h"
@@ -292,10 +292,10 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 void PopupMenu::showPopup(int x, int y)
 {
     setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
-    if (windowContainer->getWidth() < (x + getWidth() + 5))
-        x = windowContainer->getWidth() - getWidth();
-    if (windowContainer->getHeight() < (y + getHeight() + 5))
-        y = windowContainer->getHeight() - getHeight();
+    if (graphics->getWidth() < (x + getWidth() + 5))
+        x = graphics->getWidth() - getWidth();
+    if (graphics->getHeight() < (y + getHeight() + 5))
+        y = graphics->getHeight() - getHeight();
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index dcb03dca..0b18209e 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -32,13 +32,10 @@
 #include "../utils/gettext.h"
 
 SpeechBubble::SpeechBubble():
-    Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml"),
+    Popup("Speech", NULL, "graphics/gui/speechbubble.xml"),
     mText("")
 {
     setContentSize(140, 46);
-    setShowTitle(false);
-    setTitleBarHeight(0);
-
     setMinWidth(29);
     setMinHeight(29);
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 6b03cc85..a1a597c1 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -23,12 +23,12 @@
 #ifndef SPEECHBUBBLE_H
 #define SPEECHBUBBLE_H
 
-#include "window.h"
+#include "popup.h"
 
 class ScrollArea;
 class TextBox;
 
-class SpeechBubble : public Window
+class SpeechBubble : public Popup
 {
     public:
         SpeechBubble();
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index def81c53..76c19751 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -41,7 +41,6 @@
 #include "../resources/image.h"
 
 ConfigListener *Window::windowConfigListener = 0;
-WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
 bool Window::mAlphaChanged = false;
@@ -216,39 +215,39 @@ void Window::setLocationRelativeTo(ImageRect::ImagePosition position,
     }
     else if (position == ImageRect::UPPER_CENTER)
     {
-        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
+        offsetX += (graphics->getWidth() - getWidth()) / 2;
     }
     else if (position == ImageRect::UPPER_RIGHT)
     {
-        offsetX += windowContainer->getWidth() - getWidth();
+        offsetX += graphics->getWidth() - getWidth();
     }
     else if (position == ImageRect::LEFT)
     {
-        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
+        offsetY += (graphics->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::CENTER)
     {
-        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
-        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
+        offsetX += (graphics->getWidth() - getWidth()) / 2;
+        offsetY += (graphics->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::RIGHT)
     {
-        offsetX += windowContainer->getWidth() - getWidth();
-        offsetY += (windowContainer->getHeight() - getHeight()) / 2;
+        offsetX += graphics->getWidth() - getWidth();
+        offsetY += (graphics->getHeight() - getHeight()) / 2;
     }
     else if (position == ImageRect::LOWER_LEFT)
     {
-        offsetY += windowContainer->getHeight() - getHeight();
+        offsetY += graphics->getHeight() - getHeight();
     }
     else if (position == ImageRect::LOWER_CENTER)
     {
-        offsetX += (windowContainer->getWidth() - getWidth()) / 2;
-        offsetY += windowContainer->getHeight() - getHeight();
+        offsetX += (graphics->getWidth() - getWidth()) / 2;
+        offsetY += graphics->getHeight() - getHeight();
     }
     else if (position == ImageRect::LOWER_RIGHT)
     {
-        offsetX += windowContainer->getWidth() - getWidth();
-        offsetY += windowContainer->getHeight() - getHeight();
+        offsetX += graphics->getWidth() - getWidth();
+        offsetY += graphics->getHeight() - getHeight();
     }
 
     setPosition(offsetX, offsetY);
@@ -429,8 +428,8 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     {
         int newX = std::max(0, getX());
         int newY = std::max(0, getY());
-        newX = std::min(windowContainer->getWidth() - getWidth(), newX);
-        newY = std::min(windowContainer->getHeight() - getHeight(), newY);
+        newX = std::min(graphics->getWidth() - getWidth(), newX);
+        newY = std::min(graphics->getHeight() - getHeight(), newY);
         setPosition(newX, newY);
     }
 
@@ -475,13 +474,13 @@ void Window::mouseDragged(gcn::MouseEvent &event)
             newDim.height += newDim.y;
             newDim.y = 0;
         }
-        if (newDim.x + newDim.width > windowContainer->getWidth())
+        if (newDim.x + newDim.width > graphics->getWidth())
         {
-            newDim.width = windowContainer->getWidth() - newDim.x;
+            newDim.width = graphics->getWidth() - newDim.x;
         }
-        if (newDim.y + newDim.height > windowContainer->getHeight())
+        if (newDim.y + newDim.height > graphics->getHeight())
         {
-            newDim.height = windowContainer->getHeight() - newDim.y;
+            newDim.height = graphics->getHeight() - newDim.y;
         }
 
         // Update mouse offset when dragging bottom or right border
@@ -585,39 +584,39 @@ void Window::setDefaultSize(int defaultWidth, int defaultHeight,
     }
     else if (position == ImageRect::UPPER_CENTER)
     {
-        x = (windowContainer->getWidth() - defaultWidth) / 2;
+        x = (graphics->getWidth() - defaultWidth) / 2;
     }
     else if (position == ImageRect::UPPER_RIGHT)
     {
-        x = windowContainer->getWidth() - defaultWidth;
+        x = graphics->getWidth() - defaultWidth;
     }
     else if (position == ImageRect::LEFT)
     {
-        y = (windowContainer->getHeight() - defaultHeight) / 2;
+        y = (graphics->getHeight() - defaultHeight) / 2;
     }
     else if (position == ImageRect::CENTER)
     {
-        x = (windowContainer->getWidth() - defaultWidth) / 2;
-        y = (windowContainer->getHeight() - defaultHeight) / 2;
+        x = (graphics->getWidth() - defaultWidth) / 2;
+        y = (graphics->getHeight() - defaultHeight) / 2;
     }
     else if (position == ImageRect::RIGHT)
     {
-        x = windowContainer->getWidth() - defaultWidth;
-        y = (windowContainer->getHeight() - defaultHeight) / 2;
+        x = graphics->getWidth() - defaultWidth;
+        y = (graphics->getHeight() - defaultHeight) / 2;
     }
     else if (position == ImageRect::LOWER_LEFT)
     {
-        y = windowContainer->getHeight() - defaultHeight;
+        y = graphics->getHeight() - defaultHeight;
     }
     else if (position == ImageRect::LOWER_CENTER)
     {
-        x = (windowContainer->getWidth() - defaultWidth) / 2;
-        y = windowContainer->getHeight() - defaultHeight;
+        x = (graphics->getWidth() - defaultWidth) / 2;
+        y = graphics->getHeight() - defaultHeight;
     }
     else if (position == ImageRect::LOWER_RIGHT)
     {
-        x = windowContainer->getWidth() - defaultWidth;
-        y = windowContainer->getHeight() - defaultHeight;
+        x = graphics->getWidth() - defaultWidth;
+        y = graphics->getHeight() - defaultHeight;
     }
 
     mDefaultX = x - offsetX;
diff --git a/src/gui/window.h b/src/gui/window.h
index 7ae7ebba..d573d85f 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -300,10 +300,6 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         virtual void close();
 
-    protected:
-        /** The window container windows add themselves to. */
-        static WindowContainer *windowContainer;
-
     private:
         enum ResizeHandles
         {
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 0aa61965..ad86a253 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -24,6 +24,8 @@
 
 #include "../utils/dtor.h"
 
+WindowContainer *windowContainer = NULL;
+
 void WindowContainer::logic()
 {
     delete_all(mDeathList);
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index 09f34cf5..23b221cf 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -46,6 +46,11 @@ class WindowContainer : public gcn::Container
          */
         void scheduleDelete(gcn::Widget *widget);
 
+        /**
+         * Get the number of widget instances
+         */
+        int getNumberOfInstances() { return mDeathList.size(); }
+
     private:
         /**
          * List of widgets that are scheduled to be deleted.
@@ -55,4 +60,6 @@ class WindowContainer : public gcn::Container
         Widgets mDeathList;
 };
 
+extern WindowContainer* windowContainer;
+
 #endif
-- 
cgit v1.2.3-70-g09d2


From c410a861fddc7829408d687e61c67c6101555067 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 11 Mar 2009 21:38:17 -0600
Subject: Modified Skin class to use proper encapsulation, instead of leaving
 its skin variables public.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/popup.cpp  |  6 +++---
 src/gui/skin.cpp   | 47 ++++++++++++++++++++++++++++++++---------------
 src/gui/skin.h     | 40 +++++++++++++++++++++++++++++++++++++---
 src/gui/window.cpp | 18 +++++++++---------
 4 files changed, 81 insertions(+), 30 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/popup.cpp b/src/gui/popup.cpp
index 4cf6bbf0..8e0c8fb9 100644
--- a/src/gui/popup.cpp
+++ b/src/gui/popup.cpp
@@ -123,12 +123,12 @@ void Popup::draw(gcn::Graphics *graphics)
 
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->border);
+    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->getBorder());
 
     // Update Popup alpha values
     if (mAlphaChanged)
     {
-        for_each(mSkin->border.grid, mSkin->border.grid + 9,
+        for_each(mSkin->getBorder().grid, mSkin->getBorder().grid + 9,
                  std::bind2nd(std::mem_fun(&Image::setAlpha),
                  config.getValue("guialpha", 0.8)));
     }
@@ -201,7 +201,7 @@ void Popup::setGuiAlpha()
     for (int i = 0; i < 9; i++)
     {
         //logger->log("Popup::setGuiAlpha: Border Image (%i)", i);
-        mSkin->border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
+        mSkin->getBorder().grid[i]->setAlpha(config.getValue("guialpha", 0.8));
     }
 
     mAlphaChanged = false;
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index e9d081e9..8787770c 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -31,9 +31,11 @@
 
 SkinLoader* skinLoader = NULL;
 
-Skin::Skin():
-    closeImage(NULL),
-    instances(0)
+Skin::Skin(ImageRect skin, Image* close, std::string name):
+    instances(0),
+    mName(name),
+    border(skin),
+    closeImage(close)
 {
 }
 
@@ -49,6 +51,18 @@ Skin::~Skin()
     closeImage->decRef();
 }
 
+int Skin::getMinWidth()
+{
+    return (border.grid[0]->getWidth() + border.grid[1]->getWidth()) +
+            border.grid[2]->getWidth();
+}
+
+int Skin::getMinHeight()
+{
+    return (border.grid[0]->getHeight() + border.grid[3]->getHeight()) +
+            border.grid[6]->getHeight();
+}
+
 Skin* SkinLoader::load(const std::string &filename)
 {
     SkinIterator skinIterator = mSkins.find(filename);
@@ -59,8 +73,6 @@ Skin* SkinLoader::load(const std::string &filename)
         return skinIterator->second;
     }
 
-    Skin* skin = new Skin();
-
     ResourceManager *resman = ResourceManager::getInstance();
 
     logger->log("Loading Skin '%s'.", filename.c_str());
@@ -81,6 +93,8 @@ Skin* SkinLoader::load(const std::string &filename)
     std::string skinSetImage;
     skinSetImage = XML::getProperty(rootNode, "image", "");
     Image *dBorders = NULL;
+    ImageRect border;
+
     if (!skinSetImage.empty())
     {
         logger->log("SkinLoader::load(): <skinset> defines "
@@ -120,27 +134,27 @@ Skin* SkinLoader::load(const std::string &filename)
                 const int height = XML::getProperty(partNode, "height", 1);
 
                 if (partType == "top-left-corner")
-                    skin->border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "top-edge")
-                    skin->border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "top-right-corner")
-                    skin->border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // MIDDLE ROW
                 else if (partType == "left-edge")
-                    skin->border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bg-quad")
-                    skin->border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "right-edge")
-                    skin->border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // BOTTOM ROW
                 else if (partType == "bottom-left-corner")
-                    skin->border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bottom-edge")
-                    skin->border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
                 else if (partType == "bottom-right-corner")
-                    skin->border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
+                    border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
 
                 // Part is of an uknown type.
                 else
@@ -158,7 +172,10 @@ Skin* SkinLoader::load(const std::string &filename)
     logger->log("Finished loading Skin.");
 
     // Hard-coded for now until we update the above code to look for window buttons.
-    skin->closeImage = resman->getImage("graphics/gui/close_button.png");
+    Image* closeImage = resman->getImage("graphics/gui/close_button.png");
+
+    Skin* skin = new Skin(border, closeImage);
+
     mSkins[filename] = skin;
     return skin;
 }
diff --git a/src/gui/skin.h b/src/gui/skin.h
index 6dddb4a8..b7e70330 100644
--- a/src/gui/skin.h
+++ b/src/gui/skin.h
@@ -32,13 +32,47 @@ class Image;
 class Skin
 {
     public:
-        Skin();
+        Skin(ImageRect skin, Image* close, std::string name = "");
         ~Skin();
 
+        /**
+         * Returns the skin's name. Useful for giving a human friendly skin
+         * name if a dialog for skin selection for a specific window type is
+         * done.
+         */
+        std::string getName() { return mName; }
+
+        /**
+         * Returns the background skin.
+         */
+        ImageRect getBorder() { return border; }
+
+        /**
+         * Returns the image used by a close button for this skin.
+         */
+        Image* getCloseImage() { return closeImage; }
+
+        /**
+         * Returns the number of instances which use this skin.
+         */
+        int getNumberOfInstances() { return instances; }
+
+        /**
+         * Returns the minimum width which can be used with this skin.
+         */
+        int getMinWidth();
+
+        /**
+         * Returns the minimum height which can be used with this skin.
+         */
+        int getMinHeight();
+
+        int instances;
+
+    private:
         std::string mName;         /**< Name of the skin to use */
         ImageRect border;          /**< The window border and background */
         Image *closeImage;         /**< Close Button Image */
-        int instances;
 };
 
 // Map containing all window skins
@@ -47,7 +81,7 @@ typedef std::map<std::string, Skin*> Skins;
 // Iterator for window skins
 typedef Skins::iterator SkinIterator;
 
-class SkinLoader
+class SkinLoader 
 {
     public:
         SkinLoader();
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 76c19751..5c01daf3 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -148,7 +148,7 @@ void Window::draw(gcn::Graphics *graphics)
 
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->border);
+    g->drawImageRect(0, 0, getWidth(), getHeight(), mSkin->getBorder());
 
     // Draw title
     if (mShowTitle)
@@ -161,8 +161,8 @@ void Window::draw(gcn::Graphics *graphics)
     // Draw Close Button
     if (mCloseButton)
     {
-        g->drawImage(mSkin->closeImage,
-            getWidth() - mSkin->closeImage->getWidth() - getPadding(),
+        g->drawImage(mSkin->getCloseImage(),
+            getWidth() - mSkin->getCloseImage()->getWidth() - getPadding(),
             getPadding()
         );
     }
@@ -170,10 +170,10 @@ void Window::draw(gcn::Graphics *graphics)
     // Update window alpha values
     if (mAlphaChanged)
     {
-        for_each(mSkin->border.grid, mSkin->border.grid + 9,
+        for_each(mSkin->getBorder().grid, mSkin->getBorder().grid + 9,
                  std::bind2nd(std::mem_fun(&Image::setAlpha),
                  config.getValue("guialpha", 0.8)));
-        mSkin->closeImage->setAlpha(config.getValue("guialpha", 0.8));
+        mSkin->getCloseImage()->setAlpha(config.getValue("guialpha", 0.8));
     }
     drawChildren(graphics);
 }
@@ -352,10 +352,10 @@ void Window::mousePressed(gcn::MouseEvent &event)
         if (mCloseButton)
         {
             gcn::Rectangle closeButtonRect(
-                getWidth() - mSkin->closeImage->getWidth() - getPadding(),
+                getWidth() - mSkin->getCloseImage()->getWidth() - getPadding(),
                 getPadding(),
-                mSkin->closeImage->getWidth(),
-                mSkin->closeImage->getHeight());
+                mSkin->getCloseImage()->getWidth(),
+                mSkin->getCloseImage()->getHeight());
 
             if (closeButtonRect.isPointInRect(x, y))
             {
@@ -666,7 +666,7 @@ void Window::setGuiAlpha()
     for (int i = 0; i < 9; i++)
     {
         //logger->log("Window::setGuiAlpha: Border Image (%i)", i);
-        mSkin->border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
+        mSkin->getBorder().grid[i]->setAlpha(config.getValue("guialpha", 0.8));
     }
 
     mAlphaChanged = false;
-- 
cgit v1.2.3-70-g09d2


From 5b1e2aae6391edc99425ed7671d59eddd774212e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 11 Mar 2009 21:46:22 -0600
Subject: Enforce minimum widths and heights to be at least as big as the
 minumum width and height for the skin used.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/popup.cpp  | 4 ++--
 src/gui/skin.cpp   | 4 ++--
 src/gui/skin.h     | 4 ++--
 src/gui/window.cpp | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/popup.cpp b/src/gui/popup.cpp
index 8e0c8fb9..17d299a5 100644
--- a/src/gui/popup.cpp
+++ b/src/gui/popup.cpp
@@ -172,12 +172,12 @@ void Popup::setLocationRelativeTo(gcn::Widget *widget)
 
 void Popup::setMinWidth(unsigned int width)
 {
-    mMinWidth = width;
+    mMinWidth = width > mSkin->getMinWidth() ? width : mSkin->getMinWidth();
 }
 
 void Popup::setMinHeight(unsigned int height)
 {
-    mMinHeight = height;
+    mMinHeight = height > mSkin->getMinHeight() ? height : mSkin->getMinHeight();
 }
 
 void Popup::setMaxWidth(unsigned int width)
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index 8787770c..d44c54a8 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -51,13 +51,13 @@ Skin::~Skin()
     closeImage->decRef();
 }
 
-int Skin::getMinWidth()
+unsigned int Skin::getMinWidth()
 {
     return (border.grid[0]->getWidth() + border.grid[1]->getWidth()) +
             border.grid[2]->getWidth();
 }
 
-int Skin::getMinHeight()
+unsigned int Skin::getMinHeight()
 {
     return (border.grid[0]->getHeight() + border.grid[3]->getHeight()) +
             border.grid[6]->getHeight();
diff --git a/src/gui/skin.h b/src/gui/skin.h
index b7e70330..b8a1242e 100644
--- a/src/gui/skin.h
+++ b/src/gui/skin.h
@@ -60,12 +60,12 @@ class Skin
         /**
          * Returns the minimum width which can be used with this skin.
          */
-        int getMinWidth();
+        unsigned int getMinWidth();
 
         /**
          * Returns the minimum height which can be used with this skin.
          */
-        int getMinHeight();
+        unsigned int getMinHeight();
 
         int instances;
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 5c01daf3..d40ebca6 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -255,12 +255,13 @@ void Window::setLocationRelativeTo(ImageRect::ImagePosition position,
 
 void Window::setMinWidth(unsigned int width)
 {
-    mMinWinWidth = width;
+    mMinWinWidth = width > mSkin->getMinWidth() ? width : mSkin->getMinWidth();
 }
 
 void Window::setMinHeight(unsigned int height)
 {
-    mMinWinHeight = height;
+    mMinWinHeight = height > mSkin->getMinHeight() ?
+                        height : mSkin->getMinHeight();
 }
 
 void Window::setMaxWidth(unsigned int width)
-- 
cgit v1.2.3-70-g09d2


From 393c1085ed1cb24092778594d2945a39428e41ad Mon Sep 17 00:00:00 2001
From: sniper <sniper@livecd.janhome.net>
Date: Wed, 11 Mar 2009 17:19:31 +0100
Subject: Added a class for rendering of floating text

This is a header only-class that merges the textrendering of the
TextParticle and Text classes. It is done to reduce code duplication and
to prepare some color configuration gui.
---
 src/gui/textrenderer.h | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/window.cpp     |  1 +
 src/text.cpp           | 24 ++++-----------
 src/textparticle.cpp   | 30 +++++--------------
 4 files changed, 95 insertions(+), 41 deletions(-)
 create mode 100644 src/gui/textrenderer.h

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/textrenderer.h b/src/gui/textrenderer.h
new file mode 100644
index 00000000..599e85a3
--- /dev/null
+++ b/src/gui/textrenderer.h
@@ -0,0 +1,81 @@
+/*
+ *  Text Renderer
+ *  Copyright (C) 2009  The Mana World Development Team
+ *
+ *  This file is part of Aethyra based on code from The Mana World.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef TEXT_RENDERER_H
+#define TEXT_RENDERER_H
+
+#include "graphics.h"
+#include "palette.h"
+
+/**
+ * Class for text rendering. Used by the TextParticle, the Text and FlashText
+ * objects and the Preview in the color dialog.
+ */
+class TextRenderer
+{
+    public:
+    /**
+     * Renders a specified text.
+     */
+    static inline void renderText(gcn::Graphics *graphics, const std::string&
+            text, int x, int y, gcn::Graphics::Alignment align,
+            const gcn::Color* color, gcn::Font *font, bool outline = false,
+            bool shadow = false, int alpha = 255)
+    {
+        graphics->setFont(font);
+
+        // Text shadow
+        if (shadow)
+        {
+            graphics->setColor(guiPalette->getColor(Palette::SHADOW,
+                    alpha / 2));
+            if (outline)
+            {
+                graphics->drawText(text, x + 2, y + 2, align);
+            }
+            else
+            {
+                graphics->drawText(text, x + 1, y + 1, align);
+            }
+        }
+
+        if (outline) {
+/*            graphics->setColor(guiPalette->getColor(Palette::OUTLINE,
+                    alpha/4));
+            // TODO: Reanable when we can draw it nicely in software mode
+            graphics->drawText(text, x + 2, y + 2, align);
+            graphics->drawText(text, x + 1, y + 2, align);
+            graphics->drawText(text, x + 2, y + 1, align);*/
+
+            // Text outline
+            graphics->setColor(guiPalette->getColor(Palette::OUTLINE, alpha));
+            graphics->drawText(text, x + 1, y, align);
+            graphics->drawText(text, x - 1, y, align);
+            graphics->drawText(text, x, y + 1, align);
+            graphics->drawText(text, x, y - 1, align);
+        }
+
+        graphics->setColor(*color);
+        graphics->drawText(text, x, y, align);
+    }
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index d40ebca6..f6d23950 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -630,6 +630,7 @@ void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
     setSize(mDefaultWidth, mDefaultHeight);
+    saveWindowState();
 }
 
 int Window::getResizeHandles(gcn::MouseEvent &event)
diff --git a/src/text.cpp b/src/text.cpp
index e5e40235..c167701a 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,6 +26,8 @@
 #include "textmanager.h"
 
 #include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/textrenderer.h"
 
 int Text::mInstances = 0;
 
@@ -76,23 +78,9 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
 {
     graphics->setFont(boldFont);
 
-    // Text shadow
-    graphics->setColor(gcn::Color(0, 0, 0));
-    graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1,
-              gcn::Graphics::LEFT);
-
-    // Text outline
-    graphics->drawText(mText, mX - xOff + 1, mY - yOff,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff - 1, mY - yOff,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff, mY - yOff + 1,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff, mY - yOff - 1,
-              gcn::Graphics::LEFT);
-
-    graphics->setColor(mColor);
-    graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
+    TextRenderer::renderText(graphics, mText,
+            mX - xOff, mY - yOff, gcn::Graphics::LEFT,
+            &mColor, boldFont, !mIsSpeech, true);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,
@@ -107,9 +95,7 @@ void FlashText::draw(gcn::Graphics *graphics, int xOff, int yOff)
     if (mTime)
     {
         if ((--mTime & 4) == 0)
-        {
             return;
-        }
     }
     Text::draw(graphics, xOff, yOff);
 }
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 8a8948f4..a065eadd 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -22,10 +22,12 @@
 
 #include <guichan/color.hpp>
 
-#include "graphics.h"
-#include "textparticle.h"
 #include <SDL/SDL_ttf.h>
 
+#include "textparticle.h"
+
+#include "gui/textrenderer.h"
+
 TextParticle::TextParticle(Map *map, const std::string &text,
                            int colorR, int colorG, int colorB,
                            gcn::Font *font, bool outline):
@@ -61,24 +63,8 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
         alpha /= mFadeIn;
     }
 
-    graphics->setFont(mTextFont);
-    if (mOutline)
-    {
-        graphics->setColor(gcn::Color(0, 0, 0, (int)(alpha/4)));
-        // Text outline
-        graphics->setColor(gcn::Color(0, 0, 0, (int)alpha));
-        graphics->drawText(mText, screenX + 1, screenY,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX - 1, screenY,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX, screenY + 1,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX, screenY - 1,
-                gcn::Graphics::CENTER);
-    }
-    graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, (int)alpha));
-    graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
+    TextRenderer::renderText(graphics, mText,
+            screenX, screenY, gcn::Graphics::CENTER,
+            &gcn::Color(mColorR, mColorG, mColorB), mTextFont, mOutline, false,
+            (int) alpha);
 }
-- 
cgit v1.2.3-70-g09d2


From 3575c7a606c2d24c0d444e9999892c0390fa5ae8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 14 Mar 2009 13:21:35 -0600
Subject: Made a label class derived from the guichan label class which
 utilizes the palette colors. While technically, this can be accomplished
 through other means, it's rather clumsy overall, and is prone to introducing
 in programmer errors.

This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp                 |  2 ++
 src/CMakeLists.txt          |  2 ++
 src/Makefile.am             |  2 ++
 src/gui/button.cpp          |  3 +-
 src/gui/buy.cpp             | 11 +++----
 src/gui/char_select.cpp     | 17 +++++-----
 src/gui/checkbox.cpp        | 13 ++++++++
 src/gui/checkbox.h          |  5 +++
 src/gui/connection.cpp      |  5 ++-
 src/gui/debugwindow.cpp     | 15 +++++----
 src/gui/inventorywindow.cpp |  7 ++---
 src/gui/login.cpp           | 13 ++++----
 src/gui/palette.cpp         |  1 +
 src/gui/palette.h           |  1 +
 src/gui/register.cpp        | 19 +++++------
 src/gui/sell.cpp            | 11 +++----
 src/gui/setup_audio.cpp     | 10 +++---
 src/gui/setup_colors.cpp    | 18 +++++++----
 src/gui/setup_joystick.cpp  |  5 ++-
 src/gui/setup_players.cpp   |  9 +++---
 src/gui/setup_video.cpp     | 23 +++++++-------
 src/gui/skill.cpp           | 11 +++----
 src/gui/status.cpp          | 77 +++++++++++++++++----------------------------
 src/gui/storagewindow.cpp   |  5 ++-
 src/gui/textfield.cpp       | 29 +++++++----------
 src/gui/trade.cpp           |  9 +++---
 src/gui/updatewindow.cpp    |  6 ++--
 src/gui/widgets/tab.cpp     | 10 ++++--
 src/gui/window.cpp          |  3 +-
 src/main.cpp                |  7 ++---
 30 files changed, 173 insertions(+), 176 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/aethyra.cbp b/aethyra.cbp
index e88f491d..6e71375c 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -168,6 +168,8 @@
 		<Unit filename="src\gui\itempopup.h" />
 		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
 		<Unit filename="src\gui\itemshortcutcontainer.h" />
+		<Unit filename="src\gui\label.cpp" />
+		<Unit filename="src\gui\label.h" />
 		<Unit filename="src\gui\linkhandler.h" />
 		<Unit filename="src\gui\listbox.cpp" />
 		<Unit filename="src\gui\listbox.h" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7025c2c4..93bac9ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,6 +117,8 @@ SET(SRCS
     gui/itemshortcutcontainer.h\
     gui/item_amount.cpp
     gui/item_amount.h
+    gui/label.cpp
+    gui/label.h
     gui/linkhandler.h
     gui/listbox.cpp
     gui/listbox.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 069b12f2..5029697a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,6 +69,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/itemshortcutcontainer.h \
 	      gui/item_amount.cpp \
 	      gui/item_amount.h \
+	      gui/label.cpp \
+	      gui/label.h \
 	      gui/linkhandler.h \
 	      gui/listbox.cpp \
 	      gui/listbox.h \
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index dbb5f568..592edce5 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -24,6 +24,7 @@
 #include <guichan/font.hpp>
 
 #include "button.h"
+#include "palette.h"
 
 #include "../configuration.h"
 #include "../graphics.h"
@@ -151,7 +152,7 @@ void Button::draw(gcn::Graphics *graphics)
     static_cast<Graphics*>(graphics)->
         drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
 
-    graphics->setColor(getForegroundColor());
+    graphics->setColor(guiPalette->getColor(Palette::TEXT));
 
     int textX;
     int textY = getHeight() / 2 - getFont()->getHeight() / 2;
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 2b5aeeb7..367a041e 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -20,10 +20,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "buy.h"
+#include "label.h"
 #include "scrollarea.h"
 #include "shop.h"
 #include "shoplistbox.h"
@@ -54,14 +53,14 @@ BuyDialog::BuyDialog(Network *network):
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
     mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
-    mQuantityLabel = new gcn::Label("0");
-    mMoneyLabel = new gcn::Label(strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
+    mQuantityLabel = new Label("0");
+    mMoneyLabel = new Label(strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
     mBuyButton = new Button(_("Buy"), "buy", this);
     mQuitButton = new Button(_("Quit"), "quit", this);
-    mItemDescLabel = new gcn::Label(strprintf(_("Description: %s"), ""));
-    mItemEffectLabel = new gcn::Label(strprintf(_("Effect: %s"), ""));
+    mItemDescLabel = new Label(strprintf(_("Description: %s"), ""));
+    mItemEffectLabel = new Label(strprintf(_("Effect: %s"), ""));
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index fa0594d6..f88736c1 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -24,11 +24,10 @@
 
 #include <guichan/font.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "char_select.h"
 #include "confirm_dialog.h"
+#include "label.h"
 #include "ok_dialog.h"
 #include "playerbox.h"
 #include "textfield.h"
@@ -90,10 +89,10 @@ CharSelectDialog::CharSelectDialog(Network *network,
     mPlayerBox = new PlayerBox;
     mPlayerBox->setWidth(74);
 
-    mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
-    mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
-    mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
-    mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
+    mNameLabel = new Label(strprintf(_("Name: %s"), ""));
+    mLevelLabel = new Label(strprintf(_("Level: %d"), 0));
+    mJobLevelLabel = new Label(strprintf(_("Job Level: %d"), 0));
+    mMoneyLabel = new Label(strprintf(_("Money: %d"), 0));
 
     const std::string tempString = getFont()->getWidth(_("New")) <
                                    getFont()->getWidth(_("Delete")) ?
@@ -259,13 +258,13 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mPlayer->setHairStyle(rand() % mPlayer->getNumOfHairstyles(), rand() % numberOfHairColors);
 
     mNameField = new TextField("");
-    mNameLabel = new gcn::Label(_("Name:"));
+    mNameLabel = new Label(_("Name:"));
     mNextHairColorButton = new Button(">", "nextcolor", this);
     mPrevHairColorButton = new Button("<", "prevcolor", this);
-    mHairColorLabel = new gcn::Label(_("Hair Color:"));
+    mHairColorLabel = new Label(_("Hair Color:"));
     mNextHairStyleButton = new Button(">", "nextstyle", this);
     mPrevHairStyleButton = new Button("<", "prevstyle", this);
-    mHairStyleLabel = new gcn::Label(_("Hair Style:"));
+    mHairStyleLabel = new Label(_("Hair Style:"));
     mCreateButton = new Button(_("Create"), "create", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 413c28d0..f6cce581 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "checkbox.h"
+#include "palette.h"
 
 #include "../configuration.h"
 #include "../graphics.h"
@@ -69,6 +70,18 @@ CheckBox::~CheckBox()
     }
 }
 
+void CheckBox::draw(gcn::Graphics* graphics)
+{
+    drawBox(graphics);
+
+    graphics->setFont(getFont());
+    graphics->setColor(guiPalette->getColor(Palette::TEXT));
+
+    const int h = getHeight() + getHeight() / 2;
+
+    graphics->drawText(getCaption(), h - 2, 0);
+}
+
 void CheckBox::drawBox(gcn::Graphics* graphics)
 {
     Image *box;
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 260ed3a1..93b62b9d 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -45,6 +45,11 @@ class CheckBox : public gcn::CheckBox
          */
         ~CheckBox();
 
+        /**
+         * Draws the caption, then calls drawBox to draw the check box.
+         */
+        void draw(gcn::Graphics* graphics);
+
         /**
          * Draws the check box, not the caption.
          */
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index f6033cd7..d4a2b18a 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -22,10 +22,9 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "connection.h"
+#include "label.h"
 #include "progressbar.h"
 
 #include "../main.h"
@@ -47,7 +46,7 @@ ConnectionDialog::ConnectionDialog():
 
     Button *cancelButton = new Button(_("Cancel"), "cancelButton", &listener);
     mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128);
-    gcn::Label *label = new gcn::Label(_("Connecting..."));
+    gcn::Label *label = new Label(_("Connecting..."));
 
     cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight());
     mProgressBar->setPosition(5, cancelButton->getY() - 25);
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 71855977..999e00a2 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "debugwindow.h"
+#include "label.h"
 #include "viewport.h"
 
 #include "widgets/layout.h"
@@ -43,12 +42,12 @@ DebugWindow::DebugWindow():
     setCloseButton(true);
     setDefaultSize(400, 60, ImageRect::CENTER);
 
-    mFPSLabel = new gcn::Label("0 FPS");
-    mMusicFileLabel = new gcn::Label("Music: ");
-    mMapLabel = new gcn::Label("Map: ");
-    mMiniMapLabel = new gcn::Label("Mini-Map: ");
-    mTileMouseLabel = new gcn::Label("Mouse: 0, 0");
-    mParticleCountLabel = new gcn::Label("Particle count: 0");
+    mFPSLabel = new Label("0 FPS");
+    mMusicFileLabel = new Label("Music: ");
+    mMapLabel = new Label("Map: ");
+    mMiniMapLabel = new Label("Mini-Map: ");
+    mTileMouseLabel = new Label("Mouse: 0, 0");
+    mParticleCountLabel = new Label("Particle count: 0");
 
     place(0, 0, mFPSLabel, 3);
     place(3, 0, mTileMouseLabel);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 7e75411e..98916c07 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -25,12 +25,11 @@
 #include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "label.h"
 #include "progressbar.h"
 #include "scrollarea.h"
 #include "viewport.h"
@@ -82,8 +81,8 @@ InventoryWindow::InventoryWindow(int invSize):
     mMaxWeight = toString(player_node->mMaxWeight);
     mUsedSlots = toString(player_node->getInventory()->getNumberOfSlotsUsed());
 
-    mSlotsLabel = new gcn::Label(_("Slots: "));
-    mWeightLabel = new gcn::Label(_("Weight: "));
+    mSlotsLabel = new Label(_("Slots: "));
+    mWeightLabel = new Label(_("Weight: "));
 
     mSlotsBar = new ProgressBar(1.0f, 100, 20, 225, 200, 25);
     mWeightBar = new ProgressBar(1.0f, 100, 20, 0, 0, 255);
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index ce13aaf0..7b9829fb 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -20,10 +20,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "checkbox.h"
+#include "label.h"
 #include "listbox.h"
 #include "login.h"
 #include "ok_dialog.h"
@@ -49,11 +48,11 @@ static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70;
 LoginDialog::LoginDialog(LoginData *loginData):
     Window(_("Login")), mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label(_("Name:"));
-    gcn::Label *passLabel = new gcn::Label(_("Password:"));
-    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
-    gcn::Label *portLabel = new gcn::Label(_("Port:"));
-    gcn::Label *dropdownLabel = new gcn::Label(_("Recent:"));
+    gcn::Label *userLabel = new Label(_("Name:"));
+    gcn::Label *passLabel = new Label(_("Password:"));
+    gcn::Label *serverLabel = new Label(_("Server:"));
+    gcn::Label *portLabel = new Label(_("Port:"));
+    gcn::Label *dropdownLabel = new Label(_("Recent:"));
     std::vector<std::string> dfltServer;
     dfltServer.push_back("www.aethyra.org"); 
     dfltServer.push_back("www.aethyra.org");
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index e007dd5c..c155cfe2 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -88,6 +88,7 @@ Palette::Palette() :
     addColor(BACKGROUND, 0xffffff, STATIC, _("Background"));
 
     addColor(HIGHLIGHT, 0xebc873, STATIC, _("Highlight"), 'H');
+    addColor(TAB_HIGHLIGHT, 0xff0000, STATIC, indent + _("Tab Highlight"));
     addColor(SHOP_WARNING, 0x910000, STATIC, indent +
             _("Item too expensive"));
 
diff --git a/src/gui/palette.h b/src/gui/palette.h
index a91d3605..4d8f7f11 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -53,6 +53,7 @@ class Palette : public gcn::ListModel
             ENTRY(OUTLINE)\
             ENTRY(BACKGROUND)\
             ENTRY(HIGHLIGHT)\
+            ENTRY(TAB_HIGHLIGHT)\
             ENTRY(SHOP_WARNING)\
             ENTRY(CHAT)\
             ENTRY(GM)\
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 13928e41..63a0d29c 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -20,8 +20,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "../configuration.h"
 #include "../log.h"
 #include "../logindata.h"
@@ -29,6 +27,7 @@
 
 #include "button.h"
 #include "checkbox.h"
+#include "label.h"
 #include "login.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
@@ -47,7 +46,8 @@
  * to the field which contained wrong data when the Ok button was pressed on
  * the error notice.
  */
-class WrongDataNoticeListener : public gcn::ActionListener {
+class WrongDataNoticeListener : public gcn::ActionListener
+{
     public:
         void setTarget(gcn::TextField *textField);
         void action(const gcn::ActionEvent &event);
@@ -63,22 +63,19 @@ void WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 void WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
-    {
         mTarget->requestFocus();
-    }
 }
 
-
 RegisterDialog::RegisterDialog(LoginData *loginData):
     Window(_("Register")),
     mWrongDataNoticeListener(new WrongDataNoticeListener),
     mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label(_("Name:"));
-    gcn::Label *passwordLabel = new gcn::Label(_("Password:"));
-    gcn::Label *confirmLabel = new gcn::Label(_("Confirm:"));
-    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
-    gcn::Label *portLabel = new gcn::Label(_("Port:"));
+    gcn::Label *userLabel = new Label(_("Name:"));
+    gcn::Label *passwordLabel = new Label(_("Password:"));
+    gcn::Label *confirmLabel = new Label(_("Confirm:"));
+    gcn::Label *serverLabel = new Label(_("Server:"));
+    gcn::Label *portLabel = new Label(_("Port:"));
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 397e29a6..b780b02b 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
+#include "label.h"
 #include "scrollarea.h"
 #include "sell.h"
 #include "shop.h"
@@ -56,15 +55,15 @@ SellDialog::SellDialog(Network *network):
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
     mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
-    mQuantityLabel = new gcn::Label("0");
-    mMoneyLabel = new gcn::Label(
+    mQuantityLabel = new Label("0");
+    mMoneyLabel = new Label(
         strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
     mSellButton = new Button(_("Sell"), "sell", this);
     mQuitButton = new Button(_("Quit"), "quit", this);
-    mItemDescLabel = new gcn::Label(strprintf(_("Description: %s"), ""));
-    mItemEffectLabel = new gcn::Label(strprintf(_("Effect: %s"), ""));
+    mItemDescLabel = new Label(strprintf(_("Description: %s"), ""));
+    mItemEffectLabel = new Label(strprintf(_("Effect: %s"), ""));
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 3c26f14b..08eda848 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "checkbox.h"
+#include "label.h"
 #include "ok_dialog.h"
 #include "setup_audio.h"
 #include "slider.h"
@@ -45,8 +44,8 @@ Setup_Audio::Setup_Audio():
 {
     setOpaque(false);
 
-    gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
-    gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
+    gcn::Label *sfxLabel = new Label(_("Sfx volume"));
+    gcn::Label *musicLabel = new Label(_("Music volume"));
 
     mSfxSlider->setActionEventId("sfx");
     mMusicSlider->setActionEventId("music");
@@ -80,7 +79,8 @@ void Setup_Audio::apply()
     if (mSoundCheckBox->isSelected())
     {
         config.setValue("sound", 1);
-        try {
+        try
+        {
             sound.init();
         }
         catch (const char *err)
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 91b20f5f..09c6a3a9 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -23,12 +23,12 @@
 #include <cmath>
 
 #include <guichan/listmodel.hpp>
-#include <guichan/widgets/label.hpp>
 #include <guichan/widgets/slider.hpp>
 
 #include "browserbox.h"
 #include "gui.h"
 #include "itemlinkhandler.h"
+#include "label.h"
 #include "listbox.h"
 #include "palette.h"
 #include "scrollarea.h"
@@ -71,7 +71,7 @@ Setup_Colors::Setup_Colors() :
     mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
                                  gcn::ScrollArea::SHOW_NEVER);
 
-    mGradTypeLabel = new gcn::Label(_("Type: "));
+    mGradTypeLabel = new Label(_("Type: "));
 
     mGradTypeSlider = new Slider(0, 2);
     mGradTypeSlider->setWidth(160);
@@ -80,9 +80,9 @@ Setup_Colors::Setup_Colors() :
     mGradTypeSlider->addActionListener(this);
     mGradTypeSlider->setEnabled(false);
 
-    mGradTypeText = new gcn::Label();
+    mGradTypeText = new Label();
 
-    mRedLabel = new gcn::Label(_("Red: "));
+    mRedLabel = new Label(_("Red: "));
 
     mRedText = new TextField();
     mRedText->setWidth(40);
@@ -98,7 +98,7 @@ Setup_Colors::Setup_Colors() :
     mRedSlider->addActionListener(this);
     mRedSlider->setEnabled(false);
 
-    mGreenLabel = new gcn::Label(_("Green: "));
+    mGreenLabel = new Label(_("Green: "));
 
     mGreenText = new TextField();
     mGreenText->setWidth(40);
@@ -114,7 +114,7 @@ Setup_Colors::Setup_Colors() :
     mGreenSlider->addActionListener(this);
     mGreenSlider->setEnabled(false);
 
-    mBlueLabel = new gcn::Label(_("Blue: "));
+    mBlueLabel = new Label(_("Blue: "));
 
     mBlueText = new TextField();
     mBlueText->setWidth(40);
@@ -194,6 +194,12 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
                 mTextPreview->setShadow(type == Palette::SHADOW);
                 mTextPreview->setOutline(type == Palette::OUTLINE);
                 break;
+            case Palette::TAB_HIGHLIGHT:
+                mTextPreview->setFont(gui->getFont());
+                mTextPreview->setTextColor(col);
+                mTextPreview->setOutline(false);
+                mTextPreview->setShadow(false);
+                break;
             case Palette::BACKGROUND:
             case Palette::HIGHLIGHT:
             case Palette::SHOP_WARNING:
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 5bbaa368..4d80e0dd 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -20,10 +20,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "checkbox.h"
+#include "label.h"
 #include "setup_joystick.h"
 
 #include "widgets/layouthelper.h"
@@ -36,7 +35,7 @@
 extern Joystick *joystick;
 
 Setup_Joystick::Setup_Joystick():
-    mCalibrateLabel(new gcn::Label(_("Press the button to start calibration"))),
+    mCalibrateLabel(new Label(_("Press the button to start calibration"))),
     mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
     mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index faf80640..05748000 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -23,10 +23,9 @@
 #include <string>
 #include <vector>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "checkbox.h"
+#include "label.h"
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
@@ -138,7 +137,7 @@ public:
         for (unsigned int r = 0; r < player_names->size(); ++r)
         {
             std::string name = (*player_names)[r];
-            gcn::Widget *widget = new gcn::Label(name);
+            gcn::Widget *widget = new Label(name);
             mWidgets.push_back(widget);
             gcn::ListModel *playerRelation = new PlayerRelationListModel();
 
@@ -248,7 +247,7 @@ Setup_Players::Setup_Players():
     for (int i = 0; i < COLUMNS_NR; i++)
     {
         mPlayerTableTitleModel->set(0, i,
-                new gcn::Label(gettext(table_titles[i])));
+                new Label(gettext(table_titles[i])));
     }
 
     mPlayerTitleTable->setLinewiseSelection(true);
@@ -258,7 +257,7 @@ Setup_Players::Setup_Players():
     mPlayerTable->setLinewiseSelection(true);
     mPlayerTable->addActionListener(this);
 
-    gcn::Label *ignore_action_label = new gcn::Label(_("When ignoring:"));
+    gcn::Label *ignore_action_label = new Label(_("When ignoring:"));
 
     mIgnoreActionChoicesBox->setActionEventId(ACTION_STRATEGY);
     mIgnoreActionChoicesBox->addActionListener(this);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 59eb4096..d1d7e4f8 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -27,9 +27,8 @@
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "checkbox.h"
+#include "label.h"
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
@@ -123,7 +122,7 @@ Setup_Video::Setup_Video():
     mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)),
     mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)),
     mSpeechSlider(new Slider(0, 3)),
-    mSpeechLabel(new gcn::Label("")),
+    mSpeechLabel(new Label("")),
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
@@ -136,11 +135,11 @@ Setup_Video::Setup_Video():
     mScrollRadiusField(new TextField),
     mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
     mOverlayDetailSlider(new Slider(0, 2)),
-    mOverlayDetailField(new gcn::Label("")),
+    mOverlayDetailField(new Label("")),
     mParticleDetail(3 - (int) config.getValue("particleEmitterSkip", 1)),
     mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new gcn::Label("")),
-    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
+    mParticleDetailField(new Label("")),
+    mPickupNotifyLabel(new Label(_("Show pickup notification"))),
     mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
     mPickupParticleCheckBox(new CheckBox(_("as particle"),
                            mPickupParticleEnabled))
@@ -150,12 +149,12 @@ Setup_Video::Setup_Video():
     ScrollArea *scrollArea = new ScrollArea(mModeList);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    speechLabel = new gcn::Label(_("Overhead text"));
-    alphaLabel = new gcn::Label(_("Gui opacity"));
-    scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
-    scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
-    overlayDetailLabel = new gcn::Label(_("Ambient FX"));
-    particleDetailLabel = new gcn::Label(_("Particle Detail"));
+    speechLabel = new Label(_("Overhead text"));
+    alphaLabel = new Label(_("Gui opacity"));
+    scrollRadiusLabel = new Label(_("Scroll radius"));
+    scrollLazinessLabel = new Label(_("Scroll laziness"));
+    overlayDetailLabel = new Label(_("Ambient FX"));
+    particleDetailLabel = new Label(_("Particle Detail"));
 
     mModeList->setEnabled(true);
 #ifndef USE_OPENGL
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index a8250fce..64214ff5 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
+#include "label.h"
 #include "listbox.h"
 #include "scrollarea.h"
 #include "skill.h"
@@ -100,13 +99,13 @@ public:
                 info = &fakeSkillInfo;
 
             sprintf(tmp, "%c%s", info->modifiable? ' ' : '*', info->name.c_str());
-            gcn::Label *name_label = new gcn::Label(tmp);
+            gcn::Label *name_label = new Label(tmp);
 
             sprintf(tmp, "Lv:%i", skill->lv);
-            gcn::Label *lv_label = new gcn::Label(tmp);
+            gcn::Label *lv_label = new Label(tmp);
 
             sprintf(tmp, "Sp:%i", skill->sp);
-            gcn::Label *sp_label = new gcn::Label(tmp);
+            gcn::Label *sp_label = new Label(tmp);
 
             set(i, 0, name_label);
             set(i, 1, lv_label);
@@ -141,7 +140,7 @@ SkillDialog::SkillDialog():
     setMinWidth(200);
 
     ScrollArea *skillScrollArea = new ScrollArea(mTable);
-    mPointsLabel = new gcn::Label(strprintf(_("Skill points: %d"), 0));
+    mPointsLabel = new Label(strprintf(_("Skill points: %d"), 0));
     mIncButton = new Button(_("Up"), _("inc"), this);
     mUseButton = new Button(_("Use"), _("use"), this);
     mUseButton->setEnabled(false);
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index e534edb8..3fd62b83 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -20,9 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
+#include "label.h"
 #include "progressbar.h"
 #include "status.h"
 #include "windowcontainer.h"
@@ -47,20 +46,20 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // Status Part
     // ----------------------
 
-    mLvlLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
-    mJobLvlLabel = new gcn::Label(strprintf(_("Job: %d"), 0));
-    mGpLabel = new gcn::Label(strprintf(_("Money: %d GP"), 0));
+    mLvlLabel = new Label(strprintf(_("Level: %d"), 0));
+    mJobLvlLabel = new Label(strprintf(_("Job: %d"), 0));
+    mGpLabel = new Label(strprintf(_("Money: %d GP"), 0));
 
-    mHpLabel = new gcn::Label(_("HP:"));
+    mHpLabel = new Label(_("HP:"));
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
 
-    mXpLabel = new gcn::Label(_("Exp:"));
+    mXpLabel = new Label(_("Exp:"));
     mXpBar = new ProgressBar(1.0f, 80, 15, 143, 192, 211);
 
-    mMpLabel = new gcn::Label(_("MP:"));
+    mMpLabel = new Label(_("MP:"));
     mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230);
 
-    mJobLabel = new gcn::Label(_("Job:"));
+    mJobLabel = new Label(_("Job:"));
     mJobBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203);
 
     // ----------------------
@@ -68,35 +67,35 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // ----------------------
 
     // Static Labels
-    gcn::Label *mStatsTitleLabel = new gcn::Label(_("Stats"));
-    gcn::Label *mStatsTotalLabel = new gcn::Label(_("Total"));
-    gcn::Label *mStatsCostLabel = new gcn::Label(_("Cost"));
+    gcn::Label *mStatsTitleLabel = new Label(_("Stats"));
+    gcn::Label *mStatsTotalLabel = new Label(_("Total"));
+    gcn::Label *mStatsCostLabel = new Label(_("Cost"));
     mStatsTotalLabel->setAlignment(gcn::Graphics::CENTER);
 
     // Derived Stats
-    mStatsAttackLabel = new gcn::Label(_("Attack:"));
-    mStatsDefenseLabel= new gcn::Label(_("Defense:"));
-    mStatsMagicAttackLabel = new gcn::Label(_("M.Attack:"));
-    mStatsMagicDefenseLabel = new gcn::Label(_("M.Defense:"));
-    mStatsAccuracyLabel = new gcn::Label(_("% Accuracy:"));
-    mStatsEvadeLabel = new gcn::Label(_("% Evade:"));
-    mStatsReflexLabel = new gcn::Label(_("% Reflex:"));
-
-    mStatsAttackPoints = new gcn::Label;
-    mStatsDefensePoints = new gcn::Label;
-    mStatsMagicAttackPoints = new gcn::Label;
-    mStatsMagicDefensePoints = new gcn::Label;
-    mStatsAccuracyPoints = new gcn::Label;
-    mStatsEvadePoints = new gcn::Label;
-    mStatsReflexPoints = new gcn::Label;
+    mStatsAttackLabel = new Label(_("Attack:"));
+    mStatsDefenseLabel= new Label(_("Defense:"));
+    mStatsMagicAttackLabel = new Label(_("M.Attack:"));
+    mStatsMagicDefenseLabel = new Label(_("M.Defense:"));
+    mStatsAccuracyLabel = new Label(_("% Accuracy:"));
+    mStatsEvadeLabel = new Label(_("% Evade:"));
+    mStatsReflexLabel = new Label(_("% Reflex:"));
+
+    mStatsAttackPoints = new Label;
+    mStatsDefensePoints = new Label;
+    mStatsMagicAttackPoints = new Label;
+    mStatsMagicDefensePoints = new Label;
+    mStatsAccuracyPoints = new Label;
+    mStatsEvadePoints = new Label;
+    mStatsReflexPoints = new Label;
 
     // New labels
     for (int i = 0; i < 6; i++)
     {
-        mStatsLabel[i] = new gcn::Label("0");
+        mStatsLabel[i] = new Label("0");
         mStatsLabel[i]->setAlignment(gcn::Graphics::CENTER);
-        mStatsDisplayLabel[i] = new gcn::Label;
-        mPointsLabel[i] = new gcn::Label("0");
+        mStatsDisplayLabel[i] = new Label;
+        mPointsLabel[i] = new Label("0");
         mPointsLabel[i]->setAlignment(gcn::Graphics::CENTER);
     }
     mRemainingStatsPointsLabel = new gcn::Label;
@@ -185,17 +184,11 @@ void StatusWindow::update()
 
     // HP Bar coloration
     if (mPlayer->mHp < int(mPlayer->mMaxHp / 3))
-    {
         mHpBar->setColor(223, 32, 32); // Red
-    }
     else if (mPlayer->mHp < int((mPlayer->mMaxHp / 3) * 2))
-    {
         mHpBar->setColor(230, 171, 34); // Orange
-    }
     else
-    {
         mHpBar->setColor(0, 171, 34); // Green
-    }
 
     mHpBar->setProgress((float) mPlayer->mHp / (float) mPlayer->mMaxHp);
     mMpBar->setProgress((float) mPlayer->mMp / (float) mPlayer->mMaxMp);
@@ -285,28 +278,16 @@ void StatusWindow::action(const gcn::ActionEvent &event)
     if (event.getId().length() == 3)
     {
         if (event.getId() == "STR")
-        {
             player_node->raiseAttribute(LocalPlayer::STR);
-        }
         if (event.getId() == "AGI")
-        {
             player_node->raiseAttribute(LocalPlayer::AGI);
-        }
         if (event.getId() == "VIT")
-        {
             player_node->raiseAttribute(LocalPlayer::VIT);
-        }
         if (event.getId() == "INT")
-        {
             player_node->raiseAttribute(LocalPlayer::INT);
-        }
         if (event.getId() == "DEX")
-        {
             player_node->raiseAttribute(LocalPlayer::DEX);
-        }
         if (event.getId() == "LUK")
-        {
             player_node->raiseAttribute(LocalPlayer::LUK);
-        }
     }
 }
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 6a813bc4..5036fc15 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -24,12 +24,11 @@
 #include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "label.h"
 #include "progressbar.h"
 #include "scrollarea.h"
 #include "storagewindow.h"
@@ -75,7 +74,7 @@ StorageWindow::StorageWindow(Network *network, int invSize):
 
     mUsedSlots = toString(player_node->getStorage()->getNumberOfSlotsUsed());
 
-    mSlotsLabel = new gcn::Label(_("Slots: "));
+    mSlotsLabel = new Label(_("Slots: "));
 
     mSlotsBar = new ProgressBar(1.0f, 100, 20, 225, 200, 25);
 
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 054bc405..257ddaa1 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -22,6 +22,7 @@
 
 #include <guichan/font.hpp>
 
+#include "palette.h"
 #include "sdlinput.h"
 #include "textfield.h"
 
@@ -55,8 +56,10 @@ TextField::TextField(const std::string& text):
         int gridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
                 skin.grid[a] = textbox->getSubImage(
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
@@ -77,9 +80,7 @@ TextField::~TextField()
     instances--;
 
     if (instances == 0)
-    {
         for_each(skin.grid, skin.grid + 9, dtor<Image*>());
-    }
 }
 
 void TextField::draw(gcn::Graphics *graphics)
@@ -90,11 +91,11 @@ void TextField::draw(gcn::Graphics *graphics)
     if (isFocused())
     {
         drawCaret(graphics,
-                getFont()->getWidth(mText.substr(0, mCaretPosition)) -
-                mXScroll);
+                  getFont()->getWidth(mText.substr(0, mCaretPosition)) -
+                  mXScroll);
     }
 
-    graphics->setColor(getForegroundColor());
+    graphics->setColor(guiPalette->getColor(Palette::TEXT));
     graphics->setFont(getFont());
     graphics->drawText(mText, 1 - mXScroll, 1);
 
@@ -102,9 +103,7 @@ void TextField::draw(gcn::Graphics *graphics)
     {
         mAlpha = config.getValue("guialpha", 0.8);
         for (int a = 0; a < 9; a++)
-        {
             skin.grid[a]->setAlpha(mAlpha);
-        }
     }
 }
 
@@ -122,9 +121,8 @@ void TextField::setNumeric(bool numeric)
 {
     mNumeric = numeric;
     if (!numeric)
-    {
         return;
-    }
+
     const char *text = mText.c_str();
     for (const char *textPtr = text; *textPtr; ++textPtr)
     {
@@ -139,18 +137,15 @@ void TextField::setNumeric(bool numeric)
 int TextField::getValue() const
 {
     if (!mNumeric)
-    {
         return 0;
-    }
+
     int value = atoi(mText.c_str());
     if (value < mMinimum)
-    {
         return mMinimum;
-    }
+
     if (value > mMaximum)
-    {
         return mMaximum;
-    }
+
     return value;
 }
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index caae33c0..bae0b651 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -22,13 +22,12 @@
 
 #include <sstream>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "chat.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "label.h"
 #include "scrollarea.h"
 #include "textfield.h"
 #include "trade.h"
@@ -47,7 +46,7 @@
 #include "../utils/stringutils.h"
 
 TradeWindow::TradeWindow(Network *network):
-    Window(_("Trade: You")),
+    Window("Trade"),
     mNetwork(network),
     mMyInventory(new Inventory(INVENTORY_SIZE, 2)),
     mPartnerInventory(new Inventory(INVENTORY_SIZE, 2))
@@ -78,8 +77,8 @@ TradeWindow::TradeWindow(Network *network):
 
     mPartnerScroll = new ScrollArea(mPartnerItemContainer);
 
-    mMoneyLabel = new gcn::Label(strprintf(_("You get %d GP."), 0));
-    mMoneyLabel2 = new gcn::Label(_("You give:"));
+    mMoneyLabel = new Label(strprintf(_("You get %d GP."), 0));
+    mMoneyLabel2 = new Label(_("You give:"));
     mMoneyField = new TextField;
     mMoneyField->setWidth(50);
 
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 81dcb047..927d6eaf 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -25,13 +25,11 @@
 #include <SDL_thread.h>
 #include <zlib.h>
 
-#include <guichan/widgets/label.hpp>
-
-// Curl should be included after Guichan to avoid Windows redefinitions
 #include <curl/curl.h>
 
 #include "browserbox.h"
 #include "button.h"
+#include "label.h"
 #include "progressbar.h"
 #include "scrollarea.h"
 #include "updatewindow.h"
@@ -110,7 +108,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
 
     mBrowserBox = new BrowserBox();
     mScrollArea = new ScrollArea(mBrowserBox);
-    mLabel = new gcn::Label(_("Connecting..."));
+    mLabel = new Label(_("Connecting..."));
     mProgressBar = new ProgressBar(0.0, 310, 20, 168, 116, 31);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayButton = new Button(_("Play"), "play", this);
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 97f6010c..942ad3ef 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -25,6 +25,8 @@
 #include "tab.h"
 #include "tabbedarea.h"
 
+#include "../palette.h"
+
 #include "../../configuration.h"
 #include "../../graphics.h"
 
@@ -124,13 +126,17 @@ void Tab::draw(gcn::Graphics *graphics)
         {
             mode = TAB_SELECTED;
             // if tab is selected, it doesnt need to highlight activity
-            mLabel->setForegroundColor(gcn::Color(0, 0, 0));
+            mLabel->setForegroundColor(guiPalette->getColor(Palette::TEXT));
             mHighlighted = false;
         }
         else if (mHighlighted)
         {
             mode = TAB_HIGHLIGHTED;
-            mLabel->setForegroundColor(gcn::Color(255, 0, 0));
+            mLabel->setForegroundColor(guiPalette->getColor(Palette::TAB_HIGHLIGHT));
+        }
+        else
+        {
+            mLabel->setForegroundColor(guiPalette->getColor(Palette::TEXT));
         }
     }
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index f6d23950..144357ca 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -27,6 +27,7 @@
 #include <guichan/exception.hpp>
 
 #include "gui.h"
+#include "palette.h"
 #include "skin.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -153,7 +154,7 @@ void Window::draw(gcn::Graphics *graphics)
     // Draw title
     if (mShowTitle)
     {
-        g->setColor(gcn::Color(0, 0, 0));
+        g->setColor(guiPalette->getColor(Palette::TEXT));
         g->setFont(getFont());
         g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
diff --git a/src/main.cpp b/src/main.cpp
index bed297de..60a4d500 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,8 +29,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include <libxml/parser.h>
 
 #include <SDL/SDL_ttf.h>
@@ -57,6 +55,7 @@
 #include "gui/char_server.h"
 #include "gui/char_select.h"
 #include "gui/gui.h"
+#include "gui/label.h"
 #include "gui/login.h"
 #include "gui/ok_dialog.h"
 #include "gui/palette.h"
@@ -776,11 +775,11 @@ int main(int argc, char *argv[])
 
     gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
 #ifdef PACKAGE_VERSION
-    gcn::Label *versionLabel = new gcn::Label(PACKAGE_VERSION);
+    gcn::Label *versionLabel = new Label(PACKAGE_VERSION);
     top->add(versionLabel, 2, 2);
 #endif
     ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20, 168, 116, 31);
-    gcn::Label *progressLabel = new gcn::Label();
+    gcn::Label *progressLabel = new Label();
     top->add(progressBar, 5, top->getHeight() - 5 - progressBar->getHeight());
     top->add(progressLabel, 15 + progressBar->getWidth(),
                             progressBar->getY() + 4);
-- 
cgit v1.2.3-70-g09d2


From 20ad38045482254b9875ee80de44a9b6f9367d2d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 14 Mar 2009 14:28:26 -0600
Subject: Exposed the progress bar colors to the color management tab.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/palette.cpp             |  1 +
 src/gui/palette.h               |  1 +
 src/gui/progressbar.cpp         | 13 ++++++++++---
 src/gui/setup_colors.cpp        | 27 ++++++++++++++++++---------
 src/gui/textrenderer.h          |  7 +++----
 src/gui/widgets/textpreview.cpp | 10 +++++++++-
 src/gui/widgets/textpreview.h   | 11 +++++++++++
 src/gui/window.cpp              |  6 ++++++
 src/gui/window.h                |  5 +++++
 src/text.cpp                    |  2 +-
 src/textparticle.cpp            |  2 +-
 11 files changed, 66 insertions(+), 19 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index c155cfe2..a3d654be 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -84,6 +84,7 @@ Palette::Palette() :
     addColor(TEXT, 0x000000, STATIC, _("Text"));
     addColor(SHADOW, 0x000000, STATIC, indent + _("Text Shadow"));
     addColor(OUTLINE, 0x000000, STATIC, indent + _("Text Outline"));
+    addColor(PROGRESS_BAR, 0xffffff, STATIC, indent + _("Progress Bar Labels"));
 
     addColor(BACKGROUND, 0xffffff, STATIC, _("Background"));
 
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 4d8f7f11..f0a3d541 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -51,6 +51,7 @@ class Palette : public gcn::ListModel
             ENTRY(TEXT)\
             ENTRY(SHADOW)\
             ENTRY(OUTLINE)\
+            ENTRY(PROGRESS_BAR)\
             ENTRY(BACKGROUND)\
             ENTRY(HIGHLIGHT)\
             ENTRY(TAB_HIGHLIGHT)\
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index bec86bb1..025e0ec5 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -23,6 +23,7 @@
 #include <guichan/font.hpp>
 
 #include "gui.h"
+#include "palette.h"
 #include "progressbar.h"
 
 #include "../configuration.h"
@@ -133,18 +134,24 @@ void ProgressBar::draw(gcn::Graphics *graphics)
         const int textX = getWidth() / 2;
         const int textY = (getHeight() - f->getHeight()) / 2;
 
+        gcn::Color tempColor = guiPalette->getColor(Palette::OUTLINE);
+
         graphics->setFont(f);
 
-        graphics->setColor(gcn::Color(0, 0, 0, alpha));
+        graphics->setColor(gcn::Color((int) tempColor.r, (int) tempColor.g,
+                                      (int) tempColor.b, alpha));
         graphics->drawText(mText, textX + 1, textY, gcn::Graphics::CENTER);
         graphics->drawText(mText, textX, textY - 1, gcn::Graphics::CENTER);
         graphics->drawText(mText, textX, textY + 1, gcn::Graphics::CENTER);
         graphics->drawText(mText, textX - 1, textY, gcn::Graphics::CENTER);
 
-        graphics->setColor(gcn::Color(255, 255, 255, alpha));
+        tempColor = guiPalette->getColor(Palette::PROGRESS_BAR);
+
+        graphics->setColor(gcn::Color((int) tempColor.r, (int) tempColor.g,
+                                      (int) tempColor.b, alpha));
         graphics->drawText(mText, textX, textY, gcn::Graphics::CENTER);
 
-        graphics->setColor(gcn::Color(0, 0, 0));
+        graphics->setColor(guiPalette->getColor(Palette::TEXT));
     }
 }
 
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 09c6a3a9..b7c408d1 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -177,12 +177,12 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
         mPreview->clearRows();
         mPreviewBox->setContent(mTextPreview);
         mTextPreview->setFont(gui->getFont());
-        mTextPreview->setTextColor(
-                &guiPalette->getColor(Palette::TEXT));
+        mTextPreview->setTextColor(&guiPalette->getColor(Palette::TEXT));
         mTextPreview->setTextBGColor(NULL);
-         mTextPreview->setOpaque(false);
+        mTextPreview->setOpaque(false);
         mTextPreview->setShadow(true);
         mTextPreview->setOutline(true);
+        mTextPreview->useTextAlpha(false);
 
         switch (type)
         {
@@ -190,10 +190,16 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
             case Palette::SHADOW:
             case Palette::OUTLINE:
                 mTextPreview->setFont(gui->getFont());
-                mTextPreview->setOutline(true);
                 mTextPreview->setShadow(type == Palette::SHADOW);
                 mTextPreview->setOutline(type == Palette::OUTLINE);
                 break;
+            case Palette::PROGRESS_BAR:
+                mTextPreview->useTextAlpha(true);
+                mTextPreview->setFont(boldFont);
+                mTextPreview->setTextColor(col);
+                mTextPreview->setOutline(true);
+                mTextPreview->setShadow(false);
+                break;
             case Palette::TAB_HIGHLIGHT:
                 mTextPreview->setFont(gui->getFont());
                 mTextPreview->setTextColor(col);
@@ -201,8 +207,13 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
                 mTextPreview->setShadow(false);
                 break;
             case Palette::BACKGROUND:
-            case Palette::HIGHLIGHT:
             case Palette::SHOP_WARNING:
+                mTextPreview->setBGColor(col);
+                mTextPreview->setOpaque(true);
+                mTextPreview->setOutline(false);
+                mTextPreview->setShadow(false);
+                break;
+            case Palette::HIGHLIGHT:
                 mTextPreview->setTextBGColor(col);
                 mTextPreview->setOutline(false);
                 mTextPreview->setShadow(false);
@@ -221,13 +232,10 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
                 mPreview->clearRows();
 
                 if (ch == '<')
-                {
                     msg = toString("@@|") + rawmsg + "@@";
-                }
                 else
-                {
                     msg = "##" + toString(ch) + rawmsg;
-                }
+
                 mPreview->addRow(msg);
                 break;
             case Palette::UNKNOWN_ITEM:
@@ -246,6 +254,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
                 mTextPreview->setFont(boldFont);
                 mTextPreview->setOutline(false);
                 mTextPreview->setShadow(false);
+                break;
             case Palette::PARTICLE:
             case Palette::EXP_INFO:
             case Palette::PICKUP_INFO:
diff --git a/src/gui/textrenderer.h b/src/gui/textrenderer.h
index 599e85a3..c0f5a0e9 100644
--- a/src/gui/textrenderer.h
+++ b/src/gui/textrenderer.h
@@ -37,7 +37,7 @@ class TextRenderer
      */
     static inline void renderText(gcn::Graphics *graphics, const std::string&
             text, int x, int y, gcn::Graphics::Alignment align,
-            const gcn::Color* color, gcn::Font *font, bool outline = false,
+            const gcn::Color color, gcn::Font *font, bool outline = false,
             bool shadow = false, int alpha = 255)
     {
         graphics->setFont(font);
@@ -45,8 +45,7 @@ class TextRenderer
         // Text shadow
         if (shadow)
         {
-            graphics->setColor(guiPalette->getColor(Palette::SHADOW,
-                    alpha / 2));
+            graphics->setColor(guiPalette->getColor(Palette::SHADOW, alpha / 2));
             if (outline)
             {
                 graphics->drawText(text, x + 2, y + 2, align);
@@ -73,7 +72,7 @@ class TextRenderer
             graphics->drawText(text, x, y - 1, align);
         }
 
-        graphics->setColor(*color);
+        graphics->setColor(color);
         graphics->drawText(text, x, y, align);
     }
 };
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index e34bb5cb..5408eebe 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -35,6 +35,7 @@ float TextPreview::mAlpha = config.getValue("guialpha", 0.8);
 TextPreview::TextPreview(const std::string* text)
 {
     mText = text;
+    mTextAlpha = false;
     mFont = gui->getFont();
     mTextColor = &guiPalette->getColor(Palette::TEXT);
     mTextBGColor = NULL;
@@ -47,6 +48,11 @@ void TextPreview::draw(gcn::Graphics* graphics)
     if (config.getValue("guialpha", 0.8) != mAlpha)
         mAlpha = config.getValue("guialpha", 0.8);
 
+    int alpha = (int) (mAlpha * 255.0f);
+
+    if (!mTextAlpha)
+        alpha = 255;
+
     if (mOpaque)
     {
         graphics->setColor(gcn::Color((int) mBGColor->r,
@@ -69,5 +75,7 @@ void TextPreview::draw(gcn::Graphics* graphics)
     }
 
     TextRenderer::renderText(graphics, *mText, 2, 2,  gcn::Graphics::LEFT,
-            mTextColor, mFont, mOutline, mShadow);
+                             gcn::Color(mTextColor->r, mTextColor->g,
+                                        mTextColor->b, alpha),
+                             mFont, mOutline, mShadow, alpha);
 }
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index a73eb638..8e116262 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -44,6 +44,16 @@ class TextPreview : public gcn::Widget
             mTextColor = color;
         }
 
+        /**
+         * Sets the text to use the set alpha value.
+         *
+         * @param alpha whether to use alpha values for the text or not
+         */
+        inline void useTextAlpha(bool alpha) 
+        {
+            mTextAlpha = alpha;
+        }
+
         /**
          * Sets the color the text background is drawn in. This is only the
          * rectangle directly behind the text, not to full widget.
@@ -123,6 +133,7 @@ class TextPreview : public gcn::Widget
         const gcn::Color* mBGColor;
         const gcn::Color* mTextBGColor;
         static float mAlpha;
+        bool mTextAlpha;
         bool mOpaque;
         bool mShadow;
         bool mOutline;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 144357ca..e6e79b45 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -675,6 +675,12 @@ void Window::setGuiAlpha()
     mAlphaChanged = false;
 }
 
+int Window::getGuiAlpha()
+{
+    float alpha = config.getValue("guialpha", 0.8);
+    return (int) (alpha * 255.0f);
+}
+
 Layout &Window::getLayout()
 {
     if (!mLayout) mLayout = new Layout;
diff --git a/src/gui/window.h b/src/gui/window.h
index d573d85f..e04fcfc3 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -300,6 +300,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         virtual void close();
 
+        /**
+         * Gets the alpha value used by the window, in a GUIChan usable format.
+         */
+        int getGuiAlpha();
+
     private:
         enum ResizeHandles
         {
diff --git a/src/text.cpp b/src/text.cpp
index 420eeb8b..4e697f15 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -81,7 +81,7 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
 
     TextRenderer::renderText(graphics, mText,
             mX - xOff, mY - yOff, gcn::Graphics::LEFT,
-            mColor, boldFont, true);
+            *mColor, boldFont, true);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 865c6764..957d67c0 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -61,5 +61,5 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
 
     TextRenderer::renderText(graphics, mText,
             screenX, screenY, gcn::Graphics::CENTER,
-            mColor, mTextFont, mOutline, false, (int) alpha);
+            *mColor, mTextFont, mOutline, false, (int) alpha);
 }
-- 
cgit v1.2.3-70-g09d2


From d6f89802e5aa32f266e881e43d6005e821040c57 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 12:23:50 -0600
Subject: Fix some mem leaks

---
 src/beingmanager.cpp     |  5 +++++
 src/beingmanager.h       |  4 +++-
 src/game.cpp             |  3 ++-
 src/gui/chat.cpp         |  2 ++
 src/gui/setup.cpp        |  2 ++
 src/gui/setup_colors.cpp |  5 ++---
 src/gui/skill.cpp        |  2 +-
 src/gui/table.cpp        |  1 +
 src/gui/window.cpp       |  2 ++
 src/main.cpp             |  1 -
 src/player_relations.cpp | 31 +++++++++++++++++++------------
 src/player_relations.h   |  6 +++---
 12 files changed, 42 insertions(+), 22 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 0c7a310a..e5836aa7 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -52,6 +52,11 @@ BeingManager::BeingManager(Network *network):
 {
 }
 
+BeingManager::~BeingManager()
+{
+    clear();
+}
+
 void BeingManager::setMap(Map *map)
 {
     mMap = map;
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 472e2c83..3284ce16 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -37,6 +37,8 @@ class BeingManager
     public:
         BeingManager(Network *network);
 
+        ~BeingManager();
+
         /**
          * Sets the map on which beings are created
          */
@@ -113,7 +115,7 @@ class BeingManager
         void logic();
 
         /**
-         * Destroys all beings except the local player and current NPC (if any)
+         * Destroys all beings except the local player
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index 47f4ffd2..a346616f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -204,7 +204,6 @@ void createGuiWindows(Network *network)
     npcListDialog = new NpcListDialog(network);
     npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog();
-    setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow();
     tradeWindow = new TradeWindow(network);
@@ -337,6 +336,8 @@ Game::Game(Network *network):
     msg.writeInt32(tick_time);
 
     engine->changeMap(map_path);
+
+    setupWindow->setInGame(true);
 }
 
 Game::~Game()
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 098d4e46..44e08052 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -109,6 +109,8 @@ ChatWindow::~ChatWindow()
     config.setValue("PartyPrefix", partyPrefix);
     config.setValue("ReturnToggles", mReturnToggles ? "1" : "0");
     delete mRecorder;
+    delete mItemLinkHandler;
+    delete mParty;
 }
 
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index ab0b2245..dc232296 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -108,6 +108,8 @@ Setup::Setup():
     add(panel);
 
     setLocationRelativeTo(getParent());
+
+    setInGame(false);
 }
 
 Setup::~Setup()
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 760fdc1f..148fd679 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -62,9 +62,8 @@ Setup_Colors::Setup_Colors() :
     mPreview = new BrowserBox(BrowserBox::AUTO_WRAP);
     mPreview->setOpaque(false);
 
-    // Replace this later with a more appropriate link handler. For now, this'll
-    // do, as it'll do nothing when clicked on.
-    mPreview->setLinkHandler(new ItemLinkHandler());
+    // don't do anything with links
+    mPreview->setLinkHandler(NULL);
 
     mPreviewBox = new ScrollArea(mPreview);
     mPreviewBox->setHeight(20);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 64214ff5..9fbae7a6 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -161,7 +161,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    delete mTable;
+    delete_all(mSkillList);
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 144e7e21..fa801865 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -99,6 +99,7 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
 
 GuiTable::~GuiTable(void)
 {
+    uninstallActionListeners();
     delete mModel;
 }
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e6e79b45..404f5746 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -124,6 +124,8 @@ Window::~Window()
         delete(w);
     }
 
+    removeWidgetListener(this);
+
     instances--;
 
     mSkin->instances--;
diff --git a/src/main.cpp b/src/main.cpp
index 60a4d500..7ee2f6b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1021,7 +1021,6 @@ int main(int argc, char *argv[])
                     delete progressBar;
                     delete progressLabel;
                     delete setup;
-                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 1c1ba669..eec4153c 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -29,6 +29,8 @@
 #include "player.h"
 #include "player_relations.h"
 
+#include "utils/dtor.h"
+
 #define PLAYER_IGNORE_STRATEGY_NOP "nop"
 #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
 #define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0
@@ -38,7 +40,6 @@
 
 #define IGNORE_EMOTE_TIME 100
 
-
 // (De)serialisation class
 class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>,
                                                              std::map<std::string, PlayerRelation *> *>
@@ -93,6 +94,11 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
+PlayerRelationsManager::~PlayerRelationsManager()
+{
+    delete_all(mIgnoreStrategies);
+}
+
 void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
@@ -351,19 +357,20 @@ static std::vector<PlayerIgnoreStrategy *> player_ignore_strategies;
 std::vector<PlayerIgnoreStrategy *> *
 PlayerRelationsManager::getPlayerIgnoreStrategies()
 {
-    if (player_ignore_strategies.size() == 0) {
+    if (mIgnoreStrategies.size() == 0)
+    {
         // not initialised yet?
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
-                                                         "floating '...' bubble",
-                                                         PLAYER_IGNORE_STRATEGY_EMOTE0));
-        player_ignore_strategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
-                                                         "floating bubble",
-                                                         "emote1"));
-        player_ignore_strategies.push_back(new PIS_nothing());
-        player_ignore_strategies.push_back(new PIS_dotdotdot());
-        player_ignore_strategies.push_back(new PIS_blinkname());
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE,
+                                                  "floating '...' bubble",
+                                                   PLAYER_IGNORE_STRATEGY_EMOTE0));
+        mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1,
+                                                  "floating bubble",
+                                                  "emote1"));
+        mIgnoreStrategies.push_back(new PIS_nothing());
+        mIgnoreStrategies.push_back(new PIS_dotdotdot());
+        mIgnoreStrategies.push_back(new PIS_blinkname());
     }
-    return &player_ignore_strategies;
+    return &mIgnoreStrategies;
 }
 
 
diff --git a/src/player_relations.h b/src/player_relations.h
index 0440cace..f4860e08 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -96,6 +96,8 @@ class PlayerRelationsManager
 public:
     PlayerRelationsManager();
 
+    ~PlayerRelationsManager();
+
     /**
      * Initialise player relations manager (load config file etc.)
      */
@@ -143,7 +145,6 @@ public:
      */
     void removePlayer(const std::string &name);
 
-
     /**
      * Retrieves the default permissions.
      */
@@ -154,8 +155,6 @@ public:
      */
     void setDefault(unsigned int permissions);
 
-
-
     /**
      * Retrieves all known player ignore strategies.
      *
@@ -233,6 +232,7 @@ private:
     PlayerIgnoreStrategy *mIgnoreStrategy;
     std::map<std::string, PlayerRelation *> mRelations;
     std::list<PlayerRelationsListener *> mListeners;
+    std::vector<PlayerIgnoreStrategy *> mIgnoreStrategies;
 };
 
 
-- 
cgit v1.2.3-70-g09d2


From f64903f3f139ba83e94c6260c39f88b8d31b793b Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 18 Mar 2009 14:20:14 -0600
Subject: Fix up the NPC interraction widnows a bit

---
 src/gui/buy.cpp              |  7 +++++++
 src/gui/buy.h                |  4 ++++
 src/gui/buysell.cpp          | 16 +++++++++++++---
 src/gui/buysell.h            |  4 ++++
 src/gui/npcintegerdialog.cpp |  2 --
 src/gui/npclistdialog.cpp    |  3 ---
 src/gui/npcstringdialog.cpp  |  4 +---
 src/gui/sell.cpp             |  7 +++++++
 src/gui/sell.h               |  4 ++++
 src/gui/window.cpp           |  2 +-
 src/net/buysellhandler.cpp   |  7 ++-----
 src/net/playerhandler.cpp    |  5 +----
 12 files changed, 44 insertions(+), 21 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index d267e5ad..3107c529 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -247,3 +247,10 @@ void BuyDialog::logic()
 
     if (!current_npc) setVisible(false);
 }
+
+void BuyDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (visible) requestFocus();
+}
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 2555e139..5e2f0b8f 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -100,6 +100,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
          */
         void logic();
 
+        void setVisible(bool visible);
+
     private:
         Network *mNetwork;
         gcn::Button *mBuyButton;
@@ -121,4 +123,6 @@ class BuyDialog : public Window, public gcn::ActionListener,
         Uint32 mMaxItems;
 };
 
+extern BuyDialog *buyDialog;
+
 #endif
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 0550a822..75c49b1f 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -32,6 +32,7 @@
 BuySellDialog::BuySellDialog(Network *network):
     Window(_("Shop")), mNetwork(network)
 {
+    setWindowName("BuySell");
     Button *buyButton = 0;
     static const char *buttonNames[] = {
         N_("Buy"), N_("Sell"), N_("Cancel"), 0
@@ -48,16 +49,25 @@ BuySellDialog::BuySellDialog(Network *network):
     }
     buyButton->requestFocus();
 
-    setContentSize(x, 2 * y + buyButton->getHeight());
+    loadWindowState();
 
-    requestFocus();
+    setContentSize(x, 2 * y + buyButton->getHeight());
 }
 
 void BuySellDialog::logic()
 {
     Window::logic();
 
-    if (!current_npc) setVisible(false);
+    if (isVisible() && !current_npc) {
+        setVisible(false);
+    }
+}
+
+void BuySellDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (visible) requestFocus();
 }
 
 void BuySellDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 197c1a2b..4b137554 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -49,6 +49,8 @@ class BuySellDialog : public Window, public gcn::ActionListener
          */
         void logic();
 
+        void setVisible(bool visible);
+
         /**
          * Called when receiving actions from the widgets.
          */
@@ -58,4 +60,6 @@ class BuySellDialog : public Window, public gcn::ActionListener
         Network *mNetwork;
 };
 
+extern BuySellDialog *buySellDialog;
+
 #endif
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index fad37700..c1460f8d 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -34,8 +34,6 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-extern NpcTextDialog *npcTextDialog;
-
 NpcIntegerDialog::NpcIntegerDialog(Network *network):
     Window(_("NPC Number Request")), mNetwork(network)
 {
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 95fe5983..3960cb21 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -37,8 +37,6 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-extern NpcTextDialog *npcTextDialog;
-
 NpcListDialog::NpcListDialog(Network *network):
     Window(_("NPC")), mNetwork(network)
 {
@@ -69,7 +67,6 @@ NpcListDialog::NpcListDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    resetToDefaultSize(false);
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 7c9f78af..4d170208 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -34,12 +34,10 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-extern NpcTextDialog *npcTextDialog;
-
 NpcStringDialog::NpcStringDialog(Network *network):
     Window(_("NPC Text Request")), mNetwork(network)
 {
-    setWindowName("NPCList");
+    setWindowName("NPCString");
     mValueField = new TextField("");
 
     gcn::Button *okButton = new Button(_("OK"), "ok", this);
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index b53a23c1..4cdabe68 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -273,3 +273,10 @@ void SellDialog::logic()
 
     if (!current_npc) setVisible(false);
 }
+
+void SellDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (visible) requestFocus();
+}
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 3777b91e..3ae5e320 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -86,6 +86,8 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void logic();
 
+        void setVisible(bool visible);
+
     private:
         /**
          * Updates the state of buttons and labels.
@@ -112,4 +114,6 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
         int mAmountItems;
 };
 
+extern SellDialog *sellDialog;
+
 #endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index be63ff21..4bc0e4d0 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -120,7 +120,7 @@ Window::~Window()
     const std::string &name = mWindowName;
 
     // Saving X, Y and Width and Height for resizables in the config
-    if (!name.empty())
+    if (!name.empty() && name != "window")
     {
         config.setValue(name + "WinX", getX());
         config.setValue(name + "WinY", getY());
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 520a1fe6..dcefe905 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -32,15 +32,12 @@
 #include "../npc.h"
 
 #include "../gui/buy.h"
+#include "../gui/buysell.h"
 #include "../gui/chat.h"
 #include "../gui/sell.h"
 
 #include "../utils/gettext.h"
 
-extern BuyDialog *buyDialog;
-extern Window *buySellDialog;
-extern SellDialog *sellDialog;
-
 BuySellHandler::BuySellHandler()
 {
     static const Uint16 _messages[] = {
@@ -64,8 +61,8 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             buyDialog->reset();
             sellDialog->setVisible(false);
             sellDialog->reset();
-            buySellDialog->setVisible(true);
             current_npc = msg->readInt32();
+            buySellDialog->setVisible(true);
             break;
 
         case SMSG_NPC_BUY:
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 4cc29568..aa0ef16c 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -30,6 +30,7 @@
 #include "../units.h"
 
 #include "../gui/buy.h"
+#include "../gui/buysell.h"
 #include "../gui/chat.h"
 #include "../gui/gui.h"
 #include "../gui/npc_text.h"
@@ -49,10 +50,6 @@
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
 
-extern BuyDialog *buyDialog;
-extern SellDialog *sellDialog;
-extern Window *buySellDialog;
-
 // Max. distance we are willing to scroll after a teleport;
 // everything beyond will reset the port hard.
 static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
-- 
cgit v1.2.3-70-g09d2


From 6f0d88e781c8b1a75858c769b3641aa8cd477314 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 18 Mar 2009 14:20:14 -0600
Subject: Fix up the NPC interraction widnows a bit

---
 src/gui/buy.cpp             |  7 +++++++
 src/gui/buy.h               |  1 +
 src/gui/buysell.cpp         | 16 +++++++++++++++-
 src/gui/buysell.h           | 10 ++++++++++
 src/gui/item_amount.cpp     | 24 ++++++++++++------------
 src/gui/npcstringdialog.cpp |  2 --
 src/gui/sell.cpp            |  7 +++++++
 src/gui/sell.h              |  1 +
 src/gui/storagewindow.h     |  4 ++++
 src/gui/trade.cpp           | 27 ++++++++++++++-------------
 src/gui/trade.h             | 13 ++++++-------
 src/gui/window.cpp          |  2 +-
 src/net/buysellhandler.cpp  |  7 ++-----
 src/net/playerhandler.cpp   |  5 +----
 14 files changed, 81 insertions(+), 45 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 367a041e..ea1df204 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -236,3 +236,10 @@ void BuyDialog::updateButtonsAndLabels()
     mMoneyLabel->setCaption
         (strprintf(_("Price: %d GP / Total: %d GP"), price, mMoney - price));
 }
+
+void BuyDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (visible) requestFocus();
+}
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 17ab6e19..08697889 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -96,6 +96,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
          */
         void updateButtonsAndLabels();
 
+        void setVisible(bool visible);
     private:
         Network *mNetwork;
         gcn::Button *mBuyButton;
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 64ffdc3f..df222797 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -54,8 +54,22 @@ BuySellDialog::BuySellDialog(Network *network):
                    getTitleBarHeight()), ImageRect::CENTER);
 
     loadWindowState();
+}
+
+void BuySellDialog::logic()
+{
+    Window::logic();
+
+    if (isVisible() && !current_npc)
+        setVisible(false);
+}
+
+void BuySellDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
 
-    requestFocus();
+    if (visible)
+        requestFocus();
 }
 
 void BuySellDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0842c0e1..c6989709 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -46,6 +46,16 @@ class BuySellDialog : public Window, public gcn::ActionListener
         BuySellDialog(Network *network);
 
         /**
+<<<<<<< HEAD:src/gui/buysell.h
+=======
+         * Check for current NPC
+         */
+        void logic();
+
+        void setVisible(bool visible);
+
+        /**
+>>>>>>> f64903f... Fix up the NPC interraction widnows a bit:src/gui/buysell.h
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 8208d323..c5b27524 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -36,7 +36,9 @@
 
 ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     Window("", true, parent),
-    mItem(item), mUsage(usage), mMax(mItem->getQuantity())
+    mItem(item),
+    mMax(item->getQuantity()),
+    mUsage(usage)
 {
     // Integer field
     mItemAmountTextField = new IntTextField(1);
@@ -53,10 +55,8 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
 
     // Buttons
     Button *minusButton = new Button("-", "Minus", this);
-    minusButton->setSize(20, 20);
     Button *plusButton = new Button("+", "Plus", this);
-    plusButton->setSize(20, 20);
-    Button *okButton = new Button(_("Ok"), "Drop", this);
+    Button *okButton = new Button(_("Ok"), "Ok", this);
     Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
     Button *addAllButton = new Button(_("All"), "All", this);
 
@@ -64,10 +64,10 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     place(0, 0, minusButton);
     place(1, 0, mItemAmountTextField).setPadding(2);
     place(2, 0, plusButton);
-    place(4, 0, addAllButton, 2);
+    place(5, 0, addAllButton);
     place(0, 1, mItemAmountSlide, 6);
-    place(4, 2, okButton);
-    place(5, 2, cancelButton);
+    place(4, 2, cancelButton);
+    place(5, 2, okButton);
     reflowLayout(250, 0);
 
     resetAmount();
@@ -101,17 +101,17 @@ void ItemAmountWindow::resetAmount()
 
 void ItemAmountWindow::action(const gcn::ActionEvent &event)
 {
-    int amount = mItemAmountTextField->getValue();
+    int amount = mItemAmountSlide->getValue();
 
     if (event.getId() == "Cancel")
     {
         scheduleDelete();
     }
-    else if (event.getId() == "Plus")
+    else if (event.getId() == "Plus" && amount < mMax)
     {
         amount++;
     }
-    else if (event.getId() == "Minus")
+    else if (event.getId() == "Minus" && amount > 0)
     {
         amount--;
     }
@@ -121,9 +121,8 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Ok" || event.getId() == "All")
     {
-        if (event.getId() == "All") {
+        if (event.getId() == "All") 
             amount = mMax;
-        }
 
         switch (mUsage)
         {
@@ -145,6 +144,7 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
         }
 
         scheduleDelete();
+        return;
     }
 
     mItemAmountTextField->setValue(amount);
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index f50136ba..43d0722f 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -64,9 +64,7 @@ void NpcStringDialog::setValue(const std::string &value)
 void NpcStringDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "cancel")
-    {
         mValueField->setText("");
-    }
 
     setVisible(false);
     NPC::mTalking = false;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index b780b02b..ed023227 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -265,3 +265,10 @@ void SellDialog::updateButtonsAndLabels()
         (strprintf(_("Price: %d GP / Total: %d GP"),
                    income, mPlayerMoney + income));
 }
+
+void SellDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
+
+    if (visible) requestFocus();
+}
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 5fb94c4e..c67a25b9 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -82,6 +82,7 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void setMoney(int amount);
 
+        void setVisible(bool visible);
     private:
         /**
          * Updates the state of buttons and labels.
diff --git a/src/gui/storagewindow.h b/src/gui/storagewindow.h
index 86451bfe..8f02a618 100644
--- a/src/gui/storagewindow.h
+++ b/src/gui/storagewindow.h
@@ -80,6 +80,10 @@ class StorageWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void removeStore(Item* item, int ammount);
 
+        /**
+         * Closes the Storage Window, as well as telling the server that the
+         * window has been closed.
+         */
         void close();
 
     private:
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index bae0b651..18b86d4b 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -54,6 +54,7 @@ TradeWindow::TradeWindow(Network *network):
     setWindowName(_("Trade"));
     setDefaultSize(342, 209, ImageRect::CENTER);
     setResizable(true);
+    setCloseButton(true);
 
     setMinWidth(342);
     setMinHeight(209);
@@ -90,10 +91,10 @@ TradeWindow::TradeWindow(Network *network):
     place(0, 0, mMoneyLabel2);
     place(1, 0, mMoneyField);
     place = getPlacer(0, 2);
-    place(0, 0, mAddButton);
-    place(1, 0, mOkButton);
-    place(2, 0, mTradeButton);
-    place(3, 0, mCancelButton);
+    place(4, 0, mCancelButton);
+    place(5, 0, mTradeButton);
+    place(6, 0, mAddButton);
+    place(7, 0, mOkButton);
     Layout &layout = getLayout();
     layout.extend(0, 2, 2, 1);
     layout.setRowHeight(1, Layout::AUTO_SET);
@@ -108,14 +109,6 @@ TradeWindow::~TradeWindow()
 {
 }
 
-void TradeWindow::widgetResized(const gcn::Event &event)
-{
-    mMyItemContainer->setWidth(mMyScroll->getWidth());
-    mPartnerItemContainer->setWidth(mPartnerScroll->getWidth());
-
-    Window::widgetResized(event);
-}
-
 void TradeWindow::addMoney(int amount)
 {
     mMoneyLabel->setCaption(strprintf(_("You get %d GP."), amount));
@@ -212,6 +205,7 @@ void TradeWindow::receivedOk(bool own)
 
 void TradeWindow::tradeItem(Item *item, int quantity)
 {
+    addItem(item->getId(), true, quantity, item->isEquipment());
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_TRADE_ITEM_ADD_REQUEST);
     outMsg.writeInt16(item->getInvIndex());
@@ -249,7 +243,8 @@ void TradeWindow::action(const gcn::ActionEvent &event)
         if (mMyInventory->contains(item))
         {
             chatWindow->chatLog(_("Failed adding item. You can not "
-                        "overlap one kind of item on the window."), BY_SERVER);
+                                  "overlap one kind of item on the window."),
+                                  BY_SERVER);
             return;
         }
 
@@ -295,3 +290,9 @@ void TradeWindow::action(const gcn::ActionEvent &event)
         outMsg.writeInt16(CMSG_TRADE_OK);
     }
 }
+
+void TradeWindow::close()
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_TRADE_CANCEL_REQUEST);
+}
diff --git a/src/gui/trade.h b/src/gui/trade.h
index f4a6b5cd..c4d3076a 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -56,13 +56,6 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         ~TradeWindow();
 
-        /**
-         * Called when resizing the window.
-         *
-         * @param event The calling event
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Add money to the trade window.
          */
@@ -119,6 +112,12 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Closes the Trade Window, as well as telling the server that the
+         * window has been closed.
+         */
+        void close();
+
     private:
         Network *mNetwork;
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 404f5746..13c8f4ce 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -536,7 +536,7 @@ void Window::loadWindowState()
 void Window::saveWindowState()
 {
     // Saving X, Y and Width and Height for resizables in the config
-    if (!mWindowName.empty())
+    if (!mWindowName.empty() && mWindowName != "window")
     {
         config.setValue(mWindowName + "WinX", getX());
         config.setValue(mWindowName + "WinY", getY());
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 5b8f0b68..287e5400 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -33,15 +33,12 @@
 #include "../npc.h"
 
 #include "../gui/buy.h"
+#include "../gui/buysell.h"
 #include "../gui/chat.h"
 #include "../gui/sell.h"
 
 #include "../utils/gettext.h"
 
-extern BuyDialog *buyDialog;
-extern Window *buySellDialog;
-extern SellDialog *sellDialog;
-
 BuySellHandler::BuySellHandler()
 {
     static const Uint16 _messages[] = {
@@ -65,8 +62,8 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             buyDialog->reset();
             sellDialog->setVisible(false);
             sellDialog->reset();
-            buySellDialog->setVisible(true);
             current_npc = msg->readInt32();
+            buySellDialog->setVisible(true);
             break;
 
         case SMSG_NPC_BUY:
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 6533ac1e..60d58a37 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -30,6 +30,7 @@
 #include "../npc.h"
 
 #include "../gui/buy.h"
+#include "../gui/buysell.h"
 #include "../gui/chat.h"
 #include "../gui/gui.h"
 #include "../gui/npc_text.h"
@@ -49,10 +50,6 @@
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
 
-extern BuyDialog *buyDialog;
-extern SellDialog *sellDialog;
-extern Window *buySellDialog;
-
 // Max. distance we are willing to scroll after a teleport;
 // everything beyond will reset the port hard.
 static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
-- 
cgit v1.2.3-70-g09d2


From 61f4e3b9838ac7a0e06cd066ea07224670f1b851 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 19 Mar 2009 16:27:51 -0600
Subject: Make sure positionable dialogs start out centered

---
 src/gui/buy.cpp              |  1 +
 src/gui/buysell.cpp          |  6 ++++--
 src/gui/char_select.cpp      |  4 ++--
 src/gui/char_server.cpp      |  2 +-
 src/gui/confirm_dialog.cpp   |  2 +-
 src/gui/connection.cpp       |  2 +-
 src/gui/help.cpp             |  2 +-
 src/gui/itempopup.cpp        |  2 +-
 src/gui/login.cpp            |  2 +-
 src/gui/npc_text.cpp         |  1 +
 src/gui/npcintegerdialog.cpp |  4 ++++
 src/gui/npclistdialog.cpp    |  1 +
 src/gui/npcstringdialog.cpp  |  4 ++++
 src/gui/ok_dialog.cpp        |  2 +-
 src/gui/register.cpp         |  2 +-
 src/gui/sell.cpp             |  1 +
 src/gui/setup.cpp            |  2 +-
 src/gui/skill.cpp            |  2 +-
 src/gui/speechbubble.cpp     |  2 +-
 src/gui/storagewindow.cpp    |  1 +
 src/gui/updatewindow.cpp     |  2 +-
 src/gui/window.cpp           | 20 ++++++++++++++++----
 src/gui/window.h             | 10 ++++++++++
 23 files changed, 57 insertions(+), 20 deletions(-)

(limited to 'src/gui/window.cpp')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 3107c529..7e03c591 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -90,6 +90,7 @@ BuyDialog::BuyDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 75c49b1f..e6dc7c1f 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -49,9 +49,11 @@ BuySellDialog::BuySellDialog(Network *network):
     }
     buyButton->requestFocus();
 
-    loadWindowState();
-
     setContentSize(x, 2 * y + buyButton->getHeight());
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 void BuySellDialog::logic()
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 6d5e082a..709988a3 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -127,7 +127,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
 
     reflowLayout(250, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mSelectButton->requestFocus();
     updatePlayerInfo();
@@ -306,7 +306,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 
     reflowLayout(225, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mNameField->requestFocus();
 }
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 89bfa93a..22b0e7aa 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -85,7 +85,7 @@ ServerSelectDialog::ServerSelectDialog(LoginData *loginData, int nextState):
         // Select first server
         mServerList->setSelected(1);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mOkButton->requestFocus();
 }
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 0d41525a..a40593e3 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -85,7 +85,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
 
     if (getParent())
     {
-        setLocationRelativeTo(getParent());
+        center();
         getParent()->moveToTop(this);
     }
     setVisible(true);
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index a69698e9..981100f9 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -56,7 +56,7 @@ ConnectionDialog::ConnectionDialog():
     add(cancelButton);
     add(mProgressBar);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
 }
 
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 30c6a9c4..78b3c93a 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -58,7 +58,7 @@ HelpWindow::HelpWindow():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 void HelpWindow::action(const gcn::ActionEvent &event)
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 0e0dd9e6..efbee6b0 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -89,7 +89,7 @@ ItemPopup::ItemPopup():
     add(mItemEffectScroll);
     add(mItemWeightScroll);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 ItemPopup::~ItemPopup()
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index e91f7616..414de40e 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -110,7 +110,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     place(3, 6, mOkButton);
     reflowLayout(250, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
 
     if (mUserField->getText().empty()) {
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 53c64a54..5bc654b8 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -61,6 +61,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index c1460f8d..643a7ef8 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -61,6 +61,10 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(2, 0, cancelButton);
     place(3, 0, okButton);
     reflowLayout(175, 0);
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 void NpcIntegerDialog::setRange(int min, int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 3960cb21..d280a982 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -66,6 +66,7 @@ NpcListDialog::NpcListDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 4d170208..7ae2d5ed 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -47,6 +47,10 @@ NpcStringDialog::NpcStringDialog(Network *network):
     place(1, 1, cancelButton);
     place(2, 1, okButton);
     reflowLayout(175, 0);
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 4f4f1117..f1a97b49 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -74,7 +74,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     add(mTextArea);
     add(okButton);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     okButton->requestFocus();
 }
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index c2190501..25c97713 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -130,7 +130,7 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mServerField->addActionListener(this);
     mPortField->addActionListener(this);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mUserField->requestFocus();
     mUserField->setCaretPosition(mUserField->getText().length());
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 4cdabe68..e1b15bac 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -93,6 +93,7 @@ SellDialog::SellDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 68bc3a4b..872596b0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -101,7 +101,7 @@ Setup::Setup():
 
     add(panel);
 
-    setLocationRelativeTo(getParent());
+    center();
 
     setInGame(false);
 }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 6112f0e3..ed374a31 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -157,7 +157,7 @@ SkillDialog::SkillDialog():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 5f05971d..fb0d7684 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -58,7 +58,7 @@ SpeechBubble::SpeechBubble():
     add(mCaption);
     add(mSpeechArea);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 void SpeechBubble::setCaption(const std::string &name, const gcn::Color *color)
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 5981f121..663ad784 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -92,6 +92,7 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     Layout &layout = getLayout();
     layout.setRowHeight(0, mStoreButton->getHeight());
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 6ec62337..df0a1f80 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -131,7 +131,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mCancelButton->requestFocus();
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 4bc0e4d0..d4665427 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -67,10 +67,9 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     mModal(modal),
     mCloseButton(false),
     mSticky(false),
-    mMinWinWidth(100),
-    mMinWinHeight(40),
-    mMaxWinWidth(INT_MAX),
-    mMaxWinHeight(INT_MAX),
+    mMinWinWidth(100), mDefaultWidth(100), mMaxWinWidth(INT_MAX),
+    mMinWinHeight(40), mDefaultHeight(40), mMaxWinHeight(INT_MAX),
+    mDefaultX(100), mDefaultY(100),
     mSkin(skin)
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
@@ -492,6 +491,14 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
+void Window::setDefaultSize()
+{
+    mDefaultX = getX();
+    mDefaultY = getY();
+    mDefaultWidth = getWidth();
+    mDefaultHeight = getHeight();
+}
+
 void Window::resetToDefaultSize(bool changePosition)
 {
     if (changePosition) setPosition(mDefaultX, mDefaultY);
@@ -733,3 +740,8 @@ void Window::reflowLayout(int w, int h)
     mLayout = NULL;
     setContentSize(w, h);
 }
+
+void Window::center()
+{
+    setLocationRelativeTo(getParent());
+}
diff --git a/src/gui/window.h b/src/gui/window.h
index 9977aff4..95fe2174 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -239,6 +239,11 @@ class Window : public gcn::Window, gcn::WidgetListener
         void setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight);
 
+        /**
+         * Set the default win pos and size tot he current ones.
+         */
+        void setDefaultSize();
+
         /**
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
@@ -275,6 +280,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         ContainerPlacer getPlacer(int x, int y);
 
+        /**
+         * Positions the window in the center of it's parent.
+         */
+        void center();
+
     protected:
         /** The window container windows add themselves to. */
         static WindowContainer *windowContainer;
-- 
cgit v1.2.3-70-g09d2