4 files changed, 117 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8d6895fe..633158470 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1118,6 +1118,8 @@ SET(SRCS
     listeners/statlistener.cpp
     listeners/statlistener.h
     listeners/tablemodellistener.h
+    listeners/tooltiplistener.cpp
+    listeners/tooltiplistener.h
     listeners/updatestatuslistener.cpp
     listeners/updatestatuslistener.h
     listeners/uploadlistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c531a909..33a488512 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,6 +213,8 @@ manaplus_SOURCES += events/actionevent.h \
 	      listeners/statlistener.cpp \
 	      listeners/statlistener.h \
 	      listeners/tablemodellistener.h \
+	      listeners/tooltiplistener.cpp \
+	      listeners/tooltiplistener.h \
 	      listeners/updatestatuslistener.cpp \
 	      listeners/updatestatuslistener.h \
 	      listeners/uploadlistener.cpp \
diff --git a/src/listeners/tooltiplistener.cpp b/src/listeners/tooltiplistener.cpp
new file mode 100644
index 000000000..09e387271
--- /dev/null
+++ b/src/listeners/tooltiplistener.cpp
@@ -0,0 +1,62 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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/tooltiplistener.h"
+
+#include "gui/gui.h"
+#include "gui/viewport.h"
+
+#include "gui/popups/textpopup.h"
+
+#include "debug.h"
+
+ToolTipListener::ToolTipListener() :
+    MouseListener()
+{
+}
+
+void ToolTipListener::mouseMoved(MouseEvent &event)
+{
+    if (mToolTip.empty())
+        return;
+
+    int x = 0;
+    int y = 0;
+    if (viewport)
+    {
+        x = viewport->mMouseX;
+        y = viewport->mMouseY;
+    }
+    else
+    {
+        Gui::getMouseState(&x, &y);
+    }
+
+    event.consume();
+    textPopup->show(x, y, mToolTip);
+}
+
+void ToolTipListener::mouseExited(MouseEvent &event)
+{
+    if (mToolTip.empty())
+        return;
+
+    textPopup->hide();
+}
diff --git a/src/listeners/tooltiplistener.h b/src/listeners/tooltiplistener.h
new file mode 100644
index 000000000..73705ea67
--- /dev/null
+++ b/src/listeners/tooltiplistener.h
@@ -0,0 +1,51 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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_TOOLTIPLISTENER_H
+#define LISTENERS_TOOLTIPLISTENER_H
+
+#include "listeners/mouselistener.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+class ToolTipListener notfinal : public MouseListener
+{
+    public:
+        ToolTipListener();
+
+        A_DELETE_COPY(ToolTipListener)
+
+        void setToolTip(const std::string &str)
+        { mToolTip = str; }
+
+        std::string getToolTip() const
+        { return mToolTip; }
+
+        void mouseMoved(MouseEvent &event) override final;
+
+        void mouseExited(MouseEvent &event) override final;
+
+    protected:
+        std::string mToolTip;
+};
+
+#endif  // LISTENERS_TOOLTIPLISTENER_H