Separate KeyboardConfig out into a separate class that can be stored in the global...

[supertux.git] / src / control / keyboard_manager.hpp

diff --git a/src/control/keyboard_manager.hpp b/src/control/keyboard_manager.hpp
index cae55d4..9ddaba3 100644 (file)
--- a/src/control/keyboard_manager.hpp
+++ b/src/control/keyboard_manager.hpp
@@ -27,15 +27,19 @@
 #include "util/writer_fwd.hpp"
 
 class InputManager;
+class KeyboardConfig;
 
 class KeyboardManager final
 {
 private:
-  friend class KeyboardMenu;
-  typedef std::map<SDL_Keycode, Controller::Control> KeyMap;
+  InputManager* m_parent;
+  KeyboardConfig& m_keyboard_config;
 
 public:
-  KeyboardManager(InputManager* parent);
+  int wait_for_key;
+
+public:
+  KeyboardManager(InputManager* parent, KeyboardConfig& keyboard_config);
   ~KeyboardManager();
 
   void process_key_event(const SDL_KeyboardEvent& event);
@@ -43,18 +47,6 @@ public:
   void process_console_key_event(const SDL_KeyboardEvent& event);
   void process_menu_key_event(const SDL_KeyboardEvent& event);
 
-  SDL_Keycode reversemap_key(Controller::Control c);
-  void bind_key(SDL_Keycode key, Controller::Control c);
-
-  void read(const lisp::Lisp* keymap_lisp);
-  void write(Writer& writer);
-
-private:
-  InputManager* m_parent;
-  KeyMap keymap;
-  bool jump_with_up_kbd;
-  int wait_for_key;
-
 private:
   KeyboardManager(const KeyboardManager&) = delete;
   KeyboardManager& operator=(const KeyboardManager&) = delete;