Combine keyinput into one file.

13 files changed, 209 insertions, 508 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed80c00cb..3cc4c3dbc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -665,7 +665,6 @@ SET(SRCS
     input/keyboardconfig.h
     input/keyboarddata.h
     input/keydata.h
-    input/keyinput.cpp
     input/keyinput.h
     input/multitouchmanager.cpp
     input/multitouchmanager.h
@@ -779,7 +778,6 @@ SET(SRCS
     events/inputguievent.h
     gui/base/key.hpp
     events/keyevent.h
-    gui/base/keyinput.hpp
     listeners/keylistener.h
     gui/base/listmodel.hpp
     events/mouseevent.h
@@ -808,7 +806,6 @@ SET(SRCS
     gui/base/focushandler.cpp
     gui/base/gui.cpp
     gui/base/key.cpp
-    gui/base/keyinput.cpp
     gui/base/mouseinput.cpp
     gui/base/rectangle.cpp
     gui/base/widget.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 09579cc29..aa5314c52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,7 +165,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      events/inputguievent.h \
 	      gui/base/key.hpp \
 	      events/keyevent.h \
-	      gui/base/keyinput.hpp \
 	      listeners/keylistener.h \
 	      gui/base/listmodel.hpp \
 	      events/mouseevent.h \
@@ -194,7 +193,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/base/focushandler.cpp \
 	      gui/base/gui.cpp \
 	      gui/base/key.cpp \
-	      gui/base/keyinput.cpp \
 	      gui/base/mouseinput.cpp \
 	      gui/base/rectangle.cpp \
 	      gui/base/widget.cpp \
@@ -774,7 +772,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyboardconfig.h \
 	      input/keyboarddata.h \
 	      input/keydata.h \
-	      input/keyinput.cpp \
 	      input/keyinput.h \
 	      input/multitouchmanager.cpp \
 	      input/multitouchmanager.h \
diff --git a/src/gui/base/gui.cpp b/src/gui/base/gui.cpp
index e6fc79856..56e40291a 100644
--- a/src/gui/base/gui.cpp
+++ b/src/gui/base/gui.cpp
@@ -70,10 +70,11 @@
 #include "gui/base/basiccontainer.hpp"
 #include "gui/base/focushandler.hpp"
 #include "gui/base/input.hpp"
-#include "gui/base/keyinput.hpp"
 #include "gui/base/mouseinput.hpp"
 #include "gui/base/widget.hpp"
 
+#include "input/keyinput.h"
+
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
diff --git a/src/gui/base/input.hpp b/src/gui/base/input.hpp
index 71a15ce85..40aed4d84 100644
--- a/src/gui/base/input.hpp
+++ b/src/gui/base/input.hpp
@@ -66,9 +66,10 @@
 
 #include "localconsts.h"
 
+class KeyInput;
+
 namespace gcn
 {
-    class KeyInput;
     class MouseInput;
 
     /**
diff --git a/src/gui/base/keyinput.cpp b/src/gui/base/keyinput.cpp
deleted file mode 100644
index 8b7ff3c8a..000000000
--- a/src/gui/base/keyinput.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "gui/base/keyinput.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    KeyInput::KeyInput(const Key& key, unsigned int type) :
-             mKey(key),
-             mType(type),
-             mShiftPressed(false),
-             mControlPressed(false),
-             mAltPressed(false),
-             mMetaPressed(false),
-             mNumericPad(false)
-    {
-    }
-
-    void KeyInput::setType(unsigned int type)
-    {
-        mType = type;
-    }
-
-    int KeyInput::getType() const
-    {
-        return mType;
-    }
-
-    void KeyInput::setKey(const Key& key)
-    {
-        mKey = key;
-    }
-
-    const Key& KeyInput::getKey() const
-    {
-        return mKey;
-    }
-
-    bool KeyInput::isShiftPressed() const
-    {
-        return mShiftPressed;
-    }
-
-    void KeyInput::setShiftPressed(bool pressed)
-    {
-        mShiftPressed = pressed;
-    }
-
-    bool KeyInput::isControlPressed() const
-    {
-        return mControlPressed;
-    }
-
-    void KeyInput::setControlPressed(bool pressed)
-    {
-        mControlPressed = pressed;
-    }
-
-    bool KeyInput::isAltPressed() const
-    {
-        return mAltPressed;
-    }
-
-    void KeyInput::setAltPressed(bool pressed)
-    {
-        mAltPressed = pressed;
-    }
-
-    bool KeyInput::isMetaPressed() const
-    {
-        return mMetaPressed;
-    }
-
-    void KeyInput::setMetaPressed(bool pressed)
-    {
-        mMetaPressed = pressed;
-    }
-
-    bool KeyInput::isNumericPad() const
-    {
-        return mNumericPad;
-    }
-
-    void KeyInput::setNumericPad(bool numpad)
-    {
-        mNumericPad = numpad;
-    }
-}  // namespace gcn
diff --git a/src/gui/base/keyinput.hpp b/src/gui/base/keyinput.hpp
deleted file mode 100644
index 422d9046c..000000000
--- a/src/gui/base/keyinput.hpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  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/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_KEYINPUT_HPP
-#define GCN_KEYINPUT_HPP
-
-#include "gui/base/key.hpp"
-
-namespace gcn
-{
-    /**
-     * Internal class that represents key input. Generally you won't have to
-     * bother using this class unless you implement an Input class for
-     * a back end.
-     *
-     * @since 0.1.0
-     */
-    class KeyInput
-    {
-    public:
-        /**
-         * Constructor.
-         */
-        KeyInput() :
-            mKey(0),
-            mType(0),
-            mShiftPressed(false),
-            mControlPressed(false),
-            mAltPressed(false),
-            mMetaPressed(false),
-            mNumericPad(false)
-        { }
-
-        /**
-         * Constructor.
-         *
-         * @param key The key of the key input.
-         * @param type The type of key input.
-         */
-        KeyInput(const Key& key, unsigned int type);
-
-        /**
-         * Sets the type of the key input.
-         *
-         * @param type The type of key input.
-         * @see getType
-         */
-        void setType(unsigned int type);
-
-        /**
-         * Gets the type of the key input.
-         *
-         * @return the input type.
-         * @see setType
-         */
-        int getType() const A_WARN_UNUSED;
-
-        /**
-         * Sets the key of the key input.
-         *
-         * @param key The key of the key input.
-         * @see getKey
-         */
-        void setKey(const Key& key);
-
-        /**
-         * Gets the key of the key input.
-         *
-         * @return The key of the key input.
-         * @see setKey
-         */
-        const Key& getKey() const A_WARN_UNUSED;
-
-        /**
-         * Checks if shift is pressed.
-         *
-         * @return True if shift was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setShiftPressed
-         * @since 0.6.0
-         */
-        bool isShiftPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets shift to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if shift is pressed, false otherwise.
-         * @see isShiftPressed
-         * @since 0.6.0
-         */
-        void setShiftPressed(bool pressed);
-
-        /**
-         * Checks if control is pressed.
-         *
-         * @return True if control was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setControlPressed
-         * @since 0.6.0
-         */
-        bool isControlPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets control to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if control is pressed, false otherwise.
-         * @see isControlPressed
-         * @since 0.6.0
-         */
-        void setControlPressed(bool pressed);
-
-        /**
-         * Checks if alt is pressed.
-         *
-         * @return True if alt was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setAltPressed
-         * @since 0.6.0
-         */
-        bool isAltPressed() const;
-
-        /**
-         * Sets the alt to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if alt is pressed at the same 
-         *                time as the key, , false otherwise.
-         * @see isAltPressed
-         * @since 0.6.0
-         */
-        void setAltPressed(bool pressed);
-
-        /**
-         * Checks if meta is pressed.
-         *
-         * @return True if meta was pressed at the same 
-         *         time as the key, false otherwise.
-         * @see setMetaPressed
-         * @since 0.6.0
-         */
-        bool isMetaPressed() const A_WARN_UNUSED;
-
-        /**
-         * Sets meta to be pressed at the same time as the key, 
-         * or not. 
-         *
-         * @param pressed True if meta is pressed at the same
-         *                time as the key, false otherwise.
-         * @see isMetaPressed
-         * @since 0.6.0
-         */
-        void setMetaPressed(bool pressed);
-
-        /**
-         * Checks if the key was pressed at the numeric pad.
-         *
-         * @return True if key pressed at the numeric pad,
-         *         false otherwise.
-         * @setNumericPad
-         * @since 0.6.0
-         */
-        bool isNumericPad() const A_WARN_UNUSED;
-
-        /**
-         * Sets the key to be pressed at the numeric pad.
-         *
-         * @param numpad True if the key was pressed at the numeric
-         *               pad, false otherwise.
-         * @see isNumericPad
-         * @since 0.6.0
-         */
-        void setNumericPad(bool numpad);
-
-        /**
-         * Key input types. This enum corresponds to the enum with event
-         * types on KeyEvent for easy mapping.
-         */
-        enum
-        {
-            PRESSED = 0,
-            RELEASED
-        };
-
-    protected:
-        /**
-         * Holds the key of the key input.
-         */
-        Key mKey;
-
-        /**
-         * Holds the type of the key input.
-         */
-        unsigned int mType;
-
-        /**
-         * True if shift was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mShiftPressed;
-
-        /**
-         * True if control was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mControlPressed;
-
-        /**
-         * True if alt was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mAltPressed;
-
-        /**
-         * True if meta was pressed at the same time as the key,
-         * false otherwise.
-         */ 
-        bool mMetaPressed;
-
-        /**
-         * True if the numeric pad was used when the key was pressed,
-         * false otherwise.
-         */ 
-        bool mNumericPad;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_KEYINPUT_HPP
diff --git a/src/gui/base/widget.cpp b/src/gui/base/widget.cpp
index e0f33d498..cf3605446 100644
--- a/src/gui/base/widget.cpp
+++ b/src/gui/base/widget.cpp
@@ -69,12 +69,14 @@
 
 #include "events/actionevent.h"
 
-#include "gui/base/basiccontainer.hpp"
 #include "events/event.h"
+
+#include "gui/base/basiccontainer.hpp"
 #include "gui/base/focushandler.hpp"
-#include "gui/base/keyinput.hpp"
 #include "gui/base/mouseinput.hpp"
 
+#include "input/keyinput.h"
+
 #include "listeners/actionlistener.h"
 #include "listeners/deathlistener.h"
 #include "listeners/keylistener.h"
diff --git a/src/gui/base/widget.hpp b/src/gui/base/widget.hpp
index a459ab4f2..4043c959a 100644
--- a/src/gui/base/widget.hpp
+++ b/src/gui/base/widget.hpp
@@ -78,6 +78,7 @@ class DeathListener;
 class FocusListener;
 class Font;
 class Graphics;
+class KeyInput;
 class KeyListener;
 class MouseListener;
 class WidgetListener;
@@ -86,7 +87,6 @@ namespace gcn
 {
     class BasicContainer;
     class FocusHandler;
-    class KeyInput;
     class MouseInput;
 
     /**
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f549727a4..85aeb15f5 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -419,7 +419,7 @@ bool Gui::handleKeyInput2()
             // change focus.
             if (!keyEventConsumed && mTabbing && keyInput.getActionId()
                 == static_cast<int>(Input::KEY_GUI_TAB)
-                && keyInput.getType() == gcn::KeyInput::PRESSED)
+                && keyInput.getType() == KeyInput::PRESSED)
             {
                 if (keyInput.isShiftPressed())
                     mFocusHandler->tabPrevious();
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 661be07c5..b61f858e8 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -154,7 +154,7 @@ void SDLInput::pushInput(const SDL_Event &event)
     {
         case SDL_KEYDOWN:
         {
-            keyInput.setType(gcn::KeyInput::PRESSED);
+            keyInput.setType(KeyInput::PRESSED);
             convertKeyEventToKey(event, keyInput);
             mKeyInputQueue.push(keyInput);
             break;
@@ -162,7 +162,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 
         case SDL_KEYUP:
         {
-            keyInput.setType(gcn::KeyInput::RELEASED);
+            keyInput.setType(KeyInput::RELEASED);
             convertKeyEventToKey(event, keyInput);
             mKeyInputQueue.push(keyInput);
             break;
@@ -170,7 +170,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 
 #ifdef USE_SDL2
         case SDL_TEXTINPUT:
-            keyInput.setType(gcn::KeyInput::PRESSED);
+            keyInput.setType(KeyInput::PRESSED);
             keyInput.setKey(gcn::Key(Key::TEXTINPUT));
             keyInput.setText(event.text.text);
             mKeyInputQueue.push(keyInput);
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 345e939c5..73e2896d5 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -85,7 +85,6 @@
 #include <SDL_events.h>
 
 #include "gui/base/input.hpp"
-#include "gui/base/keyinput.hpp"
 #include "gui/base/mouseinput.hpp"
 
 #include <queue>
@@ -176,8 +175,8 @@ public:
 
     KeyInput dequeueKeyInput2() A_WARN_UNUSED;
 
-    gcn::KeyInput dequeueKeyInput() override final A_WARN_UNUSED
-    { return gcn::KeyInput(); }
+    KeyInput dequeueKeyInput() override final A_WARN_UNUSED
+    { return KeyInput(); }
 
     // Inherited from Input
 
diff --git a/src/input/keyinput.cpp b/src/input/keyinput.cpp
deleted file mode 100644
index d04305e0e..000000000
--- a/src/input/keyinput.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-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 "input/keyinput.h"
-
-#include "debug.h"
-
-KeyInput::KeyInput() :
-    gcn::KeyInput(),
-#ifdef USE_SDL2
-    mActionId(-2),
-    mText()
-#else
-    mActionId(-2)
-#endif
-{
-}
-
-KeyInput::~KeyInput()
-{
-}
diff --git a/src/input/keyinput.h b/src/input/keyinput.h
index d68c071f2..396d7c218 100644
--- a/src/input/keyinput.h
+++ b/src/input/keyinput.h
@@ -18,41 +18,226 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef INPUT_KEYINPUT_H
 #define INPUT_KEYINPUT_H
 
-#include "gui/base/keyinput.hpp"
+#include "gui/base/key.hpp"
 
 #include <string>
 
 #include "localconsts.h"
 
-class KeyInput final : public gcn::KeyInput
+class KeyInput final
 {
     public:
-        KeyInput();
+        KeyInput() :
+            mKey(0),
+            mType(0),
+#ifdef USE_SDL2
+            mText(),
+#endif
+            mActionId(-2),
+            mShiftPressed(false),
+            mControlPressed(false),
+            mAltPressed(false),
+            mMetaPressed(false),
+            mNumericPad(false)
+        { }
+
+        ~KeyInput()
+        { }
+
+        /**
+         * Key input types. This enum corresponds to the enum with event
+         * types on KeyEvent for easy mapping.
+         */
+        enum
+        {
+            PRESSED = 0,
+            RELEASED
+        };
+
+        void setType(unsigned int type)
+        {
+            mType = type;
+        }
+
+        int getType() const
+        {
+            return mType;
+        }
+
+        void setKey(const gcn::Key& key)
+        {
+            mKey = key;
+        }
+
+        const gcn::Key& getKey() const
+        {
+            return mKey;
+        }
+
+        bool isShiftPressed() const
+        {
+            return mShiftPressed;
+        }
+
+        void setShiftPressed(bool pressed)
+        {
+            mShiftPressed = pressed;
+        }
 
-        ~KeyInput();
+        bool isControlPressed() const
+        {
+            return mControlPressed;
+        }
+
+        void setControlPressed(bool pressed)
+        {
+            mControlPressed = pressed;
+        }
+
+        bool isAltPressed() const
+        {
+            return mAltPressed;
+        }
+
+        void setAltPressed(bool pressed)
+        {
+            mAltPressed = pressed;
+        }
+
+        bool isMetaPressed() const
+        {
+            return mMetaPressed;
+        }
+
+        void setMetaPressed(bool pressed)
+        {
+            mMetaPressed = pressed;
+        }
+
+        bool isNumericPad() const
+        {
+            return mNumericPad;
+        }
+
+        void setNumericPad(bool numpad)
+        {
+            mNumericPad = numpad;
+        }
 
         void setActionId(const int n)
-        { mActionId = n; }
+        {
+            mActionId = n;
+        }
 
         int getActionId() const A_WARN_UNUSED
-        { return mActionId; }
+        {
+            return mActionId;
+        }
 
 #ifdef USE_SDL2
         void setText(const std::string &text)
-        { mText = text; }
+        {
+            mText = text;
+        }
 
         std::string getText() const
-        { return mText; }
+        {
+            return mText;
+        }
 #endif
 
     protected:
-        int mActionId;
+        /**
+         * Holds the key of the key input.
+         */
+        gcn::Key mKey;
+
+        /**
+         * Holds the type of the key input.
+         */
+        unsigned int mType;
+
 #ifdef USE_SDL2
         std::string mText;
 #endif
+
+        int mActionId;
+
+        /**
+         * True if shift was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mShiftPressed;
+
+        /**
+         * True if control was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mControlPressed;
+
+        /**
+         * True if alt was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mAltPressed;
+
+        /**
+         * True if meta was pressed at the same time as the key,
+         * false otherwise.
+         */
+        bool mMetaPressed;
+
+        /**
+         * True if the numeric pad was used when the key was pressed,
+         * false otherwise.
+         */
+        bool mNumericPad;
 };
 
 #endif  // INPUT_KEYINPUT_H