Merge radiobutton classes into one.

4 files changed, 259 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e8addc16..967149917 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -811,7 +811,6 @@ SET(SRCS
     gui/widgets/widget.h
     listeners/widgetlistener.h
     gui/base/widgets/container.hpp
-    gui/base/widgets/radiobutton.hpp
     gui/base/widgets/scrollarea.hpp
     gui/base/widgets/slider.hpp
     gui/base/widgets/textbox.hpp
@@ -823,7 +822,6 @@ SET(SRCS
     gui/rect.cpp
     gui/widgets/widget.cpp
     gui/base/widgets/container.cpp
-    gui/base/widgets/radiobutton.cpp
     gui/base/widgets/scrollarea.cpp
     gui/base/widgets/slider.cpp
     gui/base/widgets/textbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 062d82443..5272a1778 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/widgets/widget.h \
 	      listeners/widgetlistener.h \
 	      gui/base/widgets/container.hpp \
-	      gui/base/widgets/radiobutton.hpp \
 	      gui/base/widgets/scrollarea.hpp \
 	      gui/base/widgets/slider.hpp \
 	      gui/base/widgets/textbox.hpp \
@@ -186,7 +185,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/rect.cpp \
 	      gui/widgets/widget.cpp \
 	      gui/base/widgets/container.cpp \
-	      gui/base/widgets/radiobutton.cpp \
 	      gui/base/widgets/scrollarea.cpp \
 	      gui/base/widgets/slider.cpp \
 	      gui/base/widgets/textbox.cpp \
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index bb9ae46f9..1aa77a0db 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/widgets/radiobutton.h"
 
 #include "client.h"
@@ -39,17 +82,32 @@ int RadioButton::instances = 0;
 Skin *RadioButton::mSkin = nullptr;
 float RadioButton::mAlpha = 1.0;
 
+RadioButton::GroupMap RadioButton::mGroupMap;
+
 RadioButton::RadioButton(const Widget2 *const widget,
                          const std::string &restrict caption,
                          const std::string &restrict group,
                          const bool marked):
-    gcn::RadioButton(widget, caption, group, marked),
+    Widget(widget),
+    MouseListener(),
+    KeyListener(),
+    mSelected(false),
+    mCaption(),
+    mGroup(),
     mPadding(0),
     mImagePadding(0),
     mImageSize(9),
     mSpacing(2),
     mHasMouse(false)
 {
+    setCaption(caption);
+    setGroup(group);
+    setSelected(marked);
+
+    setFocusable(true);
+    addMouseListener(this);
+    addKeyListener(this);
+
     mForegroundColor = getThemeColor(Theme::RADIOBUTTON);
     mForegroundColor2 = getThemeColor(Theme::RADIOBUTTON_OUTLINE);
     if (instances == 0)
@@ -77,6 +135,8 @@ RadioButton::RadioButton(const Widget2 *const widget,
 
 RadioButton::~RadioButton()
 {
+    setGroup("");
+
     if (gui)
         gui->removeDragged(this);
 
@@ -196,3 +256,57 @@ void RadioButton::adjustSize()
     setWidth(mImagePadding + mImageSize + mSpacing
         + font->getWidth(mCaption) + mPadding);
 }
+
+void RadioButton::setSelected(const bool selected)
+{
+    if (selected && !mGroup.empty())
+    {
+        for (GroupIterator iter = mGroupMap.lower_bound(mGroup),
+             iterEnd = mGroupMap.upper_bound(mGroup);
+             iter != iterEnd;
+             ++ iter)
+        {
+            if (iter->second && iter->second->isSelected())
+                iter->second->setSelected(false);
+        }
+    }
+
+    mSelected = selected;
+}
+
+void RadioButton::mouseClicked(MouseEvent& mouseEvent)
+{
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
+    {
+        setSelected(true);
+        distributeActionEvent();
+    }
+}
+
+void RadioButton::mouseDragged(MouseEvent& mouseEvent)
+{
+    mouseEvent.consume();
+}
+
+void RadioButton::setGroup(const std::string &group)
+{
+    if (mGroup != "")
+    {
+        for (GroupIterator iter = mGroupMap.lower_bound(mGroup),
+             iterEnd = mGroupMap.upper_bound(mGroup);
+             iter != iterEnd;
+             ++ iter)
+        {
+            if (iter->second == this)
+            {
+                mGroupMap.erase(iter);
+                break;
+            }
+        }
+    }
+
+    if (!group.empty())
+        mGroupMap.insert(std::pair<std::string, RadioButton *>(group, this));
+
+    mGroup = group;
+}
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 2deb9a772..5aa0d9289 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -20,10 +20,56 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_WIDGETS_RADIOBUTTON_H
 #define GUI_WIDGETS_RADIOBUTTON_H
 
-#include "gui/base/widgets/radiobutton.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
@@ -32,7 +78,10 @@ class Skin;
 /**
  * Guichan based RadioButton with custom look
  */
-class RadioButton final : public gcn::RadioButton
+class RadioButton final : public Widget,
+                          public MouseListener,
+                          public KeyListener
+
 {
     public:
         /**
@@ -53,7 +102,7 @@ class RadioButton final : public gcn::RadioButton
         /**
          * Draws the radiobutton, not the caption.
          */
-        void drawBox(Graphics* graphics) override final;
+        void drawBox(Graphics* graphics);
 
         /**
          * Implementation of the draw methods.
@@ -77,10 +126,102 @@ class RadioButton final : public gcn::RadioButton
 
         void adjustSize();
 
+        /**
+         * Checks if the radio button is selected.
+         *
+         * @return True if the radio button is selecte, false otherwise.
+         * @see setSelected
+         */
+        bool isSelected() const
+        { return mSelected; }
+
+        /**
+         * Sets the radio button to selected or not.
+         *
+         * @param selected True if the radio button should be selected,
+         *                 false otherwise.
+         * @see isSelected
+         */
+        void setSelected(const bool selected);
+
+        /**
+         * Gets the caption of the radio button.
+         *
+         * @return The caption of the radio button.
+         * @see setCaption
+         */
+        const std::string &getCaption() const
+        { return mCaption; }
+
+        /**
+         * Sets the caption of the radio button. It's advisable to call
+         * adjustSize after setting of the caption to adjust the
+         * radio button's size to fit the caption.
+         *
+         * @param caption The caption of the radio button.
+         * @see getCaption, adjustSize
+         */
+        void setCaption(const std::string &caption)
+        { mCaption = caption; }
+
+        void mouseClicked(MouseEvent& mouseEvent) override final;
+
+        void mouseDragged(MouseEvent& mouseEvent) override final;
+
+        /**
+         * Sets the group the radio button should belong to. Note that
+         * a radio button group is unique per application, not per Gui object
+         * as the group is stored in a static map.
+         *
+         * @param group The name of the group.
+         * @see getGroup
+         */
+        void setGroup(const std::string &group);
+
+        /**
+         * Gets the group the radio button belongs to.
+         *
+         * @return The group the radio button belongs to.
+         * @see setGroup
+         */
+        const std::string &getGroup() const
+        { return mGroup; }
+
     private:
         static int instances;
         static Skin *mSkin;
         static float mAlpha;
+
+        /**
+         * True if the radio button is selected, false otherwise.
+         */
+        bool mSelected;
+
+        /**
+         * Holds the caption of the radio button.
+         */
+        std::string mCaption;
+
+        /**
+         * Holds the group of the radio button.
+         */
+        std::string mGroup;
+
+        /**
+         * Typdef.
+         */
+        typedef std::multimap<std::string, RadioButton *> GroupMap;
+
+        /**
+         * Typdef.
+         */
+        typedef GroupMap::iterator GroupIterator;
+
+        /**
+         * Holds all available radio button groups.
+         */
+        static GroupMap mGroupMap;
+
         int mPadding;
         int mImagePadding;
         int mImageSize;