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 705b7bc..411000b 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -20,34 +20,30 @@
 #include "control/controller.hpp"
 
 #include <SDL.h>
-#include <SDL_keycode.h> // add by giby
 #include <map>
 #include <string>
 #include <vector>
+#include <memory>
 
 #include "util/reader_fwd.hpp"
 #include "util/writer_fwd.hpp"
 
-class Menu;
-class KeyboardMenu;
-class JoystickMenu;
 class Controller;
+class GameControllerManager;
+class JoystickManager;
+class JoystickMenu;
+class KeyboardMenu;
+class Menu;
 
-    //SDL_JoystickID myID = SDL_JoystickInstanceID(myOpenedStick);
-
-class JoystickKeyboardController // http://wiki.libsdl.org/moin.fcg/SDL_Joystick for info 
+class JoystickKeyboardController
 {
 private:
   friend class KeyboardMenu;
   friend class JoystickMenu;
 
   typedef Controller::Control Control;
-  typedef Uint8 JoyId;
 
   typedef std::map<SDL_Keycode, Control> KeyMap;
-  typedef std::map<std::pair<JoyId, int>, Control> ButtonMap;
-  typedef std::map<std::pair<JoyId, int>, Control> AxisMap;
-  typedef std::map<std::pair<JoyId, int>, Control> HatMap;
 
 public:
   JoystickKeyboardController();
@@ -69,60 +65,25 @@ public:
 private:
   void process_text_input_event(const SDL_TextInputEvent& event);
   void process_key_event(const SDL_KeyboardEvent& 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_KeyboardEvent& event);
   void process_menu_key_event(const SDL_KeyboardEvent& event);
 
-  void print_joystick_mappings();
-
   SDL_Keycode 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(JoyId joy_id, int button, Control c);
-  void bind_joyaxis(JoyId joy_id, int axis, Control c);
-  void bind_joyhat(JoyId joy_id, int dir, Control c);
   void bind_key(SDL_Keycode key, Control c);
 
-  void set_joy_controls(Control id, bool value); 
-
 private:
-  Controller *controller;
+  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;
 
 private:
   JoystickKeyboardController(const JoystickKeyboardController&);