input_common: Reimplement SDL

src/input_common/drivers/sdl_driver.h

@@ -21,13 +21,6 @@ using SDL_JoystickID = s32;
 
 namespace InputCommon {
 
-class SDLJoystick;
-
-using ButtonBindings =
-    std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerButton>, 18>;
-using ZButtonBindings =
-    std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerAxis>, 2>;
-
 class SDLDriver : public InputEngine {
 public:
     /// Initializes and registers SDL device factories
@@ -41,15 +34,12 @@ public:
     /// Handle SDL_Events for joysticks from SDL_PollEvent
     void HandleGameControllerEvent(const SDL_Event& event);
 
-    /// Get the nth joystick with the corresponding GUID
+    bool IsStickInverted(const Common::ParamPackage& params) override;
-    std::shared_ptr<SDLJoystick> GetSDLJoystickBySDLID(SDL_JoystickID sdl_id);
 
-    /**
+    bool IsVibrationEnabled(const PadIdentifier& identifier) override;
-     * Check how many identical joysticks (by guid) were connected before the one with sdl_id and so
+
-     * tie it to a SDLJoystick with the same guid and that port
+    Common::Input::VibrationError SetVibration(
-     */
+        const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
-    std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const Common::UUID& guid, int port);
-    std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port);
 
     std::vector<Common::ParamPackage> GetInputDevices() const override;
 
@@ -61,75 +51,43 @@ public:
     std::string GetHatButtonName(u8 direction_value) const override;
     u8 GetHatButtonId(const std::string& direction_name) const override;
 
-    bool IsStickInverted(const Common::ParamPackage& params) override;
-
-    Common::Input::DriverResult SetVibration(
-        const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
-
-    bool IsVibrationEnabled(const PadIdentifier& identifier) override;
-
 private:
     struct VibrationRequest {
         PadIdentifier identifier;
         Common::Input::VibrationStatus vibration;
     };
 
+    struct JoystickID {
+        int sdl_index;
+        bool has_rumble;
+        PadIdentifier identifier;
+    };
+
+    std::shared_ptr<JoystickID> GetSDLJoystickBySDLID(SDL_JoystickID sdl_id);
+
     void InitJoystick(int joystick_index);
-    void CloseJoystick(SDL_Joystick* sdl_joystick);
+    void CloseJoystick(int joystick_index);
 
     /// Needs to be called before SDL_QuitSubSystem.
     void CloseJoysticks();
 
+    void UpdateControllerStatus(u32 event, int joystick_index, int index, int value);
+
+    Common::Input::BatteryLevel GetBatteryLevel(int value);
+
     /// Takes all vibrations from the queue and sends the command to the controller
     void SendVibrations();
 
-    Common::ParamPackage BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
+    /// Map of GUID of a list of corresponding virtual Joysticks
-                                                          s32 axis, float value = 0.1f) const;
+    std::unordered_map<Common::UUID, std::vector<std::shared_ptr<JoystickID>>> joystick_map;
-    Common::ParamPackage BuildButtonParamPackageForButton(int port, const Common::UUID& guid,
+    std::mutex joystick_map_mutex;
-                                                          s32 button) const;
 
-    Common::ParamPackage BuildHatParamPackageForButton(int port, const Common::UUID& guid, s32 hat,
+    std::atomic<bool> initialized = false;
-                                                       u8 value) const;
-
-    Common::ParamPackage BuildMotionParam(int port, const Common::UUID& guid) const;
-
-    Common::ParamPackage BuildParamPackageForBinding(
-        int port, const Common::UUID& guid, const SDL_GameControllerButtonBind& binding) const;
-
-    Common::ParamPackage BuildParamPackageForAnalog(PadIdentifier identifier, int axis_x,
-                                                    int axis_y, float offset_x,
-                                                    float offset_y) const;
-
-    /// Returns the default button bindings list for generic controllers
-    ButtonBindings GetDefaultButtonBinding() const;
-
-    /// Returns the default button bindings list for nintendo controllers
-    ButtonBindings GetNintendoButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const;
-
-    /// Returns the button mappings from a single controller
-    ButtonMapping GetSingleControllerMapping(const std::shared_ptr<SDLJoystick>& joystick,
-                                             const ButtonBindings& switch_to_sdl_button,
-                                             const ZButtonBindings& switch_to_sdl_axis) const;
-
-    /// Returns the button mappings from two different controllers
-    ButtonMapping GetDualControllerMapping(const std::shared_ptr<SDLJoystick>& joystick,
-                                           const std::shared_ptr<SDLJoystick>& joystick2,
-                                           const ButtonBindings& switch_to_sdl_button,
-                                           const ZButtonBindings& switch_to_sdl_axis) const;
-
-    /// Returns true if the button is on the left joycon
-    bool IsButtonOnLeftSide(Settings::NativeButton::Values button) const;
 
     /// Queue of vibration request to controllers
     Common::SPSCQueue<VibrationRequest> vibration_queue;
 
-    /// Map of GUID of a list of corresponding virtual Joysticks
+    /// Thread that handles request from the vibration queue
-    std::unordered_map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
-    std::mutex joystick_map_mutex;
-
-    bool start_thread = false;
-    std::atomic<bool> initialized = false;
-
     std::thread vibration_thread;
 };
 } // namespace InputCommon