summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-08 23:15:04 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-08 23:15:04 +0300
commit5bbad4bc6bb8a6de5e259ad56a77ac34784fdb77 (patch)
tree8c88308918a6d707640c5c314d80b40ac45e434d
parentf019a9e52d0a3f5ca23681d5eb36bb2e56d37064 (diff)
downloadplus-5bbad4bc6bb8a6de5e259ad56a77ac34784fdb77.tar.gz
plus-5bbad4bc6bb8a6de5e259ad56a77ac34784fdb77.tar.bz2
plus-5bbad4bc6bb8a6de5e259ad56a77ac34784fdb77.tar.xz
plus-5bbad4bc6bb8a6de5e259ad56a77ac34784fdb77.zip
Add open context menu action.
No key assigned. New chat command: contextmenu
-rw-r--r--src/actions/target.cpp14
-rw-r--r--src/actions/target.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h10
-rw-r--r--src/input/pages/basic.cpp6
5 files changed, 32 insertions, 0 deletions
diff --git a/src/actions/target.cpp b/src/actions/target.cpp
index 8212a3a97..e59c2922d 100644
--- a/src/actions/target.cpp
+++ b/src/actions/target.cpp
@@ -26,6 +26,8 @@
#include "being/localplayer.h"
+#include "gui/popups/popupmenu.h"
+
#include "debug.h"
namespace Actions
@@ -76,4 +78,16 @@ impHandler0(targetPet)
return setTarget(ActorType::Pet, true);
}
+impHandler0(contextMenu)
+{
+ if (!localPlayer)
+ return false;
+ Being *const target = localPlayer->getTarget();
+ if (!target)
+ return true;
+
+ popupMenu->showPopup(target->getPixelX(), target->getPixelY(), target);
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/target.h b/src/actions/target.h
index 50ac1e63e..1506660a6 100644
--- a/src/actions/target.h
+++ b/src/actions/target.h
@@ -33,6 +33,7 @@ namespace Actions
decHandler(targetNPC);
decHandler(targetMercenary);
decHandler(targetPet);
+ decHandler(contextMenu);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 7ab68911c..91c49ebc6 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -489,6 +489,7 @@ namespace InputAction
WINDOW_BANK,
PREV_INV_TAB,
NEXT_INV_TAB,
+ CONTEXT_MENU,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index afa66df87..585334713 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4143,6 +4143,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::NOINPUT | InputCondition::INGAME,
"nextinvtab",
false},
+ {"keyContextMenu",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::contextMenu,
+ InputAction::NO_VALUE, 50,
+ InputCondition::NOINPUT | InputCondition::NOAWAY
+ | InputCondition::NOMODAL | InputCondition::INGAME,
+ "contextmenu",
+ false},
};
#endif // INPUT_INPUTACTIONMAP_H
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index 13b3a770c..c4b0db2d3 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -236,6 +236,12 @@ SetupActionData setupActionDataBasic[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Open context menu"),
+ InputAction::CONTEXT_MENU,
+ "",
+ },
+ {
"",
InputAction::NO_VALUE,
""