Update SDL2 bindings to pre-release 2.23.1 (#240)

* Reorder controller tests to match bindings

* Update everything except joystick

* Reorder joystick tests to match header

* Update joystick bindings and tests

* Update news.rst

Author: a-hurst

doc/news.rst

@@ -12,6 +12,8 @@ New Features:
 * Updated to wrap new functions and constants in SDL2_image 2.6.0 (PR #238).
 * Added a new function :func:`sdl2.ext.load_svg` that allows loading simple SVG
   images at arbitrary resolutions with SDL2_image 2.6.0 or later (PR #238).
+* Added experimental bindings for the new functions and constants in the
+  SDL2 2.23.1 pre-release (PR #240).
 
 
 0.9.12

sdl2/__init__.py

@@ -12,6 +12,7 @@
 from .filesystem import *
 from .gamecontroller import *
 from .gesture import *
+from .guid import *
 from .haptic import *
 from .hidapi import *
 from .hints import *

sdl2/cpuinfo.py

@@ -33,6 +33,8 @@
     SDLFunc("SDL_HasAVX512F", None, SDL_bool, added='2.0.9'),
     SDLFunc("SDL_HasARMSIMD", None, SDL_bool, added='2.0.12'),
     SDLFunc("SDL_HasNEON", None, SDL_bool, added='2.0.6'),
+    SDLFunc("SDL_HasLSX", None, SDL_bool, added='2.23.1'),
+    SDLFunc("SDL_HasLASX", None, SDL_bool, added='2.23.1'),
     SDLFunc("SDL_SIMDGetAlignment", None, c_size_t, added='2.0.10'),
     SDLFunc("SDL_SIMDAlloc", [c_size_t], c_void_p, added='2.0.10'),
     SDLFunc("SDL_SIMDRealloc", [c_void_p, c_size_t], c_void_p, added='2.0.14'),
@@ -63,6 +65,8 @@
 SDL_HasAVX512F = _ctypes["SDL_HasAVX512F"]
 SDL_HasARMSIMD = _ctypes["SDL_HasARMSIMD"]
 SDL_HasNEON = _ctypes["SDL_HasNEON"]
+SDL_HasLSX = _ctypes["SDL_HasLSX"]
+SDL_HasLASX = _ctypes["SDL_HasLASX"]
 SDL_SIMDGetAlignment = _ctypes["SDL_SIMDGetAlignment"]
 SDL_SIMDAlloc = _ctypes["SDL_SIMDAlloc"]
 SDL_SIMDRealloc = _ctypes["SDL_SIMDRealloc"]

sdl2/events.py

@@ -6,7 +6,7 @@
 from .dll import _bind, SDLFunc, AttributeDict
 from .stdinc import Sint16, Sint32, Uint8, Uint16, Uint32, SDL_bool
 from .keyboard import SDL_Keysym
-from .joystick import SDL_JoystickID
+from .joystick import SDL_JoystickID, SDL_JoystickPowerLevel
 from .touch import SDL_FingerID, SDL_TouchID
 from .gesture import SDL_GestureID
 from .syswm import SDL_SysWMmsg
@@ -18,9 +18,10 @@
     "SDL_TextEditingExtEvent", "SDL_TextInputEvent",
     "SDL_MouseMotionEvent", "SDL_MouseButtonEvent", "SDL_MouseWheelEvent",
     "SDL_JoyAxisEvent", "SDL_JoyBallEvent", "SDL_JoyHatEvent",
-    "SDL_JoyButtonEvent", "SDL_JoyDeviceEvent", "SDL_ControllerAxisEvent",
-    "SDL_ControllerButtonEvent", "SDL_ControllerDeviceEvent",
-    "SDL_ControllerTouchpadEvent", "SDL_ControllerSensorEvent",
+    "SDL_JoyButtonEvent", "SDL_JoyDeviceEvent", "SDL_JoyBatteryEvent",
+    "SDL_ControllerAxisEvent", "SDL_ControllerButtonEvent",
+    "SDL_ControllerDeviceEvent", "SDL_ControllerTouchpadEvent",
+    "SDL_ControllerSensorEvent",
     "SDL_AudioDeviceEvent",
     "SDL_TouchFingerEvent", "SDL_MultiGestureEvent", "SDL_DollarGestureEvent",
     "SDL_DropEvent", "SDL_QuitEvent", "SDL_OSEvent", "SDL_UserEvent", 
@@ -44,7 +45,7 @@
     "SDL_MOUSEBUTTONUP", "SDL_MOUSEWHEEL",
     "SDL_JOYAXISMOTION", "SDL_JOYBALLMOTION",
     "SDL_JOYHATMOTION", "SDL_JOYBUTTONDOWN", "SDL_JOYBUTTONUP",
-    "SDL_JOYDEVICEADDED", "SDL_JOYDEVICEREMOVED", 
+    "SDL_JOYDEVICEADDED", "SDL_JOYDEVICEREMOVED", "SDL_JOYBATTERYUPDATED",
     "SDL_CONTROLLERAXISMOTION", "SDL_CONTROLLERBUTTONDOWN",
     "SDL_CONTROLLERBUTTONUP", "SDL_CONTROLLERDEVICEADDED",
     "SDL_CONTROLLERDEVICEREMOVED", "SDL_CONTROLLERDEVICEREMAPPED",
@@ -104,6 +105,7 @@
 SDL_JOYBUTTONUP = 0x604
 SDL_JOYDEVICEADDED = 0x605
 SDL_JOYDEVICEREMOVED = 0x606
+SDL_JOYBATTERYUPDATED = 0x607
 SDL_CONTROLLERAXISMOTION = 0x650
 SDL_CONTROLLERBUTTONDOWN = 0x651
 SDL_CONTROLLERBUTTONUP = 0x652
@@ -320,6 +322,14 @@ class SDL_JoyDeviceEvent(Structure):
         ("which", Sint32),
     ]
 
+class SDL_JoyBatteryEvent(Structure):
+    _fields_ = [
+        ("type", Uint32),
+        ("timestamp", Uint32),
+        ("which", SDL_JoystickID),
+        ("level", SDL_JoystickPowerLevel),
+    ]
+
 class SDL_ControllerAxisEvent(Structure):
     _fields_ = [
         ("type", Uint32),
@@ -491,6 +501,7 @@ class SDL_Event(Union):
         ("jhat", SDL_JoyHatEvent),
         ("jbutton", SDL_JoyButtonEvent),
         ("jdevice", SDL_JoyDeviceEvent),
+        ("jbattery", SDL_JoyBatteryEvent),
         ("caxis", SDL_ControllerAxisEvent),
         ("cbutton", SDL_ControllerButtonEvent),
         ("cdevice", SDL_ControllerDeviceEvent),

sdl2/gamecontroller.py

@@ -137,6 +137,7 @@ class SDL_GameController(c_void_p):
     SDLFunc("SDL_GameControllerMapping", [_P(SDL_GameController)], c_char_p),
     SDLFunc("SDL_IsGameController", [c_int], SDL_bool),
     SDLFunc("SDL_GameControllerNameForIndex", [c_int], c_char_p),
+    SDLFunc("SDL_GameControllerPathForIndex", [c_int], c_char_p, added='2.23.1'),
     SDLFunc("SDL_GameControllerTypeForIndex", [c_int], SDL_GameControllerType, added='2.0.12'),
     SDLFunc("SDL_GameControllerMappingForDeviceIndex", [c_int], c_char_p, added='2.0.9'),
     SDLFunc("SDL_GameControllerOpen", [c_int], _P(SDL_GameController)),
@@ -146,6 +147,7 @@ class SDL_GameController(c_void_p):
     ),
     SDLFunc("SDL_GameControllerFromPlayerIndex", [c_int], _P(SDL_GameController), added='2.0.12'),
     SDLFunc("SDL_GameControllerName", [_P(SDL_GameController)], c_char_p),
+    SDLFunc("SDL_GameControllerPath", [_P(SDL_GameController)], c_char_p, added='2.23.1'),
     SDLFunc("SDL_GameControllerGetType",
         [_P(SDL_GameController)],
         returns = SDL_GameControllerType, added = '2.0.12'
@@ -158,6 +160,10 @@ class SDL_GameController(c_void_p):
         [_P(SDL_GameController)],
         returns = Uint16, added = '2.0.6'
     ),
+    SDLFunc("SDL_GameControllerGetFirmwareVersion",
+        [_P(SDL_GameController)],
+        returns = Uint16, added = '2.23.1'
+    ),
     SDLFunc("SDL_GameControllerGetSerial", [_P(SDL_GameController)], c_char_p, added='2.0.14'),
     SDLFunc("SDL_GameControllerGetAttached", [_P(SDL_GameController)], SDL_bool),
     SDLFunc("SDL_GameControllerGetJoystick", [_P(SDL_GameController)], _P(SDL_Joystick)),
@@ -262,9 +268,11 @@ class SDL_GameController(c_void_p):
 SDL_GameControllerMapping = _ctypes["SDL_GameControllerMapping"]
 SDL_IsGameController = _ctypes["SDL_IsGameController"]
 SDL_GameControllerNameForIndex = _ctypes["SDL_GameControllerNameForIndex"]
+SDL_GameControllerPathForIndex = _ctypes["SDL_GameControllerPathForIndex"]
 SDL_GameControllerTypeForIndex = _ctypes["SDL_GameControllerTypeForIndex"]
 SDL_GameControllerOpen = _ctypes["SDL_GameControllerOpen"]
 SDL_GameControllerName = _ctypes["SDL_GameControllerName"]
+SDL_GameControllerPath = _ctypes["SDL_GameControllerPath"]
 SDL_GameControllerGetType = _ctypes["SDL_GameControllerGetType"]
 SDL_GameControllerGetAttached = _ctypes["SDL_GameControllerGetAttached"]
 SDL_GameControllerGetJoystick = _ctypes["SDL_GameControllerGetJoystick"]
@@ -297,6 +305,7 @@ class SDL_GameController(c_void_p):
 SDL_GameControllerGetVendor = _ctypes["SDL_GameControllerGetVendor"]
 SDL_GameControllerGetProduct = _ctypes["SDL_GameControllerGetProduct"]
 SDL_GameControllerGetProductVersion = _ctypes["SDL_GameControllerGetProductVersion"]
+SDL_GameControllerGetFirmwareVersion = _ctypes["SDL_GameControllerGetFirmwareVersion"]
 SDL_GameControllerGetSerial = _ctypes["SDL_GameControllerGetSerial"]
 SDL_GameControllerNumMappings = _ctypes["SDL_GameControllerNumMappings"]
 SDL_GameControllerMappingForIndex = _ctypes["SDL_GameControllerMappingForIndex"]

sdl2/guid.py

@@ -0,0 +1,36 @@
+from ctypes import Structure, c_int, c_char, c_char_p
+from ctypes import POINTER as _P
+from .dll import _bind, SDLFunc, AttributeDict
+from .stdinc import Uint8
+
+__all__ = [
+    # Defines
+    "SDL_GUID",
+]
+
+
+# Constants & typedefs
+
+class SDL_GUID(Structure):
+    _fields_ = [("data", (Uint8 * 16))]
+
+
+# Raw ctypes function definitions
+
+_funcdefs = [
+    SDLFunc("SDL_GUIDToString", [SDL_GUID, _P(c_char), c_int], None, added='2.23.1'),
+    SDLFunc("SDL_GUIDFromString", [c_char_p], SDL_GUID, added='2.23.1'),
+]
+_ctypes = AttributeDict()
+for f in _funcdefs:
+    _ctypes[f.name] = _bind(f.name, f.args, f.returns, f.added)
+    __all__.append(f.name) # Add all bound functions to module namespace
+
+
+# Aliases for ctypes bindings
+
+def SDL_GUIDToString(guid, pszGUID, cbGUID):
+    return _ctypes["SDL_GUIDToString"](guid, pszGUID, cbGUID)
+
+def SDL_GUIDFromString(pchGUID):
+    return _ctypes["SDL_GUIDFromString"](pchGUID)

sdl2/hints.py

@@ -66,6 +66,8 @@
     "SDL_HINT_JOYSTICK_THREAD",
     "SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER",
     "SDL_HINT_JOYSTICK_DEVICE",
+    "SDL_HINT_LINUX_DIGITAL_HATS",
+    "SDL_HINT_LINUX_HAT_DEADZONES",
     "SDL_HINT_LINUX_JOYSTICK_CLASSIC",
     "SDL_HINT_LINUX_JOYSTICK_DEADZONES",
     "SDL_HINT_MAC_BACKGROUND_APP",
@@ -115,6 +117,7 @@
     "SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS",
     "SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR",
     "SDL_HINT_VIDEO_WAYLAND_PREFER_LIBDECOR",
+    "SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION",
     "SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT",
     "SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL",
     "SDL_HINT_VIDEO_FOREIGN_WINDOW_VULKAN",
@@ -137,6 +140,8 @@
     "SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL",
     "SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4",
     "SDL_HINT_WINDOWS_USE_D3D9EX",
+    "SDL_HINT_WINDOWS_DPI_AWARENESS",
+    "SDL_HINT_WINDOWS_DPI_SCALING",
     "SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN",
     "SDL_HINT_WINDOW_NO_ACTIVATION_WHEN_SHOWN",
     "SDL_HINT_WINRT_HANDLE_BACK_BUTTON",
@@ -196,6 +201,7 @@
 SDL_HINT_VIDEO_FOREIGN_WINDOW_VULKAN = b"SDL_VIDEO_FOREIGN_WINDOW_VULKAN"
 SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR = b"SDL_VIDEO_WAYLAND_ALLOW_LIBDECOR"
 SDL_HINT_VIDEO_WAYLAND_PREFER_LIBDECOR = b"SDL_VIDEO_WAYLAND_PREFER_LIBDECOR"
+SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION = b"SDL_VIDEO_WAYLAND_MODE_EMULATION"
 SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT = b"SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT"
 SDL_HINT_VIDEO_X11_FORCE_EGL = b"SDL_VIDEO_X11_FORCE_EGL"
 SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR = b"SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR"
@@ -295,6 +301,8 @@
 SDL_HINT_EMSCRIPTEN_ASYNCIFY = b"SDL_EMSCRIPTEN_ASYNCIFY"
 SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT = b"SDL_EMSCRIPTEN_KEYBOARD_ELEMENT"
 SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER = b"SDL_KMSDRM_REQUIRE_DRM_MASTER"
+SDL_HINT_LINUX_DIGITAL_HATS = b"SDL_LINUX_DIGITAL_HATS"
+SDL_HINT_LINUX_HAT_DEADZONES = b"SDL_LINUX_HAT_DEADZONES"
 SDL_HINT_LINUX_JOYSTICK_CLASSIC = b"SDL_LINUX_JOYSTICK_CLASSIC"
 SDL_HINT_LINUX_JOYSTICK_DEADZONES = b"SDL_LINUX_JOYSTICK_DEADZONES"
 SDL_HINT_MAC_BACKGROUND_APP = b"SDL_MAC_BACKGROUND_APP"
@@ -312,6 +320,8 @@
 SDL_HINT_WINDOWS_INTRESOURCE_ICON = b"SDL_WINDOWS_INTRESOURCE_ICON"
 SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL = b"SDL_WINDOWS_INTRESOURCE_ICON_SMALL"
 SDL_HINT_WINDOWS_USE_D3D9EX = b"SDL_WINDOWS_USE_D3D9EX"
+SDL_HINT_WINDOWS_DPI_AWARENESS = b"SDL_WINDOWS_DPI_AWARENESS"
+SDL_HINT_WINDOWS_DPI_SCALING = b"SDL_WINDOWS_DPI_SCALING"
 SDL_HINT_XINPUT_ENABLED = b"SDL_XINPUT_ENABLED"
 SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING = b"SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING"
 

sdl2/joystick.py

@@ -1,17 +1,19 @@
 import sys
-from ctypes import Structure, c_int, c_char_p, c_void_p
+from ctypes import Structure, c_int, c_char_p, c_void_p, CFUNCTYPE
 from ctypes import POINTER as _P
 from .dll import _bind, SDLFunc, AttributeDict
 from .stdinc import Sint16, Sint32, Uint32, Uint16, Uint8, SDL_bool
+from .guid import SDL_GUID
 
 __all__ = [
     # Structs & Opaque Types
-    "SDL_Joystick", "SDL_JoystickGUID", 
+    "SDL_Joystick", "SDL_JoystickGUID", "SDL_VirtualJoystickDesc",
 
     # Defines
     "SDL_JoystickID", "SDL_HAT_CENTERED", "SDL_HAT_UP", "SDL_HAT_RIGHT",
     "SDL_HAT_DOWN", "SDL_HAT_LEFT", "SDL_HAT_RIGHTUP", "SDL_HAT_RIGHTDOWN",
     "SDL_HAT_LEFTUP", "SDL_HAT_LEFTDOWN", "SDL_IPHONE_MAX_GFORCE",
+    "SDL_VIRTUAL_JOYSTICK_DESC_VERSION",
 
     # Enums
     "SDL_JoystickType",
@@ -64,16 +66,46 @@
 SDL_HAT_LEFTUP = SDL_HAT_LEFT | SDL_HAT_UP
 SDL_HAT_LEFTDOWN = SDL_HAT_LEFT | SDL_HAT_DOWN
 
+SDL_VIRTUAL_JOYSTICK_DESC_VERSION = 1
+
 
 # Structs & typedefs
 
 SDL_JoystickID = Sint32
+SDL_JoystickGUID = SDL_GUID
 
 class SDL_Joystick(c_void_p):
     pass
 
-class SDL_JoystickGUID(Structure):
-    _fields_ = [("data", (Uint8 * 16))]
+# TODO: Document these somewhere
+CFUNC_Update = CFUNCTYPE(None, c_void_p)
+CFUNC_SetPlayerIndex = CFUNCTYPE(None, c_void_p, c_int)
+CFUNC_Rumble = CFUNCTYPE(c_int, c_void_p, Uint16, Uint16)
+CFUNC_RumbleTriggers = CFUNCTYPE(c_int, c_void_p, Uint16, Uint16)
+CFUNC_SetLED = CFUNCTYPE(c_int, c_void_p, Uint8, Uint8, Uint8)
+CFUNC_SendEffect = CFUNCTYPE(c_int, c_void_p, c_void_p, c_int)
+
+class SDL_VirtualJoystickDesc(Structure):
+    _fields_ = [
+        ("version", Uint16),
+        ("type", Uint16),
+        ("naxes", Uint16),
+        ("nbuttons", Uint16),
+        ("nhats", Uint16),
+        ("vendor_id", Uint16),
+        ("product_id", Uint16),
+        ("padding", Uint16),
+        ("button_mask", Uint32),
+        ("axis_mask", Uint32),
+        ("name", c_char_p),
+        ("userdata", c_void_p),
+        ("Update", CFUNC_Update),
+        ("SetPlayerIndex", CFUNC_SetPlayerIndex),
+        ("Rumble", CFUNC_Rumble),
+        ("RumbleTriggers", CFUNC_RumbleTriggers),
+        ("SetLED", CFUNC_SetLED),
+        ("SendEffect", CFUNC_SendEffect),
+    ]
 
 
 # Raw ctypes function definitions
@@ -83,6 +115,7 @@ class SDL_JoystickGUID(Structure):
     SDLFunc("SDL_UnlockJoysticks", None, None, added='2.0.7'),
     SDLFunc("SDL_NumJoysticks", None, c_int),
     SDLFunc("SDL_JoystickNameForIndex", [c_int], c_char_p),
+    SDLFunc("SDL_JoystickPathForIndex", [c_int], c_char_p, added='2.23.1'),
     SDLFunc("SDL_JoystickGetDevicePlayerIndex", [c_int], c_int, added='2.0.9'),
     SDLFunc("SDL_JoystickGetDeviceGUID", [c_int], SDL_JoystickGUID),
     SDLFunc("SDL_JoystickGetDeviceVendor", [c_int], Uint16, added='2.0.6'),
@@ -97,6 +130,7 @@ class SDL_JoystickGUID(Structure):
         [SDL_JoystickType, c_int, c_int, c_int],
         returns = c_int, added = '2.0.14'
     ),
+    SDLFunc("SDL_JoystickAttachVirtualEx", [_P(SDL_VirtualJoystickDesc)], c_int, added='2.23.1'),
     SDLFunc("SDL_JoystickDetachVirtual", [c_int], c_int, added='2.0.14'),
     SDLFunc("SDL_JoystickIsVirtual", [c_int], SDL_bool, added='2.0.14'),
     SDLFunc("SDL_JoystickSetVirtualAxis",
@@ -108,13 +142,15 @@ class SDL_JoystickGUID(Structure):
         returns = c_int, added = '2.0.14'
     ),
     SDLFunc("SDL_JoystickSetVirtualHat", [_P(SDL_Joystick), c_int, Uint8], c_int, added='2.0.14'),
-     SDLFunc("SDL_JoystickName", [_P(SDL_Joystick)], c_char_p),
+    SDLFunc("SDL_JoystickName", [_P(SDL_Joystick)], c_char_p),
+    SDLFunc("SDL_JoystickPath", [_P(SDL_Joystick)], c_char_p, added='2.23.1'),
     SDLFunc("SDL_JoystickGetPlayerIndex", [_P(SDL_Joystick)], c_int, added='2.0.9'),
     SDLFunc("SDL_JoystickSetPlayerIndex", [_P(SDL_Joystick), c_int], added='2.0.12'),
     SDLFunc("SDL_JoystickGetGUID", [_P(SDL_Joystick)], SDL_JoystickGUID),
     SDLFunc("SDL_JoystickGetVendor", [_P(SDL_Joystick)], Uint16, added='2.0.6'),
     SDLFunc("SDL_JoystickGetProduct", [_P(SDL_Joystick)], Uint16, added='2.0.6'),
     SDLFunc("SDL_JoystickGetProductVersion", [_P(SDL_Joystick)], Uint16, added='2.0.6'),
+    SDLFunc("SDL_JoystickGetFirmwareVersion", [_P(SDL_Joystick)], Uint16, added='2.23.1'),
     SDLFunc("SDL_JoystickGetSerial", [_P(SDL_Joystick)], c_char_p, added='2.0.14'),
     SDLFunc("SDL_JoystickGetType", [_P(SDL_Joystick)], SDL_JoystickType, added='2.0.6'),
     SDLFunc("SDL_JoystickGetGUIDString", [SDL_JoystickGUID, c_char_p, c_int]),
@@ -164,8 +200,10 @@ class SDL_JoystickGUID(Structure):
 
 SDL_NumJoysticks = _ctypes["SDL_NumJoysticks"]
 SDL_JoystickNameForIndex = _ctypes["SDL_JoystickNameForIndex"]
+SDL_JoystickPathForIndex = _ctypes["SDL_JoystickPathForIndex"]
 SDL_JoystickOpen = _ctypes["SDL_JoystickOpen"]
 SDL_JoystickName = _ctypes["SDL_JoystickName"]
+SDL_JoystickPath = _ctypes["SDL_JoystickPath"]
 SDL_JoystickGetDeviceGUID = _ctypes["SDL_JoystickGetDeviceGUID"]
 SDL_JoystickGetGUID = _ctypes["SDL_JoystickGetGUID"]
 SDL_JoystickGetGUIDFromString = _ctypes["SDL_JoystickGetGUIDFromString"]
@@ -186,6 +224,7 @@ class SDL_JoystickGUID(Structure):
 SDL_JoystickFromInstanceID = _ctypes["SDL_JoystickFromInstanceID"]
 SDL_JoystickFromPlayerIndex = _ctypes["SDL_JoystickFromPlayerIndex"]
 SDL_JoystickAttachVirtual = _ctypes["SDL_JoystickAttachVirtual"]
+SDL_JoystickAttachVirtualEx = _ctypes["SDL_JoystickAttachVirtualEx"]
 SDL_JoystickDetachVirtual = _ctypes["SDL_JoystickDetachVirtual"]
 SDL_JoystickIsVirtual = _ctypes["SDL_JoystickIsVirtual"]
 SDL_JoystickSetVirtualAxis = _ctypes["SDL_JoystickSetVirtualAxis"]
@@ -194,6 +233,7 @@ class SDL_JoystickGUID(Structure):
 SDL_JoystickGetVendor = _ctypes["SDL_JoystickGetVendor"]
 SDL_JoystickGetProduct = _ctypes["SDL_JoystickGetProduct"]
 SDL_JoystickGetProductVersion = _ctypes["SDL_JoystickGetProductVersion"]
+SDL_JoystickGetFirmwareVersion = _ctypes["SDL_JoystickGetFirmwareVersion"]
 SDL_JoystickGetSerial = _ctypes["SDL_JoystickGetSerial"]
 SDL_JoystickGetAxisInitialState = _ctypes["SDL_JoystickGetAxisInitialState"]
 SDL_JoystickGetType = _ctypes["SDL_JoystickGetType"]

sdl2/keycode.py

@@ -296,3 +296,8 @@
 
 SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND)
 SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD)
+
+SDLK_SOFTLEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTLEFT)
+SDLK_SOFTRIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SOFTRIGHT)
+SDLK_CALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALL)
+SDLK_ENDCALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ENDCALL)

sdl2/scancode.py

@@ -269,4 +269,9 @@
 SDL_SCANCODE_AUDIOREWIND = 285
 SDL_SCANCODE_AUDIOFASTFORWARD = 286
 
+SDL_SCANCODE_SOFTLEFT = 287
+SDL_SCANCODE_SOFTRIGHT = 288
+SDL_SCANCODE_CALL = 289
+SDL_SCANCODE_ENDCALL = 290
+
 SDL_NUM_SCANCODES = 512