Improve typing.

Author: Aermoss

sdl3/SDL_assert.py

@@ -1,8 +1,8 @@
 from .__init__ import os, inspect, ctypes, typing, abc, re, \
     SDL_FUNC_TYPE, SDL_POINTER, SDL_FUNC, SDL_TYPE, SDL_BINARY, SDL_ENUM
 
-SDL_ASSERT_LEVEL = 2
-SDL_NULL_WHILE_LOOP_CONDITION = 0
+SDL_ASSERT_LEVEL: int = 2
+SDL_NULL_WHILE_LOOP_CONDITION: int = 0
 
 SDL_AssertState: typing.TypeAlias = SDL_TYPE["SDL_AssertState", SDL_ENUM]
 
@@ -27,10 +27,10 @@ class SDL_AssertData(ctypes.Structure):
 SDL_TriggerBreakpoint: abc.Callable[[], None] = lambda: breakpoint()
 SDL_AssertBreakpoint: abc.Callable[[], None] = lambda: SDL_TriggerBreakpoint()
 
-def SDL_disabled_assert(condition: ctypes.c_bool) -> None:
+def SDL_disabled_assert(condition: bool) -> None:
     """Do not call this function directly."""
 
-def SDL_enabled_assert(condition: ctypes.c_bool) -> None:
+def SDL_enabled_assert(condition: bool) -> None:
     """Do not call this function directly."""
 
     while not condition:

sdl3/SDL_audio.py

@@ -5,25 +5,25 @@
 from .SDL_properties import SDL_PropertiesID
 from .SDL_iostream import SDL_IOStream
 
-SDL_AUDIO_MASK_BITSIZE = 0xFF
-SDL_AUDIO_MASK_FLOAT = 1 << 8
-SDL_AUDIO_MASK_BIG_ENDIAN = 1 << 12
-SDL_AUDIO_MASK_SIGNED = 1 << 15
+SDL_AUDIO_MASK_BITSIZE: int = 0xFF
+SDL_AUDIO_MASK_FLOAT: int = 1 << 8
+SDL_AUDIO_MASK_BIG_ENDIAN: int = 1 << 12
+SDL_AUDIO_MASK_SIGNED: int = 1 << 15
 
 SDL_DEFINE_AUDIO_FORMAT: abc.Callable[[int, int, int, int], int] = lambda signed, bigendian, _float, size: \
     (signed << 15) | (bigendian << 12) | (_float << 8) | (size & SDL_AUDIO_MASK_BITSIZE)
 
 SDL_AudioFormat: typing.TypeAlias = SDL_TYPE["SDL_AudioFormat", SDL_ENUM]
 
-SDL_AUDIO_UNKNOWN = 0x0000
-SDL_AUDIO_U8 = 0x0008
-SDL_AUDIO_S8 = 0x8008
-SDL_AUDIO_S16LE = 0x8010
-SDL_AUDIO_S16BE = 0x9010
-SDL_AUDIO_S32LE = 0x8020
-SDL_AUDIO_S32BE = 0x9020
-SDL_AUDIO_F32LE = 0x8120
-SDL_AUDIO_F32BE = 0x9120
+SDL_AUDIO_UNKNOWN: int = 0x0000
+SDL_AUDIO_U8: int = 0x0008
+SDL_AUDIO_S8: int = 0x8008
+SDL_AUDIO_S16LE: int = 0x8010
+SDL_AUDIO_S16BE: int = 0x9010
+SDL_AUDIO_S32LE: int = 0x8020
+SDL_AUDIO_S32BE: int = 0x9020
+SDL_AUDIO_F32LE: int = 0x8120
+SDL_AUDIO_F32BE: int = 0x9120
 
 if SDL_BYTEORDER == SDL_LIL_ENDIAN:
     SDL_AUDIO_S16, SDL_AUDIO_S32, SDL_AUDIO_F32 = SDL_AUDIO_S16LE, SDL_AUDIO_S32LE, SDL_AUDIO_F32LE
@@ -43,8 +43,8 @@
 
 SDL_AudioDeviceID: typing.TypeAlias = SDL_TYPE["SDL_AudioDeviceID", ctypes.c_uint32]
 
-SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK = 0xFFFFFFFF
-SDL_AUDIO_DEVICE_DEFAULT_RECORDING = 0xFFFFFFFE
+SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK: int = 0xFFFFFFFF
+SDL_AUDIO_DEVICE_DEFAULT_RECORDING: int = 0xFFFFFFFE
 
 class SDL_AudioSpec(ctypes.Structure):
     _fields_ = [

sdl3/SDL_bits.py

@@ -1,5 +1,18 @@
-from .__init__ import ctypes
+from .__init__ import *
 
-def SDL_HasExactlyOneBitSet32(x: ctypes.c_uint32) -> ctypes.c_bool:
-    if x and not (x & (x - 1)): return ctypes.c_bool(True)
-    else: return ctypes.c_bool(False)
+def SDL_MostSignificantBitIndex32(x: int) -> int:
+    if x == 0: return -1
+    b: list[int] = [0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000]
+    S: list[int] = [1, 2, 4, 8, 16]
+    msbIndex: int = 0
+
+    for i in range(4, -1, -1):
+        if x & b[i]:
+            x >>= S[i]
+            msbIndex |= S[i]
+
+    return msbIndex
+
+def SDL_HasExactlyOneBitSet32(x: int) -> bool:
+    if x and not (x & (x - 1)): return True
+    else: return False

sdl3/SDL_blendmode.py

@@ -3,14 +3,14 @@
 
 SDL_BlendMode: typing.TypeAlias = SDL_TYPE["SDL_BlendMode", ctypes.c_uint32]
 
-SDL_BLENDMODE_NONE = 0x00000000
-SDL_BLENDMODE_BLEND = 0x00000001
-SDL_BLENDMODE_BLEND_PREMULTIPLIED = 0x00000010
-SDL_BLENDMODE_ADD = 0x00000002
-SDL_BLENDMODE_ADD_PREMULTIPLIED = 0x00000020
-SDL_BLENDMODE_MOD = 0x00000004
-SDL_BLENDMODE_MUL = 0x00000008
-SDL_BLENDMODE_INVALID = 0x7FFFFFFF
+SDL_BLENDMODE_NONE: int = 0x00000000
+SDL_BLENDMODE_BLEND: int = 0x00000001
+SDL_BLENDMODE_BLEND_PREMULTIPLIED: int = 0x00000010
+SDL_BLENDMODE_ADD: int = 0x00000002
+SDL_BLENDMODE_ADD_PREMULTIPLIED: int = 0x00000020
+SDL_BLENDMODE_MOD: int = 0x00000004
+SDL_BLENDMODE_MUL: int = 0x00000008
+SDL_BLENDMODE_INVALID: int = 0x7FFFFFFF
 
 SDL_BlendOperation: typing.TypeAlias = SDL_TYPE["SDL_BlendOperation", SDL_ENUM]
 

sdl3/SDL_cpuinfo.py

@@ -1,6 +1,6 @@
 from .__init__ import ctypes, typing, abc, SDL_FUNC, SDL_BINARY
 
-SDL_CACHELINE_SIZE = 128
+SDL_CACHELINE_SIZE: int = 128
 
 SDL_GetNumLogicalCPUCores: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetNumLogicalCPUCores", ctypes.c_int, [], SDL_BINARY]
 SDL_GetCPUCacheLineSize: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetCPUCacheLineSize", ctypes.c_int, [], SDL_BINARY]

sdl3/SDL_dialog.py

@@ -22,11 +22,11 @@ class SDL_DialogFileFilter(ctypes.Structure):
 
 SDL_ShowFileDialogWithProperties: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ShowFileDialogWithProperties", None, [SDL_FileDialogType, SDL_DialogFileCallback, ctypes.c_void_p, SDL_PropertiesID], SDL_BINARY]
 
-SDL_PROP_FILE_DIALOG_FILTERS_POINTER = "SDL.filedialog.filters".encode()
-SDL_PROP_FILE_DIALOG_NFILTERS_NUMBER = "SDL.filedialog.nfilters".encode()
-SDL_PROP_FILE_DIALOG_WINDOW_POINTER = "SDL.filedialog.window".encode()
-SDL_PROP_FILE_DIALOG_LOCATION_STRING = "SDL.filedialog.location".encode()
-SDL_PROP_FILE_DIALOG_MANY_BOOLEAN = "SDL.filedialog.many".encode()
-SDL_PROP_FILE_DIALOG_TITLE_STRING = "SDL.filedialog.title".encode()
-SDL_PROP_FILE_DIALOG_ACCEPT_STRING = "SDL.filedialog.accept".encode()
-SDL_PROP_FILE_DIALOG_CANCEL_STRING = "SDL.filedialog.cancel".encode()
+SDL_PROP_FILE_DIALOG_FILTERS_POINTER: bytes = "SDL.filedialog.filters".encode()
+SDL_PROP_FILE_DIALOG_NFILTERS_NUMBER: bytes = "SDL.filedialog.nfilters".encode()
+SDL_PROP_FILE_DIALOG_WINDOW_POINTER: bytes = "SDL.filedialog.window".encode()
+SDL_PROP_FILE_DIALOG_LOCATION_STRING: bytes = "SDL.filedialog.location".encode()
+SDL_PROP_FILE_DIALOG_MANY_BOOLEAN: bytes = "SDL.filedialog.many".encode()
+SDL_PROP_FILE_DIALOG_TITLE_STRING: bytes = "SDL.filedialog.title".encode()
+SDL_PROP_FILE_DIALOG_ACCEPT_STRING: bytes = "SDL.filedialog.accept".encode()
+SDL_PROP_FILE_DIALOG_CANCEL_STRING: bytes = "SDL.filedialog.cancel".encode()

sdl3/SDL_endian.py

@@ -1,8 +1,7 @@
 from .__init__ import sys, array
 
 SDL_LIL_ENDIAN, SDL_BIG_ENDIAN = 1234, 4321
-SDL_BYTEORDER = SDL_LIL_ENDIAN \
-    if sys.byteorder == "little" else SDL_BIG_ENDIAN
+SDL_BYTEORDER: int = {"little": SDL_LIL_ENDIAN, "big": SDL_BIG_ENDIAN}[sys.byteorder]
 
 def SDL_Swap16(x: int) -> int:
     return ((x << 8) & 0xFF00) | ((x >> 8) & 0x00FF)

sdl3/SDL_error.py

@@ -10,5 +10,4 @@ def SDL_Unsupported() -> ctypes.c_int:
     return SDL_SetError("That operation is not supported".encode())
 
 def SDL_InvalidParamError(param: ctypes.c_char_p) -> ctypes.c_int:
-    if isinstance(param, bytes): param = param.decode()
-    return SDL_SetError(f"Parameter '{param}' is invalid".encode())
+    return SDL_SetError("Parameter '%s' is invalid".encode(), param)

sdl3/SDL_events.py

@@ -16,14 +16,14 @@
 
 SDL_EventType: typing.TypeAlias = SDL_TYPE["SDL_EventType", SDL_ENUM]
 
-SDL_EVENT_FIRST = 0x0
+SDL_EVENT_FIRST: int = 0x0
 
 SDL_EVENT_QUIT, SDL_EVENT_TERMINATING, SDL_EVENT_LOW_MEMORY, SDL_EVENT_WILL_ENTER_BACKGROUND, \
     SDL_EVENT_DID_ENTER_BACKGROUND, SDL_EVENT_WILL_ENTER_FOREGROUND, SDL_EVENT_DID_ENTER_FOREGROUND, \
-        SDL_EVENT_LOCALE_CHANGED, SDL_EVENT_SYSTEM_THEME_CHANGED = range(_ := 0x100, _ + 9)
+        SDL_EVENT_LOCALE_CHANGED, SDL_EVENT_SYSTEM_THEME_CHANGED = range(0x100, 0x109)
 
 SDL_EVENT_DISPLAY_ORIENTATION, SDL_EVENT_DISPLAY_ADDED, SDL_EVENT_DISPLAY_REMOVED, SDL_EVENT_DISPLAY_MOVED, \
-    SDL_EVENT_DISPLAY_DESKTOP_MODE_CHANGED, SDL_EVENT_DISPLAY_CURRENT_MODE_CHANGED, SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED = range(_ := 0x151, _ + 7)
+    SDL_EVENT_DISPLAY_DESKTOP_MODE_CHANGED, SDL_EVENT_DISPLAY_CURRENT_MODE_CHANGED, SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED = range(0x151, 0x158)
 
 SDL_EVENT_DISPLAY_FIRST, SDL_EVENT_DISPLAY_LAST = \
     SDL_EVENT_DISPLAY_ORIENTATION, SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED
@@ -33,53 +33,53 @@
         SDL_EVENT_WINDOW_RESTORED, SDL_EVENT_WINDOW_MOUSE_ENTER, SDL_EVENT_WINDOW_MOUSE_LEAVE, SDL_EVENT_WINDOW_FOCUS_GAINED, SDL_EVENT_WINDOW_FOCUS_LOST, \
             SDL_EVENT_WINDOW_CLOSE_REQUESTED, SDL_EVENT_WINDOW_HIT_TEST, SDL_EVENT_WINDOW_ICCPROF_CHANGED, SDL_EVENT_WINDOW_DISPLAY_CHANGED, SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED, \
                 SDL_EVENT_WINDOW_SAFE_AREA_CHANGED, SDL_EVENT_WINDOW_OCCLUDED, SDL_EVENT_WINDOW_ENTER_FULLSCREEN, SDL_EVENT_WINDOW_LEAVE_FULLSCREEN, \
-                    SDL_EVENT_WINDOW_DESTROYED, SDL_EVENT_WINDOW_HDR_STATE_CHANGED = range(_ := 0x202, _ + 25)
+                    SDL_EVENT_WINDOW_DESTROYED, SDL_EVENT_WINDOW_HDR_STATE_CHANGED = range(0x202, 0x21B)
 
 SDL_EVENT_WINDOW_FIRST, SDL_EVENT_WINDOW_LAST = \
     SDL_EVENT_WINDOW_SHOWN, SDL_EVENT_WINDOW_HDR_STATE_CHANGED
 
 SDL_EVENT_KEY_DOWN, SDL_EVENT_KEY_UP, SDL_EVENT_TEXT_EDITING, SDL_EVENT_TEXT_INPUT, SDL_EVENT_KEYMAP_CHANGED, \
-    SDL_EVENT_KEYBOARD_ADDED, SDL_EVENT_KEYBOARD_REMOVED, SDL_EVENT_TEXT_EDITING_CANDIDATES = range(_ := 0x300, _ + 8)
+    SDL_EVENT_KEYBOARD_ADDED, SDL_EVENT_KEYBOARD_REMOVED, SDL_EVENT_TEXT_EDITING_CANDIDATES = range(0x300, 0x308)
 
 SDL_EVENT_MOUSE_MOTION, SDL_EVENT_MOUSE_BUTTON_DOWN, SDL_EVENT_MOUSE_BUTTON_UP, \
-    SDL_EVENT_MOUSE_WHEEL, SDL_EVENT_MOUSE_ADDED, SDL_EVENT_MOUSE_REMOVED = range(_ := 0x400, _ + 6)
+    SDL_EVENT_MOUSE_WHEEL, SDL_EVENT_MOUSE_ADDED, SDL_EVENT_MOUSE_REMOVED = range(0x400, 0x406)
 
 SDL_EVENT_JOYSTICK_AXIS_MOTION, SDL_EVENT_JOYSTICK_BALL_MOTION, SDL_EVENT_JOYSTICK_HAT_MOTION, SDL_EVENT_JOYSTICK_BUTTON_DOWN, SDL_EVENT_JOYSTICK_BUTTON_UP, \
-    SDL_EVENT_JOYSTICK_ADDED, SDL_EVENT_JOYSTICK_REMOVED, SDL_EVENT_JOYSTICK_BATTERY_UPDATED, SDL_EVENT_JOYSTICK_UPDATE_COMPLETE = range(_ := 0x600, _ + 9)
+    SDL_EVENT_JOYSTICK_ADDED, SDL_EVENT_JOYSTICK_REMOVED, SDL_EVENT_JOYSTICK_BATTERY_UPDATED, SDL_EVENT_JOYSTICK_UPDATE_COMPLETE = range(0x600, 0x609)
 
 SDL_EVENT_GAMEPAD_AXIS_MOTION, SDL_EVENT_GAMEPAD_BUTTON_DOWN, SDL_EVENT_GAMEPAD_BUTTON_UP, SDL_EVENT_GAMEPAD_ADDED, SDL_EVENT_GAMEPAD_REMOVED, \
     SDL_EVENT_GAMEPAD_REMAPPED, SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN, SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION, SDL_EVENT_GAMEPAD_TOUCHPAD_UP, SDL_EVENT_GAMEPAD_SENSOR_UPDATE, \
-        SDL_EVENT_GAMEPAD_UPDATE_COMPLETE, SDL_EVENT_GAMEPAD_STEAM_HANDLE_UPDATED = range(_ := 0x650, _ + 12)
+        SDL_EVENT_GAMEPAD_UPDATE_COMPLETE, SDL_EVENT_GAMEPAD_STEAM_HANDLE_UPDATED = range(0x650, 0x65C)
 
 SDL_EVENT_FINGER_DOWN, SDL_EVENT_FINGER_UP, SDL_EVENT_FINGER_MOTION, \
-    SDL_EVENT_FINGER_CANCELED = range(_ := 0x700, _ + 4)
+    SDL_EVENT_FINGER_CANCELED = range(0x700, 0x704)
 
-SDL_EVENT_CLIPBOARD_UPDATE = 0x900
+SDL_EVENT_CLIPBOARD_UPDATE: int = 0x900
 
 SDL_EVENT_DROP_FILE, SDL_EVENT_DROP_TEXT, SDL_EVENT_DROP_BEGIN, \
-    SDL_EVENT_DROP_COMPLETE, SDL_EVENT_DROP_POSITION = range(_ := 0x1000, _ + 5)
+    SDL_EVENT_DROP_COMPLETE, SDL_EVENT_DROP_POSITION = range(0x1000, 0x1005)
 
 SDL_EVENT_AUDIO_DEVICE_ADDED, SDL_EVENT_AUDIO_DEVICE_REMOVED, \
-    SDL_EVENT_AUDIO_DEVICE_FORMAT_CHANGED = range(_ := 0x1100, _ + 3)
+    SDL_EVENT_AUDIO_DEVICE_FORMAT_CHANGED = range(0x1100, 0x1103)
 
-SDL_EVENT_SENSOR_UPDATE = 0x1200
+SDL_EVENT_SENSOR_UPDATE: int = 0x1200
 
 SDL_EVENT_PEN_PROXIMITY_IN, SDL_EVENT_PEN_PROXIMITY_OUT, SDL_EVENT_PEN_DOWN, SDL_EVENT_PEN_UP, SDL_EVENT_PEN_BUTTON_DOWN, \
-    SDL_EVENT_PEN_BUTTON_UP, SDL_EVENT_PEN_MOTION, SDL_EVENT_PEN_AXIS = range(_ := 0x1300, _ + 8)
+    SDL_EVENT_PEN_BUTTON_UP, SDL_EVENT_PEN_MOTION, SDL_EVENT_PEN_AXIS = range(0x1300, 0x1308)
 
 SDL_EVENT_CAMERA_DEVICE_ADDED, SDL_EVENT_CAMERA_DEVICE_REMOVED, \
-    SDL_EVENT_CAMERA_DEVICE_APPROVED, SDL_EVENT_CAMERA_DEVICE_DENIED = range(_ := 0x1400, _ + 4)
+    SDL_EVENT_CAMERA_DEVICE_APPROVED, SDL_EVENT_CAMERA_DEVICE_DENIED = range(0x1400, 0x1404)
 
 SDL_EVENT_RENDER_TARGETS_RESET, SDL_EVENT_RENDER_DEVICE_RESET, \
-    SDL_EVENT_RENDER_DEVICE_LOST = range(_ := 0x2000, _ + 3)
+    SDL_EVENT_RENDER_DEVICE_LOST = range(0x2000, 0x2003)
 
 SDL_EVENT_PRIVATE0, SDL_EVENT_PRIVATE1, SDL_EVENT_PRIVATE2, \
-    SDL_EVENT_PRIVATE3 = range(_ := 0x4000, _ + 4)
+    SDL_EVENT_PRIVATE3 = range(0x4000, 0x4004)
 
-SDL_EVENT_POLL_SENTINEL = 0x7F00
-SDL_EVENT_USER = 0x8000
-SDL_EVENT_LAST = 0xFFFF
-SDL_EVENT_ENUM_PADDING = 0x7FFFFFFF
+SDL_EVENT_POLL_SENTINEL: int = 0x7F00
+SDL_EVENT_USER: int = 0x8000
+SDL_EVENT_LAST: int = 0xFFFF
+SDL_EVENT_ENUM_PADDING: int = 0x7FFFFFFF
 
 class SDL_CommonEvent(ctypes.Structure):
     _fields_ = [

sdl3/SDL_filesystem.py

@@ -28,7 +28,7 @@ class SDL_PathInfo(ctypes.Structure):
 
 SDL_GlobFlags: typing.TypeAlias = SDL_TYPE["SDL_GlobFlags", ctypes.c_uint32]
 
-SDL_GLOB_CASEINSENSITIVE = 1 << 0
+SDL_GLOB_CASEINSENSITIVE: int = 1 << 0
 
 SDL_CreateDirectory: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CreateDirectory", ctypes.c_bool, [ctypes.c_char_p], SDL_BINARY]