summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/defaults.cpp4
-rw-r--r--src/gui/setup_input.cpp3
-rw-r--r--src/gui/setup_touch.cpp8
-rw-r--r--src/gui/setup_touch.h4
-rw-r--r--src/gui/setupactiondata.h14
-rw-r--r--src/gui/widgets/setuptouchitem.cpp119
-rw-r--r--src/gui/widgets/setuptouchitem.h109
-rw-r--r--src/inputmanager.cpp14
-rw-r--r--src/inputmanager.h2
-rw-r--r--src/touchactions.cpp6
12 files changed, 276 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7335fd10..a54e06c59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -190,6 +190,8 @@ SET(SRCS
gui/widgets/setuptab.h
gui/widgets/setuptabscroll.cpp
gui/widgets/setuptabscroll.h
+ gui/widgets/setuptouchitem.cpp
+ gui/widgets/setuptouchitem.h
gui/widgets/shopitems.cpp
gui/widgets/shopitems.h
gui/widgets/shoplistbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c2ecc7f1..9f3b676e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,6 +190,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/setuptab.h \
gui/widgets/setuptabscroll.cpp \
gui/widgets/setuptabscroll.h \
+ gui/widgets/setuptouchitem.cpp \
+ gui/widgets/setuptouchitem.h \
gui/widgets/shopitems.cpp \
gui/widgets/shopitems.h \
gui/widgets/shoplistbox.cpp \
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 2c59ee887..467f9bd44 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -24,8 +24,9 @@
#include "utils/stringutils.h"
#include "being.h"
-#include "graphics.h"
#include "client.h"
+#include "graphics.h"
+#include "keydata.h"
#include <stdlib.h>
@@ -296,6 +297,7 @@ DefaultsData* getConfigDefaults()
AddDEF("selfMouseHeal", true);
AddDEF("serverslistupdate", "");
AddDEF("fadeoutmusic", false);
+ AddDEF("screenActionKeyboard", Input::KEY_SHOW_KEYBOARD);
return configData;
}
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 31743dd7e..7b9c49056 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -43,7 +43,8 @@
#include "debug.h"
-const int setupGroups = 9;
+static int selectedData = 0;
+static const int setupGroups = 9;
/**
* The list model for key function list.
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index a443af771..719b6277a 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -21,7 +21,6 @@
#include "gui/setup_touch.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "configuration.h"
@@ -42,7 +41,8 @@ static const char *const sizeList[] =
Setup_Touch::Setup_Touch(const Widget2 *const widget) :
SetupTabScroll(widget),
- mSizeList(new NamesModel)
+ mSizeList(new NamesModel),
+ mActionsList(new TouchActionsModel)
{
setName(_("Touch"));
@@ -66,6 +66,10 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
new SetupItemDropDown(_("Joystick size"), "", "screenJoystickSize", this,
"screenJoystickEvent", mSizeList, 100);
+ new SetupActionDropDown(_("Keyboard icon action"), "",
+ "screenActionKeyboard", this, "screenActionKeyboardEvent",
+ mActionsList, 250);
+
setDimension(gcn::Rectangle(0, 0, 550, 350));
}
diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h
index 150bfd79a..2dc270abf 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/setup_touch.h
@@ -21,12 +21,11 @@
#ifndef GUI_SETUP_TOUCH_H
#define GUI_SETUP_TOUCH_H
-#include "gui/widgets/setupitem.h"
+#include "gui/widgets/setuptouchitem.h"
#include <guichan/actionlistener.hpp>
class EditDialog;
-class NamesModel;
class TextField;
class Setup_Touch final : public SetupTabScroll
@@ -40,6 +39,7 @@ class Setup_Touch final : public SetupTabScroll
protected:
NamesModel *mSizeList;
+ TouchActionsModel *mActionsList;
};
#endif
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 935cd95b6..495879104 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -31,9 +31,7 @@
#include <string>
-#include "debug.h"
-
-int selectedData = 0;
+//#include "debug.h"
struct SetupActionData final
{
@@ -1570,4 +1568,14 @@ static const char *const pages[] =
nullptr
};
+const int touchActionDataSize = 4;
+
+static SetupActionData *const touchActionData[] =
+{
+ setupActionData0,
+ setupActionData2,
+ setupActionData5,
+ setupActionData6
+};
+
#endif
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
new file mode 100644
index 000000000..59f33b6a5
--- /dev/null
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -0,0 +1,119 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/setuptouchitem.h"
+
+#include "gui/widgets/dropdown.h"
+#include "gui/widgets/horizontcontainer.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/vertcontainer.h"
+
+#include "debug.h"
+
+SetupActionDropDown::SetupActionDropDown(std::string text,
+ std::string description,
+ std::string keyName,
+ SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width,
+ const bool mainConfig) :
+ SetupItem(text, description, keyName, parent, eventName, mainConfig),
+ mHorizont(nullptr),
+ mLabel(nullptr),
+ mModel(model),
+ mDropDown(nullptr),
+ mWidth(width)
+{
+ mValueType = VSTR;
+ createControls();
+}
+
+SetupActionDropDown::SetupActionDropDown(std::string text,
+ std::string description,
+ std::string keyName,
+ SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width,
+ std::string def,
+ const bool mainConfig) :
+ SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+ mHorizont(nullptr),
+ mLabel(nullptr),
+ mModel(model),
+ mDropDown(nullptr),
+ mWidth(width)
+{
+ mValueType = VSTR;
+ createControls();
+}
+
+SetupActionDropDown::~SetupActionDropDown()
+{
+ mHorizont = nullptr;
+ mWidget = nullptr;
+ mModel = nullptr;
+ mDropDown = nullptr;
+ mLabel = nullptr;
+}
+
+void SetupActionDropDown::createControls()
+{
+ load();
+ mHorizont = new HorizontContainer(this, 32, 2);
+
+ mLabel = new Label(this, mText);
+ mDropDown = new DropDown(this, mModel);
+ mDropDown->setActionEventId(mEventName);
+ mDropDown->addActionListener(mParent);
+ mDropDown->setWidth(mWidth);
+ mDropDown->setSelected(mModel->getSelectionFromAction(
+ atoi(mValue.c_str())));
+
+ mWidget = mDropDown;
+// mTextField->setWidth(50);
+ fixFirstItemSize(mLabel);
+ mHorizont->add(mLabel);
+ mHorizont->add(mDropDown);
+
+ mParent->getContainer()->add2(mHorizont, true, 4);
+ mParent->addControl(this);
+ mParent->addActionListener(this);
+ mWidget->addActionListener(this);
+}
+
+void SetupActionDropDown::fromWidget()
+{
+ if (!mDropDown)
+ return;
+
+ mValue = toString(mModel->getActionFromSelection(
+ mDropDown->getSelected()));
+}
+
+void SetupActionDropDown::toWidget()
+{
+ if (!mDropDown)
+ return;
+
+ mDropDown->setSelected(mModel->getSelectionFromAction(
+ atoi(mValue.c_str())));
+}
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
new file mode 100644
index 000000000..2f5cf7805
--- /dev/null
+++ b/src/gui/widgets/setuptouchitem.h
@@ -0,0 +1,109 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SETUPTOUCHITEM_H
+#define SETUPTOUCHITEM_H
+
+#include "gui/setupactiondata.h"
+
+#include "gui/widgets/namesmodel.h"
+#include "gui/widgets/setupitem.h"
+
+class TouchActionsModel final : public NamesModel
+{
+ public:
+ TouchActionsModel() :
+ NamesModel()
+ {
+ int cnt = 0;
+ for (int f = 0, sz = touchActionDataSize; f < sz; f ++)
+ {
+ int k = 0;
+ while (!touchActionData[f][k].name.empty())
+ {
+ const SetupActionData &data = touchActionData[f][k];
+ mNames.push_back(data.name);
+ mActionId.push_back(data.actionId);
+ mActionToSelection[data.actionId] = cnt;
+ k ++;
+ cnt ++;
+ }
+ }
+ }
+
+ virtual ~TouchActionsModel()
+ { }
+
+ int getActionFromSelection(int sel)
+ {
+ if (sel < 0 || sel > mActionId.size())
+ return -1;
+ return mActionId[sel];
+ }
+
+ int getSelectionFromAction(int action)
+ {
+ std::map<int, int>::const_iterator it
+ = mActionToSelection.find(action);
+ if (it == mActionToSelection.end())
+ return 0;
+ return (*it).second;
+ }
+
+ private:
+ std::vector<int> mActionId;
+ std::map<int, int> mActionToSelection;
+};
+
+class SetupActionDropDown final : public SetupItem
+{
+ public:
+ SetupActionDropDown(std::string text, std::string description,
+ std::string keyName, SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width, const bool mainConfig = true);
+
+ SetupActionDropDown(std::string text, std::string description,
+ std::string keyName, SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width, std::string def,
+ const bool mainConfig = true);
+
+ A_DELETE_COPY(SetupActionDropDown)
+
+ ~SetupActionDropDown();
+
+ void createControls();
+
+ void fromWidget() override;
+
+ void toWidget() override;
+
+ protected:
+ HorizontContainer *mHorizont;
+ Label *mLabel;
+ TouchActionsModel *mModel;
+ DropDown *mDropDown;
+ int mWidth;
+};
+
+#endif
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 9cf456143..0bbbeda10 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -594,12 +594,24 @@ bool InputManager::invokeKey(const KeyData *const key, const int keyNum)
if (checkKey(key))
{
InputEvent evt(keyNum, mMask);
- if ((*(keyData[keyNum].action))(evt))
+ ActionFuncPtr func = *(keyData[keyNum].action);
+ if (func && func(evt))
return true;
}
return false;
}
+void InputManager::executeAction(const int keyNum)
+{
+ if (keyNum < 0 || keyNum >= Input::KEY_TOTAL)
+ return;
+
+ InputEvent evt(keyNum, mMask);
+ ActionFuncPtr func = *(keyData[keyNum].action);
+ if (func)
+ func(evt);
+}
+
void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
KeyToIdMap &idMap,
KeyTimeMap &keyTimeMap,
diff --git a/src/inputmanager.h b/src/inputmanager.h
index 4f1733ae4..7f2e3dd3d 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -167,6 +167,8 @@ class InputManager final
int getActionByKey(const SDL_Event &event) const A_WARN_UNUSED;
+ void executeAction(const int keyNum);
+
protected:
Setup_Input *mSetupInput; /**< Reference to setup window */
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index d45e4a7c3..574836b6d 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -21,7 +21,9 @@
#include "touchactions.h"
#include "actionmanager.h"
+#include "configuration.h"
#include "game.h"
+#include "inputmanager.h"
#include "logger.h"
#include "mouseinput.h"
#include "touchmanager.h"
@@ -37,7 +39,9 @@ int haldJoyPad = 50;
impHandler0(showKeyboard)
{
- ActionManager::showKeyboard(tempEvent);
+ inputManager.executeAction(config.getIntValue("screenActionKeyboard"));
+
+// ActionManager::showKeyboard(tempEvent);
}
void setHalfJoyPad(int s)