improve gamepad handling

Author: jube

include/gf2/core/GamepadTypes.h

@@ -10,7 +10,7 @@
 
 namespace gf {
 
-  enum class GamepadButton : int32_t { // NOLINT(performance-enum-size)
+  enum class GamepadButton { // NOLINT(performance-enum-size)
     Invalid = -1,
     South,
     East,
@@ -29,14 +29,14 @@ namespace gf {
     DPadRight,
   };
 
-  constexpr GamepadButton AnyGamepadButton = static_cast<GamepadButton>(0x7FFFFFFF);
+  constexpr GamepadButton AnyGamepadButton = GamepadButton{ std::numeric_limits<std::underlying_type_t<GamepadButton>>::max() };
 
   enum class GamepadStick : uint8_t {
     Left,
     Right,
   };
 
-  enum class GamepadAxis : int32_t { // NOLINT(performance-enum-size)
+  enum class GamepadAxis { // NOLINT(performance-enum-size)
     Invalid = -1,
     LeftX,
     LeftY,
@@ -46,7 +46,7 @@ namespace gf {
     TriggerRight,
   };
 
-  constexpr GamepadAxis AnyGamepadAxis = static_cast<GamepadAxis>(0x7FFFFFFF);
+  constexpr GamepadAxis AnyGamepadAxis = GamepadAxis{ std::numeric_limits<std::underlying_type_t<GamepadAxis>>::max() };
 
   enum class GamepadAxisDirection : uint8_t {
     Positive,
@@ -58,6 +58,39 @@ namespace gf {
 
   constexpr GamepadId AnyGamepad = static_cast<GamepadId>(std::numeric_limits<std::underlying_type_t<GamepadId>>::max());
 
+  enum class GamepadType : unsigned { // NOLINT(performance-enum-size)
+    Unknown,
+    Standard,
+    XBox360,
+    XBoxOne,
+    Ps3,
+    Ps4,
+    Ps5,
+    NintendoSwitchPro,
+    NintendoSwitchJoyconLeft,
+    NintendoSwitchJoyconRight,
+    NintendoSwitchJoyconPair,
+  };
+
+  enum class GamepadButtonLabel : unsigned { // NOLINT(performance-enum-size)
+    Unknown,
+    A,
+    B,
+    X,
+    Y,
+    Cross,
+    Circle,
+    Square,
+    Triangle,
+  };
+
+  enum class GamepadConnectionState { // NOLINT(performance-enum-size)
+    Invalid = -1,
+    Unknown,
+    Wired,
+    Wireless,
+  };
+
 }
 
 #endif // GF_CORE_GAMEPAD_TYPES_H

include/gf2/graphics/Gamepad.h

@@ -3,21 +3,73 @@
 #ifndef GF_GAMEPAD_H
 #define GF_GAMEPAD_H
 
+#include <cstdint>
+
 #include <gf2/core/GamepadTypes.h>
+#include <gf2/core/Id.h>
+#include <gf2/core/ZString.h>
 
 #include "GraphicsApi.h"
 
+using SDL_Gamepad = struct SDL_Gamepad;
+
 namespace gf {
 
+  class GamepadDevice {
+  public:
+    operator bool()
+    {
+      return m_gamepad != nullptr;
+    }
+
+    bool connected();
+    GamepadId id();
+
+    GamepadType type();
+    GamepadType real_type();
+
+    bool has_axis(GamepadAxis axis);
+    bool has_button(GamepadButton button);
+
+    GamepadButtonLabel button_label(GamepadButton button);
+    GamepadConnectionState connection_state();
+
+    uint16_t vendor();
+    uint16_t product();
+    uint16_t product_version();
+    uint16_t firmware_version();
+
+    ZString name();
+    ZString path();
+    ZString serial();
+    Id serial_id();
+
+    void close();
+
+  private:
+    friend class Gamepad;
+    GamepadDevice(SDL_Gamepad* gamepad);
+    SDL_Gamepad* m_gamepad = nullptr;
+  };
+
   class GF_GRAPHICS_API Gamepad {
   public:
-    static const char* axis_name(GamepadAxis axis);
-    static const char* button_name(GamepadButton button);
-    static const char* gamepad_name(GamepadId id);
+    static GamepadDevice open(GamepadId id);
+    static GamepadDevice from_id(GamepadId id);
+
+    static ZString name(GamepadId id);
+    static ZString path(GamepadId id);
+    static GamepadType type(GamepadId id);
+    static GamepadType real_type(GamepadId id);
+    static uint16_t vendor(GamepadId id);
+    static uint16_t product(GamepadId id);
+    static uint16_t product_version(GamepadId id);
+
+    static ZString axis_name(GamepadAxis axis);
+    static ZString button_name(GamepadButton button);
+    static ZString type_name(GamepadType type);
 
-    static void open(GamepadId hwid);
-    static bool attached(GamepadId id);
-    static void close(GamepadId id);
+    static GamepadButtonLabel button_label_for_type(GamepadType type, GamepadButton button);
   };
 
 } // namespace gf