Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 100 insertions, 14 deletions

diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index aadfc11e3..7899247e3 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -24,54 +24,117 @@
 
 #include "configuration.h"
 #include "joystick.h"
+#include "logger.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
+#include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 
 #include "utils/gettext.h"
 
+#include <guichan/listmodel.hpp>
+
 #include "debug.h"
 
 extern Joystick *joystick;
 
+class NamesModel : public gcn::ListModel
+{
+    public:
+        NamesModel()
+        { }
+
+        virtual ~NamesModel()
+        { }
+
+        virtual int getNumberOfElements()
+        {
+            return static_cast<int>(mNames.size());
+        }
+
+        virtual std::string getElementAt(int i)
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return _("???");
+
+            return mNames[i];
+        }
+
+        std::vector<std::string> mNames;
+};
+
+
 Setup_Joystick::Setup_Joystick():
     mCalibrateLabel(new Label(_("Press the button to start calibration"))),
     mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
-    mJoystickEnabled(new CheckBox(_("Enable joystick")))
+    mJoystickEnabled(new CheckBox(_("Enable joystick"))),
+    mNamesModel(new NamesModel()),
+    mNamesDropDown(new DropDown(mNamesModel)),
+    mUseInactiveCheckBox(new CheckBox(_("Use joystick if client "
+        "window inactive"), config.getBoolValue("useInactiveJoystick")))
 {
     setName(_("Joystick"));
 
-    mOriginalJoystickEnabled = !config.getBoolValue("joystickEnabled");
-    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
+    Joystick::getNames(mNamesModel->mNames);
 
+    mOriginalJoystickEnabled = config.getBoolValue("joystickEnabled");
+    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
+    mJoystickEnabled->setActionEventId("joystick");
     mJoystickEnabled->addActionListener(this);
+    mCalibrateButton->setEnabled(mOriginalJoystickEnabled);
+
+    mNamesDropDown->setActionEventId("name");
+    mNamesDropDown->addActionListener(this);
+
+    if (joystick)
+    {
+        mNamesDropDown->setSelected(joystick->getNumber());
+    }
+    else
+    {
+        unsigned sel = config.getIntValue("selectedJoystick");
+        if (sel >= mNamesModel->mNames.size())
+            sel = 0;
+        mNamesDropDown->setSelected(sel);
+    }
 
     // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
 
     place(0, 0, mJoystickEnabled);
-    place(0, 1, mCalibrateLabel);
-    place.getCell().matchColWidth(0, 0);
-    place = h.getPlacer(0, 1);
-    place(0, 0, mCalibrateButton);
+    place(0, 1, mNamesDropDown);
+    place(0, 2, mUseInactiveCheckBox);
+    place(0, 3, mCalibrateLabel);
+    place(0, 4, mCalibrateButton);
 
     setDimension(gcn::Rectangle(0, 0, 365, 75));
 }
 
-void Setup_Joystick::action(const gcn::ActionEvent &event)
+Setup_Joystick::~Setup_Joystick()
 {
-    if (!joystick)
-        return;
+    delete mNamesModel;
+    mNamesModel = nullptr;
+}
 
+void Setup_Joystick::action(const gcn::ActionEvent &event)
+{
     if (event.getSource() == mJoystickEnabled)
     {
-        joystick->setEnabled(mJoystickEnabled->isSelected());
+        setTempEnabled(mJoystickEnabled->isSelected());
+    }
+    else if (event.getSource() == mNamesDropDown)
+    {
+        if (joystick)
+            joystick->setNumber(mNamesDropDown->getSelected());
     }
     else
     {
+        if (!joystick)
+            return;
+
         if (joystick->isCalibrating())
         {
             mCalibrateButton->setCaption(_("Calibrate"));
@@ -82,23 +145,46 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
         else
         {
             mCalibrateButton->setCaption(_("Stop"));
-            mCalibrateLabel->setCaption(_("Rotate the stick"));
+            mCalibrateLabel->setCaption(
+                _("Rotate the stick and dont press buttons"));
             joystick->startCalibration();
         }
     }
 }
 
+void Setup_Joystick::setTempEnabled(bool sel)
+{
+    Joystick::setEnabled(sel);
+    mCalibrateButton->setEnabled(sel);
+    if (joystick)
+    {
+        if (sel)
+            joystick->open();
+        else
+            joystick->close();
+    }
+}
+
 void Setup_Joystick::cancel()
 {
     if (joystick)
         joystick->setEnabled(mOriginalJoystickEnabled);
 
+    if (mOriginalJoystickEnabled != mJoystickEnabled->isSelected())
+        setTempEnabled(mOriginalJoystickEnabled);
+
     mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 }
 
 void Setup_Joystick::apply()
 {
+    if (!joystick)
+        return;
+
     config.setValue("joystickEnabled",
-                    joystick ? joystick->isEnabled() : false);
-}
+        joystick ? joystick->isEnabled() : false);
 
+    config.setValue("useInactiveJoystick", mUseInactiveCheckBox->isSelected());
+    if (joystick)
+        joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
+}