Move key into input directory.

18 files changed, 125 insertions, 194 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a024966a3..0d1c5697a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -774,7 +774,7 @@ SET(SRCS
     listeners/focuslistener.h
     gui/base/gui.hpp
     events/inputguievent.h
-    gui/base/key.hpp
+    input/key.hpp
     events/keyevent.h
     listeners/keylistener.h
     gui/base/listmodel.hpp
@@ -802,7 +802,7 @@ SET(SRCS
     gui/base/color.cpp
     gui/base/focushandler.cpp
     gui/base/gui.cpp
-    gui/base/key.cpp
+    input/key.cpp
     gui/base/rectangle.cpp
     gui/base/widget.cpp
     gui/base/widgets/button.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 2476a6bff..ff2368ed0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,7 +162,7 @@ manaplus_SOURCES += events/actionevent.h \
 	      render/graphics.h \
 	      gui/base/gui.hpp \
 	      events/inputguievent.h \
-	      gui/base/key.hpp \
+	      input/key.hpp \
 	      events/keyevent.h \
 	      listeners/keylistener.h \
 	      gui/base/listmodel.hpp \
@@ -190,7 +190,7 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/base/color.cpp \
 	      gui/base/focushandler.cpp \
 	      gui/base/gui.cpp \
-	      gui/base/key.cpp \
+	      input/key.cpp \
 	      gui/base/rectangle.cpp \
 	      gui/base/widget.cpp \
 	      gui/base/widgets/button.cpp \
diff --git a/src/events/keyevent.h b/src/events/keyevent.h
index ec5b5489a..f27851f0e 100644
--- a/src/events/keyevent.h
+++ b/src/events/keyevent.h
@@ -65,7 +65,7 @@
 #define EVENTS_KEYEVENT_HPP
 
 #include "events/inputguievent.h"
-#include "gui/base/key.hpp"
+#include "input/key.h"
 
 namespace gcn
 {
@@ -108,7 +108,7 @@ class KeyEvent: public InputGuiEvent
                   const unsigned int type,
                   const bool numericPad,
                   const int actionId,
-                  const gcn::Key &key) :
+                  const Key &key) :
             InputGuiEvent(source,
                       shiftPressed,
                       controlPressed,
@@ -152,7 +152,7 @@ class KeyEvent: public InputGuiEvent
           *
           * @return The key of the event.
           */
-        const gcn::Key &getKey() const A_WARN_UNUSED
+        const Key &getKey() const A_WARN_UNUSED
         { return mKey; }
 
         int getActionId() const A_WARN_UNUSED
@@ -170,7 +170,7 @@ class KeyEvent: public InputGuiEvent
         /** 
           * Holds the key of the key event.
           */
-        gcn::Key mKey;
+        Key mKey;
 
 #ifdef USE_SDL2
         std::string mText;
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 56ba72590..5867b9dc8 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -69,8 +69,7 @@
 
 #include "gui/font.h"
 
-#include "gui/base/key.hpp"
-
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "events/mouseevent.h"
diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
index 18f635052..7cba5ac47 100644
--- a/src/gui/base/widgets/checkbox.cpp
+++ b/src/gui/base/widgets/checkbox.cpp
@@ -69,8 +69,7 @@
 
 #include "gui/font.h"
 
-#include "gui/base/key.hpp"
-
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index f13a96e39..ad1bf2535 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -70,9 +70,9 @@
 #include "gui/font.h"
 
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/key.hpp"
 #include "gui/base/listmodel.hpp"
 
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "listeners/selectionlistener.h"
diff --git a/src/gui/base/widgets/radiobutton.cpp b/src/gui/base/widgets/radiobutton.cpp
index ff6a39db0..4cd515bba 100644
--- a/src/gui/base/widgets/radiobutton.cpp
+++ b/src/gui/base/widgets/radiobutton.cpp
@@ -69,8 +69,7 @@
 
 #include "gui/font.h"
 
-#include "gui/base/key.hpp"
-
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/slider.cpp b/src/gui/base/widgets/slider.cpp
index d61f2766c..1245b6590 100644
--- a/src/gui/base/widgets/slider.cpp
+++ b/src/gui/base/widgets/slider.cpp
@@ -67,8 +67,7 @@
 
 #include "gui/base/widgets/slider.hpp"
 
-#include "gui/base/key.hpp"
-
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/textbox.cpp b/src/gui/base/widgets/textbox.cpp
index db5d91b92..292e35850 100644
--- a/src/gui/base/widgets/textbox.cpp
+++ b/src/gui/base/widgets/textbox.cpp
@@ -70,8 +70,8 @@
 #include "gui/font.h"
 
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/key.hpp"
 
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/textfield.cpp b/src/gui/base/widgets/textfield.cpp
index 891e7e86b..f149e8667 100644
--- a/src/gui/base/widgets/textfield.cpp
+++ b/src/gui/base/widgets/textfield.cpp
@@ -69,8 +69,7 @@
 
 #include "gui/font.h"
 
-#include "gui/base/key.hpp"
-
+#include "input/key.h"
 #include "input/mouseinput.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 33c15f5c7..d8a63b60c 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -171,7 +171,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 #ifdef USE_SDL2
         case SDL_TEXTINPUT:
             keyInput.setType(KeyInput::PRESSED);
-            keyInput.setKey(gcn::Key(Key::TEXTINPUT));
+            keyInput.setKey(Key(Key::TEXTINPUT));
             keyInput.setText(event.text.text);
             mKeyInputQueue.push(keyInput);
             break;
@@ -315,7 +315,7 @@ void SDLInput::pushInput(const SDL_Event &event)
 
 void SDLInput::convertKeyEventToKey(const SDL_Event &event, KeyInput &keyInput)
 {
-    keyInput.setKey(gcn::Key(convertKeyCharacter(event)));
+    keyInput.setKey(Key(convertKeyCharacter(event)));
     keyInput.setShiftPressed(event.key.keysym.mod & KMOD_SHIFT);
     keyInput.setControlPressed(event.key.keysym.mod & KMOD_CTRL);
     keyInput.setAltPressed(event.key.keysym.mod & KMOD_ALT);
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 3454f2d9f..8a9128920 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -87,61 +87,6 @@
 
 #include <queue>
 
-namespace Key
-{
-    enum
-    {
-        SPACE              = ' ',
-        TAB                = '\t',
-        ENTER              = '\n',
-        // Negative values, to avoid conflicts with higher character codes.
-        LEFT_ALT           = -1000,
-        RIGHT_ALT,
-        LEFT_SHIFT,
-        RIGHT_SHIFT,
-        LEFT_CONTROL,
-        RIGHT_CONTROL,
-        LEFT_META,
-        RIGHT_META,
-        LEFT_SUPER,
-        RIGHT_SUPER,
-        INSERT,
-        HOME,
-        PAGE_UP,
-        DELETE_,
-        END,
-        PAGE_DOWN,
-        ESCAPE,
-        CAPS_LOCK,
-        BACKSPACE,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-        F13,
-        F14,
-        F15,
-        PRINT_SCREEN,
-        SCROLL_LOCK,
-        PAUSE,
-        NUM_LOCK,
-        ALT_GR,
-        LEFT,
-        RIGHT,
-        UP,
-        DOWN,
-        TEXTINPUT
-    };
-}  // namespace Key
-
 /**
  * SDL implementation of SDLInput.
  */
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 5873ef4ce..f87ca2fe7 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -31,7 +31,8 @@
 #include "utils/dtor.h"
 
 #include "listeners/actionlistener.h"
-#include "gui/base/key.hpp"
+
+#include "input/key.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 5f74fa1f8..0ea05e585 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -168,7 +168,7 @@ void TextBox::setTextWrapped(const std::string &text, const int minDimension)
 
 void TextBox::keyPressed(KeyEvent& keyEvent)
 {
-    const gcn::Key &key = keyEvent.getKey();
+    const Key &key = keyEvent.getKey();
     const int action = keyEvent.getActionId();
 
     switch (action)
diff --git a/src/gui/base/key.cpp b/src/input/key.cpp
index 8cf21bdfe..13d2a301d 100644
--- a/src/gui/base/key.cpp
+++ b/src/input/key.cpp
@@ -65,49 +65,46 @@
  * For comments regarding functions please see the header file.
  */
 
-#include "gui/base/key.hpp"
+#include "input/key.h"
 
 #include "debug.h"
 
-namespace gcn
+Key::Key(const int value) :
+    mValue(value)
 {
-    Key::Key(const int value) :
-        mValue(value)
-    {
-    }
+}
 
-    bool Key::isCharacter() const
-    {
-        return (mValue >= 32 && mValue <= 126)
-            || (mValue >= 162 && mValue <= 255)
-            || (mValue == 9);
-    }
+bool Key::isCharacter() const
+{
+    return (mValue >= 32 && mValue <= 126)
+        || (mValue >= 162 && mValue <= 255)
+        || (mValue == 9);
+}
 
-    bool Key::isNumber() const
-    {
-        return mValue >= 48 && mValue <= 57;
-    }
+bool Key::isNumber() const
+{
+    return mValue >= 48 && mValue <= 57;
+}
 
-    bool Key::isLetter() const
-    {
-        return (((mValue >= 65 && mValue <= 90)
-                || (mValue >= 97 && mValue <= 122)
-                || (mValue >= 192 && mValue <= 255))
-                && (mValue != 215) && (mValue != 247));
-    }
+bool Key::isLetter() const
+{
+    return (((mValue >= 65 && mValue <= 90)
+            || (mValue >= 97 && mValue <= 122)
+            || (mValue >= 192 && mValue <= 255))
+            && (mValue != 215) && (mValue != 247));
+}
 
-    int Key::getValue() const
-    {
-        return mValue;
-    }
+int Key::getValue() const
+{
+    return mValue;
+}
 
-    bool Key::operator==(const Key& key) const
-    {
-        return mValue == key.mValue;
-    }
+bool Key::operator==(const Key& key) const
+{
+    return mValue == key.mValue;
+}
 
-    bool Key::operator!=(const Key& key) const
-    {
-        return (mValue != key.mValue);
-    }
-}  // namespace gcn
+bool Key::operator!=(const Key& key) const
+{
+    return (mValue != key.mValue);
+}
diff --git a/src/gui/base/key.hpp b/src/input/key.h
index 46b36a179..fa48d3583 100644
--- a/src/gui/base/key.hpp
+++ b/src/input/key.h
@@ -61,8 +61,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCN_KEY_HPP
-#define GCN_KEY_HPP
+#ifndef INPUT_KEY_H
+#define INPUT_KEY_H
 
 #include "localconsts.h"
 
@@ -73,78 +73,26 @@
 #undef DELETE
 #endif
 
-namespace gcn
+/**
+  * Represents a key or a character.
+  */
+class Key final
 {
-    /**
-     * Represents a key or a character.
-     */
-    class Key final
-    {
     public:
         /**
-         * Constructor.
-         *
-         * @param value The ascii or enum value for the key.
-         */
+          * Constructor.
+          *
+          * @param value The ascii or enum value for the key.
+          */
         explicit Key(const int value = 0);
 
-        /**
-         * Checks if a key is a character.
-         *
-         * @return True if the key is a letter, number or whitespace,
-         *         false otherwise.
-         */
-        bool isCharacter() const A_WARN_UNUSED;
-
-        /**
-         * Checks if a key is a number.
-         *
-         * @return True if the key is a number (0-9),
-         *         false otherwise.
-         */
-        bool isNumber() const A_WARN_UNUSED;
-
-        /**
-         * Checks if a key is a letter.
-         *
-         * @return True if the key is a letter (a-z,A-Z),
-         *         false otherwise.
-         */
-        bool isLetter() const A_WARN_UNUSED;
-
-        /**
-         * Gets the value of the key. If an ascii value exists it 
-         * will be returned. Otherwise an enum value will be returned.
-         *
-         * @return the value of the key.
-         */
-        int getValue() const A_WARN_UNUSED;
-
-        /**
-         * Compares two keys.
-         *
-         * @param key The key to compare this key with.
-         * @return True if the keys are equal, false otherwise.
-         */
-        bool operator==(const Key& key) const;
-
-        /**
-         * Compares two keys.
-         *
-         * @param key The key to compare this key with.
-         * @return True if the keys are not equal, false otherwise.
-         */
-        bool operator!=(const Key& key) const;
-
-        /**
-         * An enum with key values.
-         */
         enum
         {
             SPACE              = ' ',
             TAB                = '\t',
             ENTER              = '\n',
-            LEFT_ALT           = 1000,
+            // Negative values, to avoid conflicts with higher character codes.
+            LEFT_ALT           = -1000,
             RIGHT_ALT,
             LEFT_SHIFT,
             RIGHT_SHIFT,
@@ -157,7 +105,7 @@ namespace gcn
             INSERT,
             HOME,
             PAGE_UP,
-            DELETE,
+            DELETE_,
             END,
             PAGE_DOWN,
             ESCAPE,
@@ -186,16 +134,64 @@ namespace gcn
             LEFT,
             RIGHT,
             UP,
-            DOWN
+            DOWN,
+            TEXTINPUT
         };
 
+        /**
+          * Checks if a key is a character.
+          *
+          * @return True if the key is a letter, number or whitespace,
+          *         false otherwise.
+          */
+        bool isCharacter() const A_WARN_UNUSED;
+
+        /**
+          * Checks if a key is a number.
+          *
+          * @return True if the key is a number (0-9),
+          *         false otherwise.
+          */
+        bool isNumber() const A_WARN_UNUSED;
+
+        /**
+          * Checks if a key is a letter.
+          *
+          * @return True if the key is a letter (a-z,A-Z),
+          *         false otherwise.
+          */
+        bool isLetter() const A_WARN_UNUSED;
+
+        /**
+          * Gets the value of the key. If an ascii value exists it 
+          * will be returned. Otherwise an enum value will be returned.
+          *
+          * @return the value of the key.
+          */
+        int getValue() const A_WARN_UNUSED;
+
+        /**
+          * Compares two keys.
+          *
+          * @param key The key to compare this key with.
+          * @return True if the keys are equal, false otherwise.
+          */
+        bool operator==(const Key& key) const;
+
+        /**
+          * Compares two keys.
+          *
+          * @param key The key to compare this key with.
+          * @return True if the keys are not equal, false otherwise.
+          */
+        bool operator!=(const Key& key) const;
+
     protected:
         /**
-         * Holds the value of the key. It may be an ascii value
-         * or an enum value.
-         */
+          * Holds the value of the key. It may be an ascii value
+          * or an enum value.
+          */
         int mValue;
-    };
-}  // namespace gcn
+};
 
 #endif  // end GCN_KEY_HPP
diff --git a/src/input/keyinput.h b/src/input/keyinput.h
index 396d7c218..9920cfa17 100644
--- a/src/input/keyinput.h
+++ b/src/input/keyinput.h
@@ -64,7 +64,7 @@
 #ifndef INPUT_KEYINPUT_H
 #define INPUT_KEYINPUT_H
 
-#include "gui/base/key.hpp"
+#include "input/key.h"
 
 #include <string>
 
@@ -110,12 +110,12 @@ class KeyInput final
             return mType;
         }
 
-        void setKey(const gcn::Key& key)
+        void setKey(const Key& key)
         {
             mKey = key;
         }
 
-        const gcn::Key& getKey() const
+        const Key& getKey() const
         {
             return mKey;
         }
@@ -196,7 +196,7 @@ class KeyInput final
         /**
          * Holds the key of the key input.
          */
-        gcn::Key mKey;
+        Key mKey;
 
         /**
          * Holds the type of the key input.
diff --git a/src/listeners/keylistener.h b/src/listeners/keylistener.h
index 2d4a74b9e..0873de835 100644
--- a/src/listeners/keylistener.h
+++ b/src/listeners/keylistener.h
@@ -68,10 +68,7 @@
 
 #include "localconsts.h"
 
-namespace gcn
-{
-    class Key;
-}
+class Key;
 
 /**
   * Interface for listening for key events from widgets.