For commands in links in chat ask before executing command.

8 files changed, 140 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26fcd604c..506aac6b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1266,6 +1266,8 @@ SET(SRCS
     listeners/guiconfiglistener.h
     listeners/guitableactionlistener.cpp
     listeners/guitableactionlistener.h
+    listeners/inputactionremotelistener.cpp
+    listeners/inputactionremotelistener.h
     listeners/inputactionreplaylistener.cpp
     listeners/inputactionreplaylistener.h
     listeners/insertcardlistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index de034f9d4..05f201fb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1102,6 +1102,8 @@ manaplus_SOURCES += main.cpp \
 	      input/pages/windows.cpp \
 	      input/pages/windows.h \
 	      listeners/playerpostdeathlistener.h \
+	      listeners/inputactionremotelistener.cpp \
+	      listeners/inputactionremotelistener.h \
 	      listeners/inputactionreplaylistener.cpp \
 	      listeners/inputactionreplaylistener.h \
 	      listeners/insertcardlistener.h \
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index a8e90acd7..47314ca5c 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -42,6 +42,7 @@
 
 #include "resources/db/itemdb.h"
 
+#include "listeners/inputactionremotelistener.h"
 #include "listeners/openurllistener.h"
 
 #include "debug.h"
@@ -52,7 +53,8 @@ namespace
 }  // namespace
 
 ItemLinkHandler::ItemLinkHandler() :
-    LinkHandler()
+    LinkHandler(),
+    mAllowCommands(true)
 {
 }
 
@@ -72,7 +74,22 @@ void ItemLinkHandler::handleCommandLink(const std::string &link,
         cmd = cmdStr;
         args.clear();
     }
-    inputManager.executeRemoteChatCommand(cmd, args, nullptr);
+    if (mAllowCommands)
+    {
+        inputManager.executeRemoteChatCommand(cmd, args, nullptr);
+    }
+    else
+    {
+        inputActionRemoteListener.setCommand(cmd, args);
+        ConfirmDialog *const confirmDlg = CREATEWIDGETR(ConfirmDialog,
+            // TRANSLATORS: dialog message
+            _("Run command"),
+            strprintf("/%s %s", cmd.c_str(), args.c_str()),
+            SOUND_REQUEST,
+            false,
+            Modal_true);
+        confirmDlg->addActionListener(&inputActionRemoteListener);
+    }
 }
 
 void ItemLinkHandler::handleHelpLink(const std::string &link)
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 6350b9fc3..6a0f87cb7 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -39,9 +39,12 @@ class ItemLinkHandler final : public LinkHandler
         void handleLink(const std::string &link,
                         MouseEvent *event) override final;
 
+        void setAllowCommands(const bool b)
+        { mAllowCommands = b; }
+
     private:
-        static void handleCommandLink(const std::string &link,
-                                      const std::string &prefix);
+        void handleCommandLink(const std::string &link,
+                               const std::string &prefix);
 
         static void handleHelpLink(const std::string &link);
 
@@ -51,6 +54,8 @@ class ItemLinkHandler final : public LinkHandler
         static void handleItemLink(const std::string &link);
 
         static void handleSearchLink(const std::string &link);
+
+        bool mAllowCommands;
 };
 
 #endif  // GUI_WIDGETS_ITEMLINKHANDLER_H
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index b3a0ced78..5bed12f72 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -169,6 +169,8 @@ ChatWindow::ChatWindow() :
     mColorPicker->addActionListener(this);
     mColorPicker->setSelected(mChatColor);
 
+    mItemLinkHandler->setAllowCommands(false);
+
     loadWindowState();
 
     mColorPicker->setPosition(this->getWidth() - mColorPicker->getWidth()
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index 62636fc16..e08177ef4 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -77,12 +77,15 @@ void ConfirmDialog::postInit()
     if (width < inWidth)
         width = inWidth;
 
-    setContentSize(mTextBox->getMinWidth() + fontHeight, height + fontHeight +
-                   noButton->getHeight());
+    int windowWidth = width;
+    if (windowWidth < mTextBox->getMinWidth() + fontHeight)
+    {
+        windowWidth = mTextBox->getMinWidth() + fontHeight;
+    }
+    setContentSize(windowWidth,
+        height + fontHeight + noButton->getHeight());
     mTextBox->setPosition(mPadding, mPadding);
 
-    // 8 is the padding that GUIChan adds to button widgets
-    // (top and bottom combined)
     const int buttonPadding = getOption("buttonPadding", 8);
     yesButton->setPosition((width - inWidth) / 2, height + buttonPadding);
     noButton->setPosition(yesButton->getX() + yesButton->getWidth()
diff --git a/src/listeners/inputactionremotelistener.cpp b/src/listeners/inputactionremotelistener.cpp
new file mode 100644
index 000000000..66a9876f0
--- /dev/null
+++ b/src/listeners/inputactionremotelistener.cpp
@@ -0,0 +1,50 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2016  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 "listeners/inputactionremotelistener.h"
+
+#include "input/inputmanager.h"
+
+#include "debug.h"
+
+InputActionRemoteListener inputActionRemoteListener;
+
+InputActionRemoteListener::InputActionRemoteListener() :
+    ActionListener(),
+    mCommand(),
+    mArgs()
+{
+}
+
+void InputActionRemoteListener::action(const ActionEvent &event)
+{
+    if (event.getId() != "yes")
+    {
+        mCommand.clear();
+        mArgs.clear();
+        return;
+    }
+
+    inputManager.executeRemoteChatCommand(mCommand,
+        mArgs,
+        nullptr);
+    mCommand.clear();
+    mArgs.clear();
+}
diff --git a/src/listeners/inputactionremotelistener.h b/src/listeners/inputactionremotelistener.h
new file mode 100644
index 000000000..7fbaf76a7
--- /dev/null
+++ b/src/listeners/inputactionremotelistener.h
@@ -0,0 +1,51 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2016  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 LISTENERS_INPUTACTIONREMOTELISTENER_H
+#define LISTENERS_INPUTACTIONREMOTELISTENER_H
+
+#include "listeners/actionlistener.h"
+
+#include "localconsts.h"
+
+class InputActionRemoteListener final : public ActionListener
+{
+    public:
+        InputActionRemoteListener();
+
+        A_DELETE_COPY(InputActionRemoteListener)
+
+        void action(const ActionEvent &event) override final;
+
+        void setCommand(const std::string &command,
+                        const std::string &args)
+        {
+            mCommand = command;
+            mArgs = args;
+        }
+
+    protected:
+        std::string mCommand;
+        std::string mArgs;
+};
+
+extern InputActionRemoteListener inputActionRemoteListener;
+
+#endif  // LISTENERS_INPUTACTIONREMOTELISTENER_H