Move enums from keyboardconfig.h to keydata.h.

9 files changed, 215 insertions, 215 deletions

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 223737a59..4040c3ce0 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -783,18 +783,18 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
         mCurHist = mHistory.end();
         mChatInput->setText("");
     }
-    else if (keyboard.isActionActive(keyboard.KEY_AUTOCOMPLETE_CHAT) &&
+    else if (keyboard.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) &&
              mChatInput->getText() != "")
     {
         autoComplete();
         return;
     }
-    else if (keyboard.isActionActive(keyboard.KEY_DEACTIVATE_CHAT) &&
+    else if (keyboard.isActionActive(Input::KEY_DEACTIVATE_CHAT) &&
              mChatInput->isVisible())
     {
         mChatInput->processVisible(false);
     }
-    else if (keyboard.isActionActive(keyboard.KEY_CHAT_PREV_HISTORY) &&
+    else if (keyboard.isActionActive(Input::KEY_CHAT_PREV_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
@@ -826,7 +826,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
                     mChatInput->getText().length()));
         }
     }
-    else if (keyboard.isActionActive(keyboard.KEY_CHAT_NEXT_HISTORY) &&
+    else if (keyboard.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) &&
              mChatInput->isVisible())
     {
         ChatTab *tab = getFocused();
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e21b07f44..54b1801b8 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -344,7 +344,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
         }
         else
         {
-            if (keyboard.isActionActive(keyboard.KEY_MOD))
+            if (keyboard.isActionActive(Input::KEY_MOD))
             {
                 Net::getInventoryHandler()->dropItem(
                     item, item->getQuantity());
@@ -390,10 +390,10 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     Window::mouseClicked(event);
 
     const bool mod = (isStorageActive() && keyboard.isActionActive(
-        keyboard.KEY_MOD));
+        Input::KEY_MOD));
 
     const bool mod2 = (tradeWindow && tradeWindow->isVisible()
-        && keyboard.isActionActive(keyboard.KEY_MOD));
+        && keyboard.isActionActive(Input::KEY_MOD));
 
     if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
     {
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 265932cbb..6168af665 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -506,7 +506,7 @@ std::string OutfitWindow::keyName(int number)
 {
     if (number < 0 || number >= SHORTCUT_EMOTES)
         return "";
-    return keyboard.getKeyStringLong(KeyboardConfig::KEY_EMOTE_1 + number);
+    return keyboard.getKeyStringLong(Input::KEY_EMOTE_1 + number);
 }
 
 void OutfitWindow::next()
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index d014ea11e..2d8c1c28d 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -51,663 +51,663 @@ static SetupActionData const setupActionData[] =
 {
     {
         N_("Basic Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Move Up"),
-        KeyboardConfig::KEY_MOVE_UP
+        Input::KEY_MOVE_UP
     },
     {
         N_("Move Down"),
-        KeyboardConfig::KEY_MOVE_DOWN
+        Input::KEY_MOVE_DOWN
     },
     {
         N_("Move Left"),
-        KeyboardConfig::KEY_MOVE_LEFT
+        Input::KEY_MOVE_LEFT
     },
     {
         N_("Move Right"),
-        KeyboardConfig::KEY_MOVE_RIGHT
+        Input::KEY_MOVE_RIGHT
     },
     {
         N_("Attack"),
-        KeyboardConfig::KEY_ATTACK
+        Input::KEY_ATTACK
     },
     {
         N_("Target & Attack"),
-        KeyboardConfig::KEY_TARGET_ATTACK
+        Input::KEY_TARGET_ATTACK
     },
     {
         N_("Move to Target"),
-        KeyboardConfig::KEY_MOVE_TO_TARGET
+        Input::KEY_MOVE_TO_TARGET
     },
     {
         N_("Change Move to Target type"),
-        KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET
+        Input::KEY_CHANGE_MOVE_TO_TARGET
     },
     {
         N_("Move to Home location"),
-        KeyboardConfig::KEY_MOVE_TO_HOME
+        Input::KEY_MOVE_TO_HOME
     },
     {
         N_("Set home location"),
-        KeyboardConfig::KEY_SET_HOME
+        Input::KEY_SET_HOME
     },
     {
         N_("Move to navigation point"),
-        KeyboardConfig::KEY_MOVE_TO_POINT
+        Input::KEY_MOVE_TO_POINT
     },
     {
         N_("Talk"),
-        KeyboardConfig::KEY_TALK
+        Input::KEY_TALK
     },
     {
         N_("Stop Attack"),
-        KeyboardConfig::KEY_TARGET
+        Input::KEY_TARGET
     },
     {
         N_("Untarget"),
-        KeyboardConfig::KEY_UNTARGET
+        Input::KEY_UNTARGET
     },
     {
         N_("Target Closest"),
-        KeyboardConfig::KEY_TARGET_CLOSEST
+        Input::KEY_TARGET_CLOSEST
     },
     {
         N_("Target NPC"),
-        KeyboardConfig::KEY_TARGET_NPC
+        Input::KEY_TARGET_NPC
     },
     {
         N_("Target Player"),
-        KeyboardConfig::KEY_TARGET_PLAYER
+        Input::KEY_TARGET_PLAYER
     },
     {
         N_("Pickup"),
-        KeyboardConfig::KEY_PICKUP
+        Input::KEY_PICKUP
     },
     {
         N_("Change Pickup Type"),
-        KeyboardConfig::KEY_CHANGE_PICKUP_TYPE
+        Input::KEY_CHANGE_PICKUP_TYPE
     },
     {
         N_("Hide Windows"),
-        KeyboardConfig::KEY_HIDE_WINDOWS
+        Input::KEY_HIDE_WINDOWS
     },
     {
         N_("Sit"),
-        KeyboardConfig::KEY_SIT
+        Input::KEY_SIT
     },
     {
         N_("Screenshot"),
-        KeyboardConfig::KEY_SCREENSHOT
+        Input::KEY_SCREENSHOT
     },
     {
         N_("Enable/Disable Trading"),
-        KeyboardConfig::KEY_TRADE
+        Input::KEY_TRADE
     },
     {
         N_("Change Map View Mode"),
-        KeyboardConfig::KEY_PATHFIND
+        Input::KEY_PATHFIND
     },
     {
         N_("Select OK"),
-        KeyboardConfig::KEY_OK
+        Input::KEY_OK
     },
     {
         N_("Quit"),
-        KeyboardConfig::KEY_QUIT
+        Input::KEY_QUIT
     },
     {
         N_("Shortcuts Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Item Shortcuts Key"),
-        KeyboardConfig::KEY_SHORTCUTS_KEY
+        Input::KEY_SHORTCUTS_KEY
     },
     {
         strprintf(N_("Item Shortcut %d"), 1),
-        KeyboardConfig::KEY_SHORTCUT_1
+        Input::KEY_SHORTCUT_1
     },
     {
         strprintf(N_("Item Shortcut %d"), 2),
-        KeyboardConfig::KEY_SHORTCUT_2
+        Input::KEY_SHORTCUT_2
     },
     {
         strprintf(N_("Item Shortcut %d"), 3),
-        KeyboardConfig::KEY_SHORTCUT_3
+        Input::KEY_SHORTCUT_3
     },
     {
         strprintf(N_("Item Shortcut %d"), 4),
-        KeyboardConfig::KEY_SHORTCUT_4
+        Input::KEY_SHORTCUT_4
     },
     {
         strprintf(N_("Item Shortcut %d"), 5),
-        KeyboardConfig::KEY_SHORTCUT_5
+        Input::KEY_SHORTCUT_5
     },
     {
         strprintf(N_("Item Shortcut %d"), 6),
-        KeyboardConfig::KEY_SHORTCUT_6
+        Input::KEY_SHORTCUT_6
     },
     {
         strprintf(N_("Item Shortcut %d"), 7),
-        KeyboardConfig::KEY_SHORTCUT_7
+        Input::KEY_SHORTCUT_7
     },
     {
         strprintf(N_("Item Shortcut %d"), 8),
-        KeyboardConfig::KEY_SHORTCUT_8
+        Input::KEY_SHORTCUT_8
     },
     {
         strprintf(N_("Item Shortcut %d"), 9),
-        KeyboardConfig::KEY_SHORTCUT_9
+        Input::KEY_SHORTCUT_9
     },
     {
         strprintf(N_("Item Shortcut %d"), 10),
-        KeyboardConfig::KEY_SHORTCUT_10
+        Input::KEY_SHORTCUT_10
     },
     {
         strprintf(N_("Item Shortcut %d"), 11),
-        KeyboardConfig::KEY_SHORTCUT_11
+        Input::KEY_SHORTCUT_11
     },
     {
         strprintf(N_("Item Shortcut %d"), 12),
-        KeyboardConfig::KEY_SHORTCUT_12
+        Input::KEY_SHORTCUT_12
     },
     {
         strprintf(N_("Item Shortcut %d"), 13),
-        KeyboardConfig::KEY_SHORTCUT_13
+        Input::KEY_SHORTCUT_13
     },
     {
         strprintf(N_("Item Shortcut %d"), 14),
-        KeyboardConfig::KEY_SHORTCUT_14
+        Input::KEY_SHORTCUT_14
     },
     {
         strprintf(N_("Item Shortcut %d"), 15),
-        KeyboardConfig::KEY_SHORTCUT_15
+        Input::KEY_SHORTCUT_15
     },
     {
         strprintf(N_("Item Shortcut %d"), 16),
-        KeyboardConfig::KEY_SHORTCUT_16
+        Input::KEY_SHORTCUT_16
     },
     {
         strprintf(N_("Item Shortcut %d"), 17),
-        KeyboardConfig::KEY_SHORTCUT_17
+        Input::KEY_SHORTCUT_17
     },
     {
         strprintf(N_("Item Shortcut %d"), 18),
-        KeyboardConfig::KEY_SHORTCUT_18
+        Input::KEY_SHORTCUT_18
     },
     {
         strprintf(N_("Item Shortcut %d"), 19),
-        KeyboardConfig::KEY_SHORTCUT_19
+        Input::KEY_SHORTCUT_19
     },
     {
         strprintf(N_("Item Shortcut %d"), 20),
-        KeyboardConfig::KEY_SHORTCUT_20
+        Input::KEY_SHORTCUT_20
     },
     {
         N_("Windows Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Help Window"),
-        KeyboardConfig::KEY_WINDOW_HELP
+        Input::KEY_WINDOW_HELP
     },
     {
         N_("Status Window"),
-        KeyboardConfig::KEY_WINDOW_STATUS
+        Input::KEY_WINDOW_STATUS
     },
     {
         N_("Inventory Window"),
-        KeyboardConfig::KEY_WINDOW_INVENTORY
+        Input::KEY_WINDOW_INVENTORY
     },
     {
         N_("Equipment Window"),
-        KeyboardConfig::KEY_WINDOW_EQUIPMENT
+        Input::KEY_WINDOW_EQUIPMENT
     },
     {
         N_("Skill Window"),
-        KeyboardConfig::KEY_WINDOW_SKILL
+        Input::KEY_WINDOW_SKILL
     },
     {
         N_("Minimap Window"),
-        KeyboardConfig::KEY_WINDOW_MINIMAP
+        Input::KEY_WINDOW_MINIMAP
     },
     {
         N_("Chat Window"),
-        KeyboardConfig::KEY_WINDOW_CHAT
+        Input::KEY_WINDOW_CHAT
     },
     {
         N_("Item Shortcut Window"),
-        KeyboardConfig::KEY_WINDOW_SHORTCUT
+        Input::KEY_WINDOW_SHORTCUT
     },
     {
         N_("Setup Window"),
-        KeyboardConfig::KEY_WINDOW_SETUP
+        Input::KEY_WINDOW_SETUP
     },
     {
         N_("Debug Window"),
-        KeyboardConfig::KEY_WINDOW_DEBUG
+        Input::KEY_WINDOW_DEBUG
     },
     {
         N_("Social Window"),
-        KeyboardConfig::KEY_WINDOW_SOCIAL
+        Input::KEY_WINDOW_SOCIAL
     },
     {
         N_("Emote Shortcut Window"),
-        KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT
+        Input::KEY_WINDOW_EMOTE_SHORTCUT
     },
     {
         N_("Outfits Window"),
-        KeyboardConfig::KEY_WINDOW_OUTFIT
+        Input::KEY_WINDOW_OUTFIT
     },
     {
         N_("Shop Window"),
-        KeyboardConfig::KEY_WINDOW_SHOP
+        Input::KEY_WINDOW_SHOP
     },
     {
         N_("Quick drop Window"),
-        KeyboardConfig::KEY_WINDOW_DROP
+        Input::KEY_WINDOW_DROP
     },
     {
         N_("Kill Stats Window"),
-        KeyboardConfig::KEY_WINDOW_KILLS
+        Input::KEY_WINDOW_KILLS
     },
     {
         N_("Commands Window"),
-        KeyboardConfig::KEY_WINDOW_SPELLS
+        Input::KEY_WINDOW_SPELLS
     },
     {
         N_("Bot Checker Window"),
-        KeyboardConfig::KEY_WINDOW_BOT_CHECKER
+        Input::KEY_WINDOW_BOT_CHECKER
     },
     {
         N_("Who Is Online Window"),
-        KeyboardConfig::KEY_WINDOW_ONLINE
+        Input::KEY_WINDOW_ONLINE
     },
     {
         N_("Did you know Window"),
-        KeyboardConfig::KEY_WINDOW_DIDYOUKNOW
+        Input::KEY_WINDOW_DIDYOUKNOW
     },
     {
         N_("Previous Social Tab"),
-        KeyboardConfig::KEY_PREV_SOCIAL_TAB
+        Input::KEY_PREV_SOCIAL_TAB
     },
     {
         N_("Next Social Tab"),
-        KeyboardConfig::KEY_NEXT_SOCIAL_TAB
+        Input::KEY_NEXT_SOCIAL_TAB
     },
     {
         N_("Emotes Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Smilie"),
-        KeyboardConfig::KEY_EMOTE
+        Input::KEY_EMOTE
     },
     {
         strprintf(N_("Emote Shortcut %d"), 1),
-        KeyboardConfig::KEY_EMOTE_1
+        Input::KEY_EMOTE_1
     },
     {
         strprintf(N_("Emote Shortcut %d"), 2),
-        KeyboardConfig::KEY_EMOTE_2
+        Input::KEY_EMOTE_2
     },
     {
         strprintf(N_("Emote Shortcut %d"), 3),
-        KeyboardConfig::KEY_EMOTE_3
+        Input::KEY_EMOTE_3
     },
     {
         strprintf(N_("Emote Shortcut %d"), 4),
-        KeyboardConfig::KEY_EMOTE_4
+        Input::KEY_EMOTE_4
     },
     {
         strprintf(N_("Emote Shortcut %d"), 5),
-        KeyboardConfig::KEY_EMOTE_5
+        Input::KEY_EMOTE_5
     },
     {
         strprintf(N_("Emote Shortcut %d"), 6),
-        KeyboardConfig::KEY_EMOTE_6
+        Input::KEY_EMOTE_6
     },
     {
         strprintf(N_("Emote Shortcut %d"), 7),
-        KeyboardConfig::KEY_EMOTE_7
+        Input::KEY_EMOTE_7
     },
     {
         strprintf(N_("Emote Shortcut %d"), 8),
-        KeyboardConfig::KEY_EMOTE_8
+        Input::KEY_EMOTE_8
     },
     {
         strprintf(N_("Emote Shortcut %d"), 9),
-        KeyboardConfig::KEY_EMOTE_9
+        Input::KEY_EMOTE_9
     },
     {
         strprintf(N_("Emote Shortcut %d"), 10),
-        KeyboardConfig::KEY_EMOTE_10
+        Input::KEY_EMOTE_10
     },
     {
         strprintf(N_("Emote Shortcut %d"), 11),
-        KeyboardConfig::KEY_EMOTE_11
+        Input::KEY_EMOTE_11
     },
     {
         strprintf(N_("Emote Shortcut %d"), 12),
-        KeyboardConfig::KEY_EMOTE_12
+        Input::KEY_EMOTE_12
     },
     {
         strprintf(N_("Emote Shortcut %d"), 13),
-        KeyboardConfig::KEY_EMOTE_13
+        Input::KEY_EMOTE_13
     },
     {
         strprintf(N_("Emote Shortcut %d"), 14),
-        KeyboardConfig::KEY_EMOTE_14
+        Input::KEY_EMOTE_14
     },
     {
         strprintf(N_("Emote Shortcut %d"), 15),
-        KeyboardConfig::KEY_EMOTE_15
+        Input::KEY_EMOTE_15
     },
     {
         strprintf(N_("Emote Shortcut %d"), 16),
-        KeyboardConfig::KEY_EMOTE_16
+        Input::KEY_EMOTE_16
     },
     {
         strprintf(N_("Emote Shortcut %d"), 17),
-        KeyboardConfig::KEY_EMOTE_17
+        Input::KEY_EMOTE_17
     },
     {
         strprintf(N_("Emote Shortcut %d"), 18),
-        KeyboardConfig::KEY_EMOTE_18
+        Input::KEY_EMOTE_18
     },
     {
         strprintf(N_("Emote Shortcut %d"), 19),
-        KeyboardConfig::KEY_EMOTE_19
+        Input::KEY_EMOTE_19
     },
     {
         strprintf(N_("Emote Shortcut %d"), 20),
-        KeyboardConfig::KEY_EMOTE_20
+        Input::KEY_EMOTE_20
     },
     {
         strprintf(N_("Emote Shortcut %d"), 21),
-        KeyboardConfig::KEY_EMOTE_21
+        Input::KEY_EMOTE_21
     },
     {
         strprintf(N_("Emote Shortcut %d"), 22),
-        KeyboardConfig::KEY_EMOTE_22
+        Input::KEY_EMOTE_22
     },
     {
         strprintf(N_("Emote Shortcut %d"), 23),
-        KeyboardConfig::KEY_EMOTE_23
+        Input::KEY_EMOTE_23
     },
     {
         strprintf(N_("Emote Shortcut %d"), 24),
-        KeyboardConfig::KEY_EMOTE_24
+        Input::KEY_EMOTE_24
     },
     {
         strprintf(N_("Emote Shortcut %d"), 25),
-        KeyboardConfig::KEY_EMOTE_25
+        Input::KEY_EMOTE_25
     },
     {
         strprintf(N_("Emote Shortcut %d"), 26),
-        KeyboardConfig::KEY_EMOTE_26
+        Input::KEY_EMOTE_26
     },
     {
         strprintf(N_("Emote Shortcut %d"), 27),
-        KeyboardConfig::KEY_EMOTE_27
+        Input::KEY_EMOTE_27
     },
     {
         strprintf(N_("Emote Shortcut %d"), 28),
-        KeyboardConfig::KEY_EMOTE_28
+        Input::KEY_EMOTE_28
     },
     {
         strprintf(N_("Emote Shortcut %d"), 29),
-        KeyboardConfig::KEY_EMOTE_29
+        Input::KEY_EMOTE_29
     },
     {
         strprintf(N_("Emote Shortcut %d"), 30),
-        KeyboardConfig::KEY_EMOTE_30
+        Input::KEY_EMOTE_30
     },
     {
         strprintf(N_("Emote Shortcut %d"), 31),
-        KeyboardConfig::KEY_EMOTE_31
+        Input::KEY_EMOTE_31
     },
     {
         strprintf(N_("Emote Shortcut %d"), 32),
-        KeyboardConfig::KEY_EMOTE_32
+        Input::KEY_EMOTE_32
     },
     {
         strprintf(N_("Emote Shortcut %d"), 33),
-        KeyboardConfig::KEY_EMOTE_33
+        Input::KEY_EMOTE_33
     },
     {
         strprintf(N_("Emote Shortcut %d"), 34),
-        KeyboardConfig::KEY_EMOTE_34
+        Input::KEY_EMOTE_34
     },
     {
         strprintf(N_("Emote Shortcut %d"), 35),
-        KeyboardConfig::KEY_EMOTE_35
+        Input::KEY_EMOTE_35
     },
     {
         strprintf(N_("Emote Shortcut %d"), 36),
-        KeyboardConfig::KEY_EMOTE_36
+        Input::KEY_EMOTE_36
     },
     {
         strprintf(N_("Emote Shortcut %d"), 37),
-        KeyboardConfig::KEY_EMOTE_37
+        Input::KEY_EMOTE_37
     },
     {
         strprintf(N_("Emote Shortcut %d"), 38),
-        KeyboardConfig::KEY_EMOTE_38
+        Input::KEY_EMOTE_38
     },
     {
         strprintf(N_("Emote Shortcut %d"), 39),
-        KeyboardConfig::KEY_EMOTE_39
+        Input::KEY_EMOTE_39
     },
     {
         strprintf(N_("Emote Shortcut %d"), 40),
-        KeyboardConfig::KEY_EMOTE_40
+        Input::KEY_EMOTE_40
     },
     {
         strprintf(N_("Emote Shortcut %d"), 41),
-        KeyboardConfig::KEY_EMOTE_41
+        Input::KEY_EMOTE_41
     },
     {
         strprintf(N_("Emote Shortcut %d"), 42),
-        KeyboardConfig::KEY_EMOTE_42
+        Input::KEY_EMOTE_42
     },
     {
         strprintf(N_("Emote Shortcut %d"), 43),
-        KeyboardConfig::KEY_EMOTE_43
+        Input::KEY_EMOTE_43
     },
     {
         strprintf(N_("Emote Shortcut %d"), 44),
-        KeyboardConfig::KEY_EMOTE_44
+        Input::KEY_EMOTE_44
     },
     {
         strprintf(N_("Emote Shortcut %d"), 45),
-        KeyboardConfig::KEY_EMOTE_45
+        Input::KEY_EMOTE_45
     },
     {
         strprintf(N_("Emote Shortcut %d"), 46),
-        KeyboardConfig::KEY_EMOTE_46
+        Input::KEY_EMOTE_46
     },
     {
         strprintf(N_("Emote Shortcut %d"), 47),
-        KeyboardConfig::KEY_EMOTE_47
+        Input::KEY_EMOTE_47
     },
     {
         strprintf(N_("Emote Shortcut %d"), 48),
-        KeyboardConfig::KEY_EMOTE_48
+        Input::KEY_EMOTE_48
     },
     {
         N_("Outfits Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Wear Outfit"),
-        KeyboardConfig::KEY_WEAR_OUTFIT
+        Input::KEY_WEAR_OUTFIT
     },
     {
         N_("Copy Outfit"),
-        KeyboardConfig::KEY_COPY_OUTFIT
+        Input::KEY_COPY_OUTFIT
     },
     {
         N_("Copy equipped to Outfit"),
-        KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT
+        Input::KEY_COPY_EQUIPED_OUTFIT
     },
     {
         N_("Chat Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Toggle Chat"),
-        KeyboardConfig::KEY_TOGGLE_CHAT
+        Input::KEY_TOGGLE_CHAT
     },
     {
         N_("Scroll Chat Up"),
-        KeyboardConfig::KEY_SCROLL_CHAT_UP
+        Input::KEY_SCROLL_CHAT_UP
     },
     {
         N_("Scroll Chat Down"),
-        KeyboardConfig::KEY_SCROLL_CHAT_DOWN
+        Input::KEY_SCROLL_CHAT_DOWN
     },
     {
         N_("Previous Chat Tab"),
-        KeyboardConfig::KEY_PREV_CHAT_TAB
+        Input::KEY_PREV_CHAT_TAB
     },
     {
         N_("Next Chat Tab"),
-        KeyboardConfig::KEY_NEXT_CHAT_TAB
+        Input::KEY_NEXT_CHAT_TAB
     },
     {
         N_("Close current Chat Tab"),
-        KeyboardConfig::KEY_CLOSE_CHAT_TAB
+        Input::KEY_CLOSE_CHAT_TAB
     },
     {
         N_("Previous chat line"),
-        KeyboardConfig::KEY_CHAT_PREV_HISTORY
+        Input::KEY_CHAT_PREV_HISTORY
     },
     {
         N_("Next chat line"),
-        KeyboardConfig::KEY_CHAT_NEXT_HISTORY
+        Input::KEY_CHAT_NEXT_HISTORY
     },
     {
         N_("Chat Auto Complete"),
-        KeyboardConfig::KEY_AUTOCOMPLETE_CHAT
+        Input::KEY_AUTOCOMPLETE_CHAT
     },
     {
         N_("Deactivate Chat Input"),
-        KeyboardConfig::KEY_DEACTIVATE_CHAT
+        Input::KEY_DEACTIVATE_CHAT
     },
     {
         N_("Other Keys"),
-        KeyboardConfig::KEY_NO_VALUE
+        Input::KEY_NO_VALUE
     },
     {
         N_("Ignore input 1"),
-        KeyboardConfig::KEY_IGNORE_INPUT_1
+        Input::KEY_IGNORE_INPUT_1
     },
     {
         N_("Ignore input 2"),
-        KeyboardConfig::KEY_IGNORE_INPUT_2
+        Input::KEY_IGNORE_INPUT_2
     },
     {
         N_("Direct Up"),
-        KeyboardConfig::KEY_DIRECT_UP
+        Input::KEY_DIRECT_UP
     },
     {
         N_("Direct Down"),
-        KeyboardConfig::KEY_DIRECT_DOWN
+        Input::KEY_DIRECT_DOWN
     },
     {
         N_("Direct Left"),
-        KeyboardConfig::KEY_DIRECT_LEFT
+        Input::KEY_DIRECT_LEFT
     },
     {
         N_("Direct Right"),
-        KeyboardConfig::KEY_DIRECT_RIGHT
+        Input::KEY_DIRECT_RIGHT
     },
     {
         N_("Crazy moves"),
-        KeyboardConfig::KEY_CRAZY_MOVES
+        Input::KEY_CRAZY_MOVES
     },
     {
         N_("Change Crazy Move mode"),
-        KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE
+        Input::KEY_CHANGE_CRAZY_MOVES_TYPE
     },
     {
         N_("Quick Drop N Items from 0 slot"),
-        KeyboardConfig::KEY_QUICK_DROP
+        Input::KEY_QUICK_DROP
     },
     {
         N_("Quick Drop N Items"),
-        KeyboardConfig::KEY_QUICK_DROPN
+        Input::KEY_QUICK_DROPN
     },
     {
         N_("Switch Quick Drop Counter"),
-        KeyboardConfig::KEY_SWITCH_QUICK_DROP
+        Input::KEY_SWITCH_QUICK_DROP
     },
     {
         N_("Quick heal target or self"),
-        KeyboardConfig::KEY_MAGIC_INMA1
+        Input::KEY_MAGIC_INMA1
     },
     {
         N_("Use #itenplz spell"),
-        KeyboardConfig::KEY_MAGIC_ITENPLZ
+        Input::KEY_MAGIC_ITENPLZ
     },
     {
         N_("Use magic attack"),
-        KeyboardConfig::KEY_MAGIC_ATTACK
+        Input::KEY_MAGIC_ATTACK
     },
     {
         N_("Switch magic attack"),
-        KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK
+        Input::KEY_SWITCH_MAGIC_ATTACK
     },
     {
         N_("Switch pvp attack"),
-        KeyboardConfig::KEY_SWITCH_PVP_ATTACK
+        Input::KEY_SWITCH_PVP_ATTACK
     },
     {
         N_("Change move type"),
-        KeyboardConfig::KEY_INVERT_DIRECTION
+        Input::KEY_INVERT_DIRECTION
     },
     {
         N_("Change Attack Weapon Type"),
-        KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE
+        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE
     },
     {
         N_("Change Attack Type"),
-        KeyboardConfig::KEY_CHANGE_ATTACK_TYPE
+        Input::KEY_CHANGE_ATTACK_TYPE
     },
     {
         N_("Change Follow mode"),
-        KeyboardConfig::KEY_CHANGE_FOLLOW_MODE
+        Input::KEY_CHANGE_FOLLOW_MODE
     },
     {
         N_("Change Imitation mode"),
-        KeyboardConfig::KEY_CHANGE_IMITATION_MODE
+        Input::KEY_CHANGE_IMITATION_MODE
     },
     {
         N_("Disable / Enable Game modifier keys"),
-        KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS
+        Input::KEY_DISABLE_GAME_MODIFIERS
     },
     {
         N_("On / Off audio"),
-        KeyboardConfig::KEY_CHANGE_AUDIO
+        Input::KEY_CHANGE_AUDIO
     },
     {
         N_("Enable / Disable away mode"),
-        KeyboardConfig::KEY_AWAY
+        Input::KEY_AWAY
     },
     {
         N_("Emulate right click from keyboard"),
-        KeyboardConfig::KEY_RIGHT_CLICK
+        Input::KEY_RIGHT_CLICK
     },
     {
         N_("Toggle camera mode"),
-        KeyboardConfig::KEY_CAMERA
+        Input::KEY_CAMERA
     },
     {
         N_("Modifier key"),
-        KeyboardConfig::KEY_MOD
+        Input::KEY_MOD
     }
 };
 
@@ -835,7 +835,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
             if (i >= 0 && i < keysSize)
             {
                 if (setupActionData[i].actionId
-                    == KeyboardConfig::KEY_NO_VALUE)
+                    == Input::KEY_NO_VALUE)
                 {
                     mAssignKeyButton->setEnabled(false);
                     mUnassignKeyButton->setEnabled(false);
@@ -886,7 +886,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
 void Setup_Keyboard::refreshAssignedKey(int index)
 {
     const SetupActionData &key = setupActionData[index];
-    if (key.actionId == KeyboardConfig::KEY_NO_VALUE)
+    if (key.actionId == Input::KEY_NO_VALUE)
     {
         const std::string str = " \342\200\225\342\200\225\342\200\225"
             "\342\200\225\342\200\225 ";
@@ -932,6 +932,6 @@ void Setup_Keyboard::keyUnresolved()
     if (mKeySetting)
     {
         newKeyCallback(keyboard.getNewKeyIndex());
-        keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+        keyboard.setNewKeyIndex(Input::KEY_NO_VALUE);
     }
 }
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 2d9cc69b6..420ffaf3d 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -204,33 +204,33 @@ void StatusPopup::updateLabels()
         return;
 
     setLabelText2(mMoveType, player_node->getInvertDirectionString(),
-        keyboard.KEY_INVERT_DIRECTION);
+        Input::KEY_INVERT_DIRECTION);
     setLabelText2(mCrazyMoveType, player_node->getCrazyMoveTypeString(),
-        keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE);
+        Input::KEY_CHANGE_CRAZY_MOVES_TYPE);
     setLabelText2(mMoveToTargetType, player_node->getMoveToTargetTypeString(),
-        keyboard.KEY_CHANGE_MOVE_TO_TARGET);
+        Input::KEY_CHANGE_MOVE_TO_TARGET);
     setLabelText2(mFollowMode, player_node->getFollowModeString(),
-        keyboard.KEY_CHANGE_FOLLOW_MODE);
+        Input::KEY_CHANGE_FOLLOW_MODE);
     setLabelText2(mAttackWeaponType, player_node->getAttackWeaponTypeString(),
-        keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
+        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE);
     setLabelText2(mAttackType, player_node->getAttackTypeString(),
-        keyboard.KEY_CHANGE_ATTACK_TYPE);
+        Input::KEY_CHANGE_ATTACK_TYPE);
     setLabelText2(mDropCounter, player_node->getQuickDropCounterString(),
-        keyboard.KEY_SWITCH_QUICK_DROP);
+        Input::KEY_SWITCH_QUICK_DROP);
     setLabelText2(mPickUpType, player_node->getPickUpTypeString(),
-        keyboard.KEY_CHANGE_PICKUP_TYPE);
+        Input::KEY_CHANGE_PICKUP_TYPE);
     setLabelText2(mMapType, player_node->getDebugPathString(),
-        keyboard.KEY_PATHFIND);
+        Input::KEY_PATHFIND);
     setLabelText2(mMagicAttackType, player_node->getMagicAttackString(),
-        keyboard.KEY_SWITCH_MAGIC_ATTACK);
+        Input::KEY_SWITCH_MAGIC_ATTACK);
     setLabelText2(mPvpAttackType, player_node->getPvpAttackString(),
-        keyboard.KEY_SWITCH_PVP_ATTACK);
+        Input::KEY_SWITCH_PVP_ATTACK);
     setLabelText2(mImitationMode, player_node->getImitationModeString(),
-        keyboard.KEY_CHANGE_IMITATION_MODE);
+        Input::KEY_CHANGE_IMITATION_MODE);
     setLabelText2(mAwayMode, player_node->getAwayModeString(),
-        keyboard.KEY_AWAY);
+        Input::KEY_AWAY);
     setLabelText2(mCameraMode, player_node->getCameraModeString(),
-        keyboard.KEY_CAMERA);
+        Input::KEY_CAMERA);
     setLabelText2(mDisableGameModifiers, player_node->getGameModifiersString(),
-        keyboard.KEY_DISABLE_GAME_MODIFIERS);
+        Input::KEY_DISABLE_GAME_MODIFIERS);
 }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 7fa0dc464..6c6580f21 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -504,17 +504,17 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     }
                 }
                 else if (player_node->withinAttackRange(mHoverBeing) ||
-                         keyboard.isActionActive(keyboard.KEY_ATTACK))
+                         keyboard.isActionActive(Input::KEY_ATTACK))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
                     {
                         player_node->attack(mHoverBeing,
-                            !keyboard.isActionActive(keyboard.KEY_TARGET));
+                            !keyboard.isActionActive(Input::KEY_TARGET));
                         return;
                     }
                 }
-                else if (!keyboard.isActionActive(keyboard.KEY_ATTACK))
+                else if (!keyboard.isActionActive(Input::KEY_ATTACK))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
@@ -532,7 +532,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
             player_node->pickUp(mHoverItem);
         }
         // Just walk around
-        else if (!keyboard.isActionActive(keyboard.KEY_ATTACK))
+        else if (!keyboard.isActionActive(Input::KEY_ATTACK))
         {
             validateSpeed();
             player_node->stopAttack();
@@ -933,8 +933,8 @@ void Viewport::returnCamera()
 
 void Viewport::validateSpeed()
 {
-    if (!keyboard.isActionActive(keyboard.KEY_TARGET_ATTACK)
-        && !keyboard.isActionActive(keyboard.KEY_ATTACK))
+    if (!keyboard.isActionActive(Input::KEY_TARGET_ATTACK)
+        && !keyboard.isActionActive(Input::KEY_ATTACK))
     {
         if (Game::instance())
             Game::instance()->setValidSpeed();
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 4f6524cdd..f46ee579c 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -118,7 +118,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 
         // Draw emote keyboard shortcut.
         std::string key = keyboard.getKeyValueString(
-            keyboard.KEY_EMOTE_1 + i);
+            Input::KEY_EMOTE_1 + i);
 
         graphics->setColor(getForegroundColor());
         g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index ac7caae34..981491dd7 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -122,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
         // Draw item keyboard shortcut.
         std::string key = keyboard.getKeyValueString(
-            keyboard.KEY_SHORTCUT_1 + i);
+            Input::KEY_SHORTCUT_1 + i);
         graphics->setColor(getForegroundColor());
 
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 6133c69e0..bb7a989ea 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -65,41 +65,41 @@ WindowMenu::WindowMenu():
     int x = 0, h = 0;
 
     addButton(N_("BC"), _("Bot checker"), x, h,
-              KeyboardConfig::KEY_WINDOW_BOT_CHECKER);
+              Input::KEY_WINDOW_BOT_CHECKER);
     addButton(N_("ONL"), _("Who is online"), x, h,
-              KeyboardConfig::KEY_NO_VALUE);
+              Input::KEY_NO_VALUE);
     addButton(N_("KS"), _("Kill stats"), x, h,
-              KeyboardConfig::KEY_WINDOW_KILLS);
+              Input::KEY_WINDOW_KILLS);
     addButton(":-)", _("Smilies"), x, h,
-              KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT);
-    addButton(N_("STA"), _("Status"), x, h, KeyboardConfig::KEY_WINDOW_STATUS);
+              Input::KEY_WINDOW_EMOTE_SHORTCUT);
+    addButton(N_("STA"), _("Status"), x, h, Input::KEY_WINDOW_STATUS);
     addButton(N_("EQU"), _("Equipment"), x, h,
-              KeyboardConfig::KEY_WINDOW_EQUIPMENT);
+              Input::KEY_WINDOW_EQUIPMENT);
     addButton(N_("INV"), _("Inventory"), x, h,
-              KeyboardConfig::KEY_WINDOW_INVENTORY);
+              Input::KEY_WINDOW_INVENTORY);
 
     if (skillDialog->hasSkills())
     {
         addButton(N_("SKI"), _("Skills"), x, h,
-                  KeyboardConfig::KEY_WINDOW_SKILL);
+                  Input::KEY_WINDOW_SKILL);
     }
 
 #ifdef MANASERV_SUPPORT
     if (Net::getNetworkType() == ServerInfo::MANASERV)
     {
         addButton(N_("SPE"), _("Specials"), x, h,
-                  KeyboardConfig::KEY_NO_VALUE);
+                  Input::KEY_NO_VALUE);
     }
 #endif
 
-    addButton(N_("SOC"), _("Social"), x, h, KeyboardConfig::KEY_WINDOW_SOCIAL);
+    addButton(N_("SOC"), _("Social"), x, h, Input::KEY_WINDOW_SOCIAL);
     addButton(N_("SH"), _("Shortcuts"), x, h,
-              KeyboardConfig::KEY_WINDOW_SHORTCUT);
-    addButton(N_("SP"), _("Spells"), x, h, KeyboardConfig::KEY_WINDOW_SPELLS);
-    addButton(N_("DR"), _("Drop"), x, h, KeyboardConfig::KEY_WINDOW_DROP);
+              Input::KEY_WINDOW_SHORTCUT);
+    addButton(N_("SP"), _("Spells"), x, h, Input::KEY_WINDOW_SPELLS);
+    addButton(N_("DR"), _("Drop"), x, h, Input::KEY_WINDOW_DROP);
     addButton(N_("YK"), _("Did you know"), x, h,
-        KeyboardConfig::KEY_WINDOW_DIDYOUKNOW);
-    addButton(N_("SET"), _("Setup"), x, h, KeyboardConfig::KEY_WINDOW_SETUP);
+        Input::KEY_WINDOW_DIDYOUKNOW);
+    addButton(N_("SET"), _("Setup"), x, h, Input::KEY_WINDOW_SETUP);
 
     if (mainGraphics)
     {
@@ -305,7 +305,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
     const int x = event.getX();
     const int y = event.getY();
     int key = btn->getTag();
-    if (key != KeyboardConfig::KEY_NO_VALUE)
+    if (key != Input::KEY_NO_VALUE)
     {
         mTextPopup->show(x + getX(), y + getY(), btn->getDescription(),
             strprintf(_("Key: %s"), keyboard.getKeyValueString(key).c_str()));