Implemented basic support for SDL GameController

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

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index 5af4263..411000b 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -20,18 +20,31 @@
 #include "control/controller.hpp"
 
 #include <SDL.h>
-
 #include <map>
 #include <string>
 #include <vector>
+#include <memory>
 
 #include "util/reader_fwd.hpp"
 #include "util/writer_fwd.hpp"
 
+class Controller;
+class GameControllerManager;
+class JoystickManager;
+class JoystickMenu;
+class KeyboardMenu;
 class Menu;
 
-class JoystickKeyboardController : public Controller
+class JoystickKeyboardController
 {
+private:
+  friend class KeyboardMenu;
+  friend class JoystickMenu;
+
+  typedef Controller::Control Control;
+
+  typedef std::map<SDL_Keycode, Control> KeyMap;
+
 public:
   JoystickKeyboardController();
   virtual ~JoystickKeyboardController();
@@ -40,83 +53,37 @@ public:
    */
   void process_event(const SDL_Event& event);
 
-  void write(lisp::Writer& writer);
+  void write(Writer& writer);
   void read(const Reader& lisp);
+  void update();
   void reset();
 
-  Menu* get_key_options_menu();
-  Menu* get_joystick_options_menu();
   void updateAvailableJoysticks();
 
-private:
-  void process_key_event(const SDL_Event& event);
-  void process_hat_event(const SDL_JoyHatEvent& jhat);
-  void process_axis_event(const SDL_JoyAxisEvent& jaxis);
-  void process_button_event(const SDL_JoyButtonEvent& jbutton);
-  void process_console_key_event(const SDL_Event& event);
-  void process_menu_key_event(const SDL_Event& event);
-
-  void print_joystick_mappings();
-
-  SDLKey reversemap_key(Control c);
-  int    reversemap_joybutton(Control c);
-  int    reversemap_joyaxis(Control c);
-  int    reversemap_joyhat(Control c);
-
-  void unbind_joystick_control(Control c);
-
-  void bind_joybutton(int button, Control c);
-  void bind_joyaxis(int axis, Control c);
-  void bind_joyhat(int dir, Control c);
-  void bind_key(SDLKey key, Control c);
-
-  void set_joy_controls(Control id, bool value);
+  Controller *get_main_controller();
 
 private:
-  class KeyboardMenu;
-  class JoystickMenu;
+  void process_text_input_event(const SDL_TextInputEvent& event);
+  void process_key_event(const SDL_KeyboardEvent& event);
+  void process_console_key_event(const SDL_KeyboardEvent& event);
+  void process_menu_key_event(const SDL_KeyboardEvent& event);
 
-  friend class KeyboardMenu;
-  friend class JoystickMenu;
+  SDL_Keycode reversemap_key(Control c);
+  void bind_key(SDL_Keycode key, Control c);
 
-  typedef std::map<SDLKey, Control> KeyMap;
-  typedef std::map<int, Control> ButtonMap;
-  typedef std::map<int, Control> AxisMap;
-  typedef std::map<int, Control> HatMap;
+private:
+  std::unique_ptr<Controller> controller;
+public:
+  bool m_use_game_controller;
+  std::unique_ptr<JoystickManager> joystick_manager;
+  std::unique_ptr<GameControllerManager> game_controller_manager;
 
 private:
   KeyMap keymap;
 
-  ButtonMap joy_button_map;
-
-  AxisMap joy_axis_map;
-
-  HatMap joy_hat_map;
-
-  std::vector<SDL_Joystick*> joysticks;
-
-  std::string name;
-
-  int dead_zone;
-  /// the number of buttons all joysticks have
-  int min_joybuttons;
-  /// the max number of buttons a joystick has
-  int max_joybuttons;
-
-  int max_joyaxis;
-
-  int max_joyhats;
-
-  Uint8 hat_state;
-
-  bool jump_with_up_joy; // Joystick up jumps
   bool jump_with_up_kbd; // Keyboard up jumps
 
   int wait_for_key;
-  int wait_for_joystick;
-
-  KeyboardMenu* key_options_menu;
-  JoystickMenu* joystick_options_menu;
 
 private:
   JoystickKeyboardController(const JoystickKeyboardController&);