From e2be03859b7723b97cc182842584cb7b30f5caab Mon Sep 17 00:00:00 2001 From: Austin Hurst Date: Tue, 10 Dec 2024 19:37:02 -0400 Subject: [PATCH] Update bindings to 2.30.10 --- sdl2/events.py | 4 +++ sdl2/gamecontroller.py | 7 +++++ sdl2/hints.py | 50 +++++++++++++++++++++++++++++++- sdl2/pixels.py | 32 +++++++++++++++++++- sdl2/test/gamecontroller_test.py | 6 ++++ sdl2/version.py | 4 +-- 6 files changed, 99 insertions(+), 4 deletions(-) diff --git a/sdl2/events.py b/sdl2/events.py index 5364dfce..78ee77a3 100644 --- a/sdl2/events.py +++ b/sdl2/events.py @@ -51,6 +51,8 @@ "SDL_CONTROLLERDEVICEREMOVED", "SDL_CONTROLLERDEVICEREMAPPED", "SDL_CONTROLLERTOUCHPADDOWN", "SDL_CONTROLLERTOUCHPADMOTION", "SDL_CONTROLLERTOUCHPADUP", "SDL_CONTROLLERSENSORUPDATE", + "SDL_CONTROLLERUPDATECOMPLETE_RESERVED_FOR_SDL3", + "SDL_CONTROLLERSTEAMHANDLEUPDATED", "SDL_FINGERDOWN", "SDL_FINGERUP", "SDL_FINGERMOTION", "SDL_DOLLARGESTURE", "SDL_DOLLARRECORD", "SDL_MULTIGESTURE", "SDL_CLIPBOARDUPDATE", "SDL_DROPFILE", "SDL_DROPTEXT", @@ -116,6 +118,8 @@ SDL_CONTROLLERTOUCHPADMOTION = 0x657 SDL_CONTROLLERTOUCHPADUP = 0x658 SDL_CONTROLLERSENSORUPDATE = 0x659 +SDL_CONTROLLERUPDATECOMPLETE_RESERVED_FOR_SDL3 = 0x65A +SDL_CONTROLLERSTEAMHANDLEUPDATED = 0x65B SDL_FINGERDOWN = 0x700 SDL_FINGERUP = 0x701 SDL_FINGERMOTION = 0x702 diff --git a/sdl2/gamecontroller.py b/sdl2/gamecontroller.py index 10a33fed..53d3b67d 100644 --- a/sdl2/gamecontroller.py +++ b/sdl2/gamecontroller.py @@ -26,6 +26,7 @@ "SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT", "SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT", "SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR", + "SDL_CONTROLLER_TYPE_MAX", "SDL_GameControllerBindType", "SDL_CONTROLLER_BINDTYPE_NONE", "SDL_CONTROLLER_BINDTYPE_BUTTON", @@ -80,6 +81,7 @@ SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT = 11 SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT = 12 SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR = 13 +SDL_CONTROLLER_TYPE_MAX = 14 SDL_GameControllerAxis = c_int SDL_CONTROLLER_AXIS_INVALID = -1 @@ -173,6 +175,10 @@ class SDL_GameController(c_void_p): returns = Uint16, added = '2.23.1' ), SDLFunc("SDL_GameControllerGetSerial", [_P(SDL_GameController)], c_char_p, added='2.0.14'), + SDLFunc("SDL_GameControllerGetSteamHandle", + [_P(SDL_GameController)], + returns = Uint64, added = '2.30.0' + ), SDLFunc("SDL_GameControllerGetAttached", [_P(SDL_GameController)], SDL_bool), SDLFunc("SDL_GameControllerGetJoystick", [_P(SDL_GameController)], _P(SDL_Joystick)), SDLFunc("SDL_GameControllerEventState", [c_int], c_int), @@ -320,6 +326,7 @@ class SDL_GameController(c_void_p): SDL_GameControllerGetProductVersion = _ctypes["SDL_GameControllerGetProductVersion"] SDL_GameControllerGetFirmwareVersion = _ctypes["SDL_GameControllerGetFirmwareVersion"] SDL_GameControllerGetSerial = _ctypes["SDL_GameControllerGetSerial"] +SDL_GameControllerGetSteamHandle = _ctypes["SDL_GameControllerGetSteamHandle"] SDL_GameControllerNumMappings = _ctypes["SDL_GameControllerNumMappings"] SDL_GameControllerMappingForIndex = _ctypes["SDL_GameControllerMappingForIndex"] SDL_GameControllerMappingForDeviceIndex = _ctypes["SDL_GameControllerMappingForDeviceIndex"] diff --git a/sdl2/hints.py b/sdl2/hints.py index 1ff3af9b..1c86b663 100644 --- a/sdl2/hints.py +++ b/sdl2/hints.py @@ -49,6 +49,14 @@ "SDL_HINT_IME_SUPPORT_EXTENDED_TEXT", "SDL_HINT_IOS_HIDE_HOME_INDICATOR", "SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS", + "SDL_HINT_JOYSTICK_ARCADESTICK_DEVICES", + "SDL_HINT_JOYSTICK_ARCADESTICK_DEVICES_EXCLUDED", + "SDL_HINT_JOYSTICK_BLACKLIST_DEVICES", + "SDL_HINT_JOYSTICK_BLACKLIST_DEVICES_EXCLUDED", + "SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES", + "SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED", + "SDL_HINT_JOYSTICK_GAMECUBE_DEVICES", + "SDL_HINT_JOYSTICK_GAMECUBE_DEVICES_EXCLUDED", "SDL_HINT_JOYSTICK_HIDAPI", "SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE", "SDL_HINT_JOYSTICK_GAMECUBE_RUMBLE_BRAKE", @@ -66,6 +74,7 @@ "SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE", "SDL_HINT_JOYSTICK_HIDAPI_STADIA", "SDL_HINT_JOYSTICK_HIDAPI_STEAM", + "SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK", "SDL_HINT_JOYSTICK_HIDAPI_SWITCH", "SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "SDL_HINT_JOYSTICK_HIDAPI_JOYCON_HOME_LED", @@ -78,18 +87,26 @@ "SDL_HINT_JOYSTICK_HIDAPI_XBOX_360_WIRELESS", "SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE", "SDL_HINT_JOYSTICK_HIDAPI_XBOX_ONE_HOME_LED", + "SDL_HINT_JOYSTICK_IOKIT", + "SDL_HINT_JOYSTICK_MFI", "SDL_HINT_JOYSTICK_RAWINPUT", "SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT", "SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT", "SDL_HINT_JOYSTICK_ROG_CHAKRAM", "SDL_HINT_JOYSTICK_THREAD", + "SDL_HINT_JOYSTICK_THROTTLE_DEVICES", + "SDL_HINT_JOYSTICK_THROTTLE_DEVICES_EXCLUDED", "SDL_HINT_JOYSTICK_WGI", + "SDL_HINT_JOYSTICK_WHEEL_DEVICES", + "SDL_HINT_JOYSTICK_WHEEL_DEVICES_EXCLUDED", + "SDL_HINT_JOYSTICK_ZERO_CENTERED_DEVICES", "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_LOGGING", "SDL_HINT_MAC_BACKGROUND_APP", "SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK", "SDL_HINT_MAC_OPENGL_ASYNC_DISPATCH", @@ -103,6 +120,7 @@ "SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE", "SDL_HINT_MOUSE_RELATIVE_SYSTEM_SCALE", "SDL_HINT_MOUSE_RELATIVE_WARP_MOTION", + "SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE", "SDL_HINT_MOUSE_TOUCH_EVENTS", "SDL_HINT_MOUSE_AUTO_CAPTURE", "SDL_HINT_NO_SIGNAL_HANDLERS", @@ -122,6 +140,8 @@ "SDL_HINT_RENDER_SCALE_QUALITY", "SDL_HINT_RENDER_VSYNC", "SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE", + "SDL_HINT_ROG_GAMEPAD_MICE", + "SDL_HINT_ROG_GAMEPAD_MICE_EXCLUDED", "SDL_HINT_PS2_DYNAMIC_VSYNC", "SDL_HINT_RETURN_KEY_HIDES_IME", "SDL_HINT_RPI_VIDEO_LAYER", @@ -155,7 +175,7 @@ "SDL_HINT_VIDEO_X11_XINERAMA", "SDL_HINT_VIDEO_X11_XRANDR", "SDL_HINT_VIDEO_X11_XVIDMODE", - "SDL_HINT_WAVE_FACT_CHUNK", + "SDL_HINT_WAVE_FACT_CHUNK", "SDL_HINT_WAVE_RIFF_CHUNK_SIZE", "SDL_HINT_WAVE_TRUNCATION", "SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING", @@ -176,12 +196,16 @@ "SDL_HINT_WINRT_PRIVACY_POLICY_URL", "SDL_HINT_X11_FORCE_OVERRIDE_REDIRECT", "SDL_HINT_XINPUT_ENABLED", + "SDL_HINT_DIRECTINPUT_ENABLED", "SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING", "SDL_HINT_AUDIO_INCLUDE_MONITORS", "SDL_HINT_X11_WINDOW_TYPE", "SDL_HINT_QUIT_ON_LAST_WINDOW_CLOSE", "SDL_HINT_VIDEODRIVER", "SDL_HINT_AUDIODRIVER", + "SDL_HINT_KMSDRM_DEVICE_INDEX", + "SDL_HINT_TRACKPAD_IS_TOUCH_ONLY", + "SDL_HINT_SHUTDOWN_DBUS_ON_QUIT", # Enums "SDL_HintPriority", @@ -197,6 +221,7 @@ SDL_HINT_APP_NAME = b"SDL_APP_NAME" SDL_HINT_BMP_SAVE_LEGACY_FORMAT = b"SDL_BMP_SAVE_LEGACY_FORMAT" SDL_HINT_EVENT_LOGGING = b"SDL_EVENT_LOGGING" +SDL_HINT_LOGGING = b"SDL_LOGGING" SDL_HINT_NO_SIGNAL_HANDLERS = b"SDL_NO_SIGNAL_HANDLERS" SDL_HINT_POLL_SENTINEL = b"SDL_POLL_SENTINEL" SDL_HINT_PREFERRED_LOCALES = b"SDL_PREFERRED_LOCALES" @@ -282,6 +307,7 @@ SDL_HINT_MOUSE_DOUBLE_CLICK_TIME = b"SDL_MOUSE_DOUBLE_CLICK_TIME" SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH = b"SDL_MOUSE_FOCUS_CLICKTHROUGH" SDL_HINT_MOUSE_NORMAL_SPEED_SCALE = b"SDL_MOUSE_NORMAL_SPEED_SCALE" +SDL_HINT_MOUSE_RELATIVE_CURSOR_VISIBLE = b"SDL_MOUSE_RELATIVE_CURSOR_VISIBLE" SDL_HINT_MOUSE_RELATIVE_MODE_CENTER = b"SDL_MOUSE_RELATIVE_MODE_CENTER" SDL_HINT_MOUSE_RELATIVE_MODE_WARP = b"SDL_MOUSE_RELATIVE_MODE_WARP" SDL_HINT_MOUSE_RELATIVE_SCALING = b"SDL_MOUSE_RELATIVE_SCALING" @@ -289,7 +315,10 @@ SDL_HINT_MOUSE_RELATIVE_SYSTEM_SCALE = b"SDL_MOUSE_RELATIVE_SYSTEM_SCALE" SDL_HINT_MOUSE_RELATIVE_WARP_MOTION = b"SDL_MOUSE_RELATIVE_WARP_MOTION" SDL_HINT_MOUSE_TOUCH_EVENTS = b"SDL_MOUSE_TOUCH_EVENTS" +SDL_HINT_ROG_GAMEPAD_MICE = b"SDL_ROG_GAMEPAD_MICE" +SDL_HINT_ROG_GAMEPAD_MICE_EXCLUDED = b"SDL_ROG_GAMEPAD_MICE_EXCLUDED" SDL_HINT_TOUCH_MOUSE_EVENTS = b"SDL_TOUCH_MOUSE_EVENTS" +SDL_HINT_TRACKPAD_IS_TOUCH_ONLY = b"SDL_TRACKPAD_IS_TOUCH_ONLY" # Joystick & Gamepad Hints @@ -305,6 +334,14 @@ SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS = b"SDL_GAMECONTROLLER_USE_BUTTON_LABELS" SDL_HINT_HIDAPI_IGNORE_DEVICES = b"SDL_HIDAPI_IGNORE_DEVICES" SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS = b"SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS" +SDL_HINT_JOYSTICK_ARCADESTICK_DEVICES = b"SDL_JOYSTICK_ARCADESTICK_DEVICES" +SDL_HINT_JOYSTICK_ARCADESTICK_DEVICES_EXCLUDED = b"SDL_JOYSTICK_ARCADESTICK_DEVICES_EXCLUDED" +SDL_HINT_JOYSTICK_BLACKLIST_DEVICES = b"SDL_JOYSTICK_BLACKLIST_DEVICES" +SDL_HINT_JOYSTICK_BLACKLIST_DEVICES_EXCLUDED = b"SDL_JOYSTICK_BLACKLIST_DEVICES_EXCLUDED" +SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES = b"SDL_JOYSTICK_FLIGHTSTICK_DEVICES" +SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED = b"SDL_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED" +SDL_HINT_JOYSTICK_GAMECUBE_DEVICES = b"SDL_JOYSTICK_GAMECUBE_DEVICES" +SDL_HINT_JOYSTICK_GAMECUBE_DEVICES_EXCLUDED = b"SDL_JOYSTICK_GAMECUBE_DEVICES_EXCLUDED" SDL_HINT_JOYSTICK_HIDAPI = b"SDL_JOYSTICK_HIDAPI" SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT = b"SDL_JOYSTICK_HIDAPI_CORRELATE_XINPUT" SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE = b"SDL_JOYSTICK_HIDAPI_GAMECUBE" @@ -324,6 +361,7 @@ SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE = b"SDL_JOYSTICK_HIDAPI_PS5_RUMBLE" SDL_HINT_JOYSTICK_HIDAPI_STADIA = b"SDL_JOYSTICK_HIDAPI_STADIA" SDL_HINT_JOYSTICK_HIDAPI_STEAM = b"SDL_JOYSTICK_HIDAPI_STEAM" +SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK = b"SDL_JOYSTICK_HIDAPI_STEAMDECK" SDL_HINT_JOYSTICK_HIDAPI_SWITCH = b"SDL_JOYSTICK_HIDAPI_SWITCH" SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED = b"SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED" SDL_HINT_JOYSTICK_HIDAPI_SWITCH_PLAYER_LED = b"SDL_JOYSTICK_HIDAPI_SWITCH_PLAYER_LED" @@ -339,14 +377,22 @@ SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT = b"SDL_JOYSTICK_RAWINPUT_CORRELATE_XINPUT" SDL_HINT_JOYSTICK_ROG_CHAKRAM = b"SDL_JOYSTICK_ROG_CHAKRAM" SDL_HINT_JOYSTICK_THREAD = b"SDL_JOYSTICK_THREAD" +SDL_HINT_JOYSTICK_THROTTLE_DEVICES = b"SDL_JOYSTICK_THROTTLE_DEVICES" +SDL_HINT_JOYSTICK_THROTTLE_DEVICES_EXCLUDED = b"SDL_JOYSTICK_THROTTLE_DEVICES_EXCLUDED" SDL_HINT_JOYSTICK_WGI = b"SDL_JOYSTICK_WGI" +SDL_HINT_JOYSTICK_WHEEL_DEVICES = b"SDL_JOYSTICK_WHEEL_DEVICES" +SDL_HINT_JOYSTICK_WHEEL_DEVICES_EXCLUDED = b"SDL_JOYSTICK_WHEEL_DEVICES_EXCLUDED" SDL_HINT_JOYSTICK_DEVICE = b"SDL_JOYSTICK_DEVICE" +SDL_HINT_JOYSTICK_ZERO_CENTERED_DEVICES = b"SDL_JOYSTICK_ZERO_CENTERED_DEVICES" # Platform Specific Hints +SDL_HINT_DIRECTINPUT_ENABLED = b"SDL_DIRECTINPUT_ENABLED" SDL_HINT_EMSCRIPTEN_ASYNCIFY = b"SDL_EMSCRIPTEN_ASYNCIFY" SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT = b"SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" +SDL_HINT_JOYSTICK_IOKIT = b"SDL_JOYSTICK_IOKIT" +SDL_HINT_KMSDRM_DEVICE_INDEX = b"SDL_KMSDRM_DEVICE_INDEX" 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" @@ -359,6 +405,7 @@ SDL_HINT_RPI_VIDEO_LAYER = b"SDL_RPI_VIDEO_LAYER" SDL_HINT_RENDER_DIRECT3D11_DEBUG = b"SDL_RENDER_DIRECT3D11_DEBUG" SDL_HINT_RENDER_DIRECT3D_THREADSAFE = b"SDL_RENDER_DIRECT3D_THREADSAFE" +SDL_HINT_SHUTDOWN_DBUS_ON_QUIT = b"SDL_SHUTDOWN_DBUS_ON_QUIT" SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES = b"SDL_VIDEO_MAC_FULLSCREEN_SPACES" SDL_HINT_VIDEO_WIN_D3DCOMPILER = b"SDL_VIDEO_WIN_D3DCOMPILER" SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 = b"SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" @@ -393,6 +440,7 @@ SDL_HINT_ENABLE_SCREEN_KEYBOARD = b"SDL_ENABLE_SCREEN_KEYBOARD" SDL_HINT_IDLE_TIMER_DISABLED = b"SDL_IOS_IDLE_TIMER_DISABLED" SDL_HINT_IOS_HIDE_HOME_INDICATOR = "SDL_IOS_HIDE_HOME_INDICATOR" +SDL_HINT_JOYSTICK_MFI = b"SDL_JOYSTICK_MFI" SDL_HINT_VITA_TOUCH_MOUSE_DEVICE = b"SDL_HINT_VITA_TOUCH_MOUSE_DEVICE" SDL_HINT_WINRT_PRIVACY_POLICY_URL = b"SDL_WINRT_PRIVACY_POLICY_URL" SDL_HINT_WINRT_PRIVACY_POLICY_LABEL = b"SDL_WINRT_PRIVACY_POLICY_LABEL" diff --git a/sdl2/pixels.py b/sdl2/pixels.py index bc7a6d7d..f09f02f8 100644 --- a/sdl2/pixels.py +++ b/sdl2/pixels.py @@ -15,7 +15,7 @@ "SDL_PIXELTYPE_INDEX1", "SDL_PIXELTYPE_INDEX4", "SDL_PIXELTYPE_INDEX8", "SDL_PIXELTYPE_PACKED8", "SDL_PIXELTYPE_PACKED16", "SDL_PIXELTYPE_PACKED32", "SDL_PIXELTYPE_ARRAYU8", "SDL_PIXELTYPE_ARRAYU16", "SDL_PIXELTYPE_ARRAYU32", - "SDL_PIXELTYPE_ARRAYF16", "SDL_PIXELTYPE_ARRAYF32", + "SDL_PIXELTYPE_ARRAYF16", "SDL_PIXELTYPE_ARRAYF32", "SDL_PIXELTYPE_INDEX2", "SDL_BitmapOrder", "SDL_BITMAPORDER_NONE", "SDL_BITMAPORDER_4321", "SDL_BITMAPORDER_1234", @@ -41,6 +41,7 @@ "SDL_PixelFormatEnum", "SDL_PIXELFORMAT_UNKNOWN", "SDL_PIXELFORMAT_INDEX1LSB", "SDL_PIXELFORMAT_INDEX1MSB", + "SDL_PIXELFORMAT_INDEX2LSB", "SDL_PIXELFORMAT_INDEX2MSB", "SDL_PIXELFORMAT_INDEX4LSB", "SDL_PIXELFORMAT_INDEX4MSB", "SDL_PIXELFORMAT_INDEX8", "SDL_PIXELFORMAT_RGB332", @@ -62,6 +63,8 @@ "SDL_PIXELFORMAT_ARGB2101010", "SDL_PIXELFORMAT_RGBA32", "SDL_PIXELFORMAT_ARGB32", "SDL_PIXELFORMAT_BGRA32", "SDL_PIXELFORMAT_ABGR32", + "SDL_PIXELFORMAT_RGBX32", "SDL_PIXELFORMAT_XRGB32", + "SDL_PIXELFORMAT_BGRX32", "SDL_PIXELFORMAT_XBGR32", "SDL_PIXELFORMAT_YV12", "SDL_PIXELFORMAT_IYUV", "SDL_PIXELFORMAT_YUY2", "SDL_PIXELFORMAT_UYVY", "SDL_PIXELFORMAT_YVYU", "SDL_PIXELFORMAT_NV12", "SDL_PIXELFORMAT_NV21", @@ -100,6 +103,7 @@ SDL_PIXELTYPE_ARRAYU32 = 9 SDL_PIXELTYPE_ARRAYF16 = 10 SDL_PIXELTYPE_ARRAYF32 = 11 +SDL_PIXELTYPE_INDEX2 = 12 SDL_BitmapOrder = c_int SDL_BITMAPORDER_NONE = 0 @@ -172,6 +176,7 @@ def SDL_ISPIXELFORMAT_INDEXED(pformat): return ( SDL_ISPIXELFORMAT_FOURCC(pformat) == False and ( (SDL_PIXELTYPE(pformat) == SDL_PIXELTYPE_INDEX1) or + (SDL_PIXELTYPE(pformat) == SDL_PIXELTYPE_INDEX2) or (SDL_PIXELTYPE(pformat) == SDL_PIXELTYPE_INDEX4) or (SDL_PIXELTYPE(pformat) == SDL_PIXELTYPE_INDEX8) )) @@ -229,6 +234,16 @@ def SDL_ISPIXELFORMAT_ALPHA(pformat): SDL_BITMAPORDER_1234, 0, 1, 0 ) +SDL_PIXELFORMAT_INDEX2LSB = SDL_DEFINE_PIXELFORMAT( + SDL_PIXELTYPE_INDEX2, + SDL_BITMAPORDER_4321, + 0, 2, 0 +) +SDL_PIXELFORMAT_INDEX2MSB = SDL_DEFINE_PIXELFORMAT( + SDL_PIXELTYPE_INDEX2, + SDL_BITMAPORDER_1234, + 0, 2, 0 +) SDL_PIXELFORMAT_INDEX4LSB = SDL_DEFINE_PIXELFORMAT( SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, @@ -384,11 +399,19 @@ def SDL_ISPIXELFORMAT_ALPHA(pformat): SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_ARGB8888 SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_BGRA8888 SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_ABGR8888 + SDL_PIXELFORMAT_RGBX32 = SDL_PIXELFORMAT_RGBX8888 + SDL_PIXELFORMAT_XRGB32 = SDL_PIXELFORMAT_XRGB8888 + SDL_PIXELFORMAT_BGRX32 = SDL_PIXELFORMAT_BGRX8888 + SDL_PIXELFORMAT_XBGR32 = SDL_PIXELFORMAT_XBGR8888 else: SDL_PIXELFORMAT_RGBA32 = SDL_PIXELFORMAT_ABGR8888 SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_BGRA8888 SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_ARGB8888 SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_RGBA8888 + SDL_PIXELFORMAT_RGBX32 = SDL_PIXELFORMAT_XBGR8888 + SDL_PIXELFORMAT_XRGB32 = SDL_PIXELFORMAT_BGRX8888 + SDL_PIXELFORMAT_BGRX32 = SDL_PIXELFORMAT_XRGB8888 + SDL_PIXELFORMAT_XBGR32 = SDL_PIXELFORMAT_RGBX8888 SDL_PIXELFORMAT_YV12 = SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2') SDL_PIXELFORMAT_IYUV = SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V') SDL_PIXELFORMAT_YUY2 = SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2') @@ -444,6 +467,13 @@ def SDL_ISPIXELFORMAT_ALPHA(pformat): } if sdl_version >= 2012: NAME_MAP['BGR444'] = SDL_PIXELFORMAT_BGR444 +if sdl_version >= 2300: + NAME_MAP['INDEX2LSB'] = SDL_PIXELFORMAT_INDEX2LSB + NAME_MAP['INDEX2MSB'] = SDL_PIXELFORMAT_INDEX2MSB + NAME_MAP['RGBX32'] = SDL_PIXELFORMAT_RGBX32 + NAME_MAP['XRGB32'] = SDL_PIXELFORMAT_XRGB32 + NAME_MAP['BGRX32'] = SDL_PIXELFORMAT_BGRX32 + NAME_MAP['XBGR32'] = SDL_PIXELFORMAT_XBGR32 ALL_PIXELFORMATS = tuple(NAME_MAP.values()) diff --git a/sdl2/test/gamecontroller_test.py b/sdl2/test/gamecontroller_test.py index f509a887..c903c74f 100644 --- a/sdl2/test/gamecontroller_test.py +++ b/sdl2/test/gamecontroller_test.py @@ -268,6 +268,12 @@ def test_SDL_GameControllerGetSerial(gamepads): serial = sdl2.SDL_GameControllerGetSerial(pad) assert serial == None or type(serial) in (str, bytes) +@pytest.mark.skipif(sdl2.dll.version < 2300, reason="not available") +def test_SDL_GameControllerGetSteamHandle(gamepads): + for pad in gamepads: + handle = sdl2.SDL_GameControllerGetSteamHandle(pad) + assert handle >= 0 + def test_SDL_GameControllerGetAttached(gamepads): for pad in gamepads: ret = sdl2.SDL_GameControllerGetAttached(pad) diff --git a/sdl2/version.py b/sdl2/version.py index 005500e7..15feae03 100644 --- a/sdl2/version.py +++ b/sdl2/version.py @@ -19,8 +19,8 @@ # Constants, enums, & macros SDL_MAJOR_VERSION = 2 -SDL_MINOR_VERSION = 28 -SDL_PATCHLEVEL = 5 +SDL_MINOR_VERSION = 30 +SDL_PATCHLEVEL = 10 def SDL_VERSION(x): x.major = SDL_MAJOR_VERSION