Improve typing.

Aermoss · Aermoss · commit d7cbc263669c · 2025-03-23T00:37:22.000+03:00
Also reorder some imports and variables.
diff --git a/sdl3/SDL_audio.py b/sdl3/SDL_audio.py
@@ -1,8 +1,8 @@
 from .__init__ import ctypes, typing, abc, SDL_FUNC_TYPE, \
     SDL_POINTER, SDL_FUNC, SDL_TYPE, SDL_BINARY, SDL_ENUM
 
-from .SDL_endian import SDL_BYTEORDER, SDL_LIL_ENDIAN
 from .SDL_properties import SDL_PropertiesID
+from .SDL_endian import SDL_BYTEORDER, SDL_LIL_ENDIAN
 from .SDL_iostream import SDL_IOStream
 
 SDL_AUDIO_MASK_BITSIZE: int = 0xFF
diff --git a/sdl3/SDL_haptic.py b/sdl3/SDL_haptic.py
@@ -35,7 +35,7 @@ class SDL_Haptic(ctypes.c_void_p):
 class SDL_HapticDirection(ctypes.Structure):
     _fields_ = [
         ("type", ctypes.c_uint8),
-        ("dir", ctypes.c_int32* 3)
+        ("dir", ctypes.c_int32 * 3)
     ]
 
 class SDL_HapticConstant(ctypes.Structure):
@@ -79,12 +79,12 @@ class SDL_HapticCondition(ctypes.Structure):
         ("delay", ctypes.c_uint16),
         ("button", ctypes.c_uint16),
         ("interval", ctypes.c_uint16),
-        ("right_sat", ctypes.c_uint16* 3),
-        ("left_sat", ctypes.c_uint16* 3),
-        ("right_coeff", ctypes.c_int16* 3),
-        ("left_coeff", ctypes.c_int16* 3),
-        ("deadband", ctypes.c_uint16* 3),
-        ("center", ctypes.c_int16* 3)
+        ("right_sat", ctypes.c_uint16 * 3),
+        ("left_sat", ctypes.c_uint16 * 3),
+        ("right_coeff", ctypes.c_int16 * 3),
+        ("left_coeff", ctypes.c_int16 * 3),
+        ("deadband", ctypes.c_uint16 * 3),
+        ("center", ctypes.c_int16 * 3)
     ]
 
 class SDL_HapticRamp(ctypes.Structure):
diff --git a/sdl3/SDL_joystick.py b/sdl3/SDL_joystick.py
@@ -124,14 +124,10 @@ class SDL_VirtualJoystickDesc(ctypes.Structure):
 SDL_GetJoystickBall: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetJoystickBall", ctypes.c_bool, [SDL_POINTER[SDL_Joystick], ctypes.c_int, SDL_POINTER[ctypes.c_int], SDL_POINTER[ctypes.c_int]], SDL_BINARY]
 SDL_GetJoystickHat: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetJoystickHat", ctypes.c_uint8, [SDL_POINTER[SDL_Joystick], ctypes.c_int], SDL_BINARY]
 
-SDL_HAT_CENTERED, SDL_HAT_UP, SDL_HAT_RIGHT, \
-    SDL_HAT_DOWN, SDL_HAT_LEFT = 0x00, 0x01, 0x02, 0x04, 0x08
+SDL_HAT_CENTERED, SDL_HAT_UP, SDL_HAT_RIGHT, SDL_HAT_DOWN, SDL_HAT_LEFT = 0x00, 0x01, 0x02, 0x04, 0x08
 
-SDL_HAT_RIGHTUP, SDL_HAT_RIGHTDOWN = \
-    SDL_HAT_RIGHT | SDL_HAT_UP, SDL_HAT_RIGHT | SDL_HAT_DOWN
-
-SDL_HAT_LEFTUP, SDL_HAT_LEFTDOWN = \
-    SDL_HAT_LEFT | SDL_HAT_UP, SDL_HAT_LEFT | SDL_HAT_DOWN
+SDL_HAT_RIGHTUP, SDL_HAT_RIGHTDOWN, SDL_HAT_LEFTUP, SDL_HAT_LEFTDOWN = \
+    SDL_HAT_RIGHT | SDL_HAT_UP, SDL_HAT_RIGHT | SDL_HAT_DOWN, SDL_HAT_LEFT | SDL_HAT_UP, SDL_HAT_LEFT | SDL_HAT_DOWN
 
 SDL_GetJoystickButton: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetJoystickButton", ctypes.c_bool, [SDL_POINTER[SDL_Joystick], ctypes.c_int], SDL_BINARY]
 SDL_RumbleJoystick: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_RumbleJoystick", ctypes.c_bool, [SDL_POINTER[SDL_Joystick], ctypes.c_uint16, ctypes.c_uint16, ctypes.c_uint32], SDL_BINARY]
diff --git a/sdl3/SDL_mouse.py b/sdl3/SDL_mouse.py
@@ -28,8 +28,8 @@ class SDL_Cursor(ctypes.c_void_p):
 
 SDL_BUTTON_MASK: abc.Callable[..., int] = lambda x: 1 << (x - 1)
 
-SDL_BUTTON_LMASK, SDL_BUTTON_MMASK, SDL_BUTTON_RMASK, SDL_BUTTON_X1MASK, SDL_BUTTON_X2MASK = \
-    [SDL_BUTTON_MASK(x) for x in range(1, 6)]
+SDL_BUTTON_LMASK, SDL_BUTTON_MMASK, SDL_BUTTON_RMASK, \
+    SDL_BUTTON_X1MASK, SDL_BUTTON_X2MASK = [SDL_BUTTON_MASK(x) for x in range(1, 6)]
 
 SDL_HasMouse: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_HasMouse", ctypes.c_bool, [], SDL_BINARY]
 SDL_GetMice: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetMice", SDL_POINTER[SDL_MouseID], [SDL_POINTER[ctypes.c_int]], SDL_BINARY]
diff --git a/sdl3/SDL_pixels.py b/sdl3/SDL_pixels.py
@@ -1,8 +1,8 @@
 from .__init__ import ctypes, typing, abc, \
     SDL_POINTER, SDL_ENUM, SDL_FUNC, SDL_TYPE, SDL_BINARY
 
-from .SDL_endian import SDL_BYTEORDER, SDL_BIG_ENDIAN
 from .SDL_stdinc import SDL_FOURCC
+from .SDL_endian import SDL_BYTEORDER, SDL_BIG_ENDIAN
 
 SDL_ALPHA_OPAQUE, SDL_ALPHA_TRANSPARENT_FLOAT = 255, 1.0
 SDL_ALPHA_TRANSPARENT, SDL_ALPHA_OPAQUE_FLOAT = 0, 0.0
@@ -34,7 +34,7 @@
 def SDL_DEFINE_PIXELFORMAT(ptype: int, order: int, layout: int, bits: int, pbytes: int) -> int:
     return (1 << 28) | (ptype << 24) | (order << 20) | (layout << 16) | (bits << 8) | (pbytes << 0)
 
-SDL_DEFINE_PIXELFOURCC = SDL_FOURCC
+SDL_DEFINE_PIXELFOURCC: abc.Callable[[int, int, int, int], int] = SDL_FOURCC
 SDL_ISPIXELFORMAT_FOURCC: abc.Callable[..., bool] = lambda format: format and SDL_PIXELFLAG(format) != 1
 
 SDL_PIXELFLAG: abc.Callable[..., int] = lambda x: (x >> 28) & 0x0F
diff --git a/sdl3/SDL_render.py b/sdl3/SDL_render.py
@@ -2,10 +2,10 @@
     SDL_POINTER, SDL_ENUM, SDL_FUNC, SDL_TYPE, SDL_BINARY
 
 from .SDL_events import SDL_Event
+from .SDL_video import SDL_Window, SDL_WindowFlags
 from .SDL_rect import SDL_FPoint, SDL_Rect, SDL_FRect
-from .SDL_pixels import SDL_Color, SDL_FColor, SDL_PixelFormat
 from .SDL_surface import SDL_Surface, SDL_ScaleMode, SDL_FlipMode
-from .SDL_video import SDL_Window, SDL_WindowFlags
+from .SDL_pixels import SDL_FColor, SDL_PixelFormat
 from .SDL_properties import SDL_PropertiesID
 from .SDL_blendmode import SDL_BlendMode
 
diff --git a/sdl3/SDL_rtf.py b/sdl3/SDL_rtf.py
@@ -2,10 +2,10 @@
     SDL_FUNC_TYPE, SDL_FUNC, SDL_TYPE, SDL_RTF_BINARY, SDL_ENUM
 
 from .SDL_pixels import SDL_Color
+from .SDL_iostream import SDL_IOStream
 from .SDL_error import SDL_SetError, SDL_GetError
 from .SDL_render import SDL_Renderer, SDL_Texture
 from .SDL_version import SDL_VERSIONNUM
-from .SDL_iostream import SDL_IOStream
 from .SDL_rect import SDL_Rect
 
 SDL_RTF_MAJOR_VERSION, SDL_RTF_MINOR_VERSION, SDL_RTF_MICRO_VERSION = 3, 0, 0
diff --git a/sdl3/SDL_stdinc.py b/sdl3/SDL_stdinc.py
@@ -1,7 +1,8 @@
 from .__init__ import ctypes, typing, abc, SDL_VA_LIST, \
     SDL_POINTER, SDL_FUNC_TYPE, SDL_FUNC, SDL_TYPE, SDL_BINARY
 
-SDL_arraysize: abc.Callable[[typing.Any], int] = lambda array: ctypes.sizeof(array) // ctypes.sizeof(array[0])
+SDL_arraysize: abc.Callable[[typing.Any], int] = lambda array: \
+    ctypes.sizeof(array) // ctypes.sizeof(array[0])
 
 def SDL_FOURCC(a: int, b: int, c: int, d: int) -> int:
     return (ord(a) << 0) | (ord(b) << 8) | (ord(c) << 16) | (ord(d) << 24)
diff --git a/sdl3/SDL_storage.py b/sdl3/SDL_storage.py
@@ -1,8 +1,9 @@
 from .__init__ import ctypes, typing, abc, \
     SDL_POINTER, SDL_FUNC_TYPE, SDL_FUNC, SDL_BINARY
 
-from .SDL_filesystem import SDL_EnumerateDirectoryCallback, SDL_PathInfo, SDL_GlobFlags
 from .SDL_properties import SDL_PropertiesID
+from .SDL_filesystem import SDL_GlobFlags, \
+    SDL_EnumerateDirectoryCallback, SDL_PathInfo
 
 class SDL_StorageInterface(ctypes.Structure):
     _fields_ = [
diff --git a/sdl3/SDL_surface.py b/sdl3/SDL_surface.py
@@ -1,9 +1,9 @@
 from .__init__ import ctypes, typing, abc, \
     SDL_POINTER, SDL_ENUM, SDL_FUNC, SDL_TYPE, SDL_BINARY
 
-from .SDL_pixels import SDL_PixelFormat, SDL_Colorspace, SDL_Palette
-from .SDL_properties import SDL_PropertiesID
 from .SDL_blendmode import SDL_BlendMode
+from .SDL_properties import SDL_PropertiesID
+from .SDL_pixels import SDL_PixelFormat, SDL_Colorspace, SDL_Palette
 from .SDL_iostream import SDL_IOStream
 from .SDL_rect import SDL_Rect
 
diff --git a/sdl3/SDL_system.py b/sdl3/SDL_system.py
@@ -6,7 +6,7 @@
 if SDL_PLATFORM_SPECIFIC(system = ["Windows"]):
     import ctypes.wintypes as wintypes
 
-    MSG = wintypes.tagMSG
+    MSG: typing.TypeAlias = wintypes.tagMSG
     SDL_WindowsMessageHook: typing.TypeAlias = SDL_FUNC_TYPE["SDL_WindowsMessageHook", ctypes.c_bool, [ctypes.c_void_p, SDL_POINTER[MSG]]]
     SDL_SetWindowsMessageHook: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SetWindowsMessageHook", None, [SDL_WindowsMessageHook, ctypes.c_void_p], SDL_BINARY]
 
diff --git a/sdl3/SDL_ttf.py b/sdl3/SDL_ttf.py
@@ -2,13 +2,13 @@
     SDL_POINTER, SDL_FUNC, SDL_TYPE, SDL_TTF_BINARY, SDL_ENUM
 
 from .SDL_pixels import SDL_Color
+from .SDL_surface import SDL_Surface
+from .SDL_rect import SDL_Rect, SDL_FPoint
 from .SDL_gpu import SDL_GPUDevice, SDL_GPUTexture
 from .SDL_properties import SDL_PropertiesID
-from .SDL_render import SDL_Renderer
-from .SDL_surface import SDL_Surface
-from .SDL_iostream import SDL_IOStream
 from .SDL_version import SDL_VERSIONNUM
-from .SDL_rect import SDL_Rect, SDL_FPoint
+from .SDL_iostream import SDL_IOStream
+from .SDL_render import SDL_Renderer
 
 SDL_TTF_MAJOR_VERSION, SDL_TTF_MINOR_VERSION, SDL_TTF_MICRO_VERSION = 3, 2, 0
 SDL_TTF_VERSION: int = SDL_VERSIONNUM(SDL_TTF_MAJOR_VERSION, SDL_TTF_MINOR_VERSION, SDL_TTF_MICRO_VERSION)
@@ -37,7 +37,7 @@ class TTF_Font(ctypes.c_void_p):
 TTF_PROP_FONT_CREATE_FACE_NUMBER: bytes = "SDL_ttf.font.create.face".encode()
 TTF_PROP_FONT_CREATE_HORIZONTAL_DPI_NUMBER: bytes = "SDL_ttf.font.create.hdpi".encode()
 TTF_PROP_FONT_CREATE_VERTICAL_DPI_NUMBER: bytes = "SDL_ttf.font.create.vdpi".encode()
-TTF_PROP_FONT_CREATE_EXISTING_FONT: bytes = "SDL_ttf.font.create.existing_font"
+TTF_PROP_FONT_CREATE_EXISTING_FONT: bytes = "SDL_ttf.font.create.existing_font".encode()
 
 TTF_CopyFont: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_CopyFont", SDL_POINTER[TTF_Font], [SDL_POINTER[TTF_Font]], SDL_TTF_BINARY]
 
@@ -172,17 +172,17 @@ class TTF_Text(ctypes.Structure):
 TTF_CreateRendererTextEngine: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_CreateRendererTextEngine", SDL_POINTER[TTF_TextEngine], [SDL_POINTER[SDL_Renderer]], SDL_TTF_BINARY]
 TTF_CreateRendererTextEngineWithProperties: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_CreateRendererTextEngineWithProperties", SDL_POINTER[TTF_TextEngine], [SDL_PropertiesID], SDL_TTF_BINARY]
 
-TTF_PROP_RENDERER_TEXT_ENGINE_RENDERER: bytes = "SDL_ttf.renderer_text_engine.create.renderer"
-TTF_PROP_RENDERER_TEXT_ENGINE_ATLAS_TEXTURE_SIZE: bytes = "SDL_ttf.renderer_text_engine.create.atlas_texture_size"
+TTF_PROP_RENDERER_TEXT_ENGINE_RENDERER: bytes = "SDL_ttf.renderer_text_engine.create.renderer".encode()
+TTF_PROP_RENDERER_TEXT_ENGINE_ATLAS_TEXTURE_SIZE: bytes = "SDL_ttf.renderer_text_engine.create.atlas_texture_size".encode()
 
 TTF_DrawRendererText: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_DrawRendererText", ctypes.c_bool, [SDL_POINTER[TTF_Text], ctypes.c_float, ctypes.c_float], SDL_TTF_BINARY]
 TTF_DestroyRendererTextEngine: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_DestroyRendererTextEngine", None, [SDL_POINTER[TTF_TextEngine]], SDL_TTF_BINARY]
 
 TTF_CreateGPUTextEngine: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_CreateGPUTextEngine", SDL_POINTER[TTF_TextEngine], [SDL_POINTER[SDL_GPUDevice]], SDL_TTF_BINARY]
 TTF_CreateGPUTextEngineWithProperties: abc.Callable[..., typing.Any] = SDL_FUNC["TTF_CreateGPUTextEngineWithProperties", SDL_POINTER[TTF_TextEngine], [SDL_PropertiesID], SDL_TTF_BINARY]
 
-TTF_PROP_GPU_TEXT_ENGINE_DEVICE: bytes = "SDL_ttf.gpu_text_engine.create.device"
-TTF_PROP_GPU_TEXT_ENGINE_ATLAS_TEXTURE_SIZE: bytes = "SDL_ttf.gpu_text_engine.create.atlas_texture_size"
+TTF_PROP_GPU_TEXT_ENGINE_DEVICE: bytes = "SDL_ttf.gpu_text_engine.create.device".encode()
+TTF_PROP_GPU_TEXT_ENGINE_ATLAS_TEXTURE_SIZE: bytes = "SDL_ttf.gpu_text_engine.create.atlas_texture_size".encode()
 
 class TTF_GPUAtlasDrawSequence(ctypes.c_void_p):
     ...
diff --git a/sdl3/__init__.py b/sdl3/__init__.py
@@ -212,7 +212,7 @@ def SDL_NOT_IMPLEMENTED(name: str) -> abc.Callable[..., None]:
 
 class SDL_FUNC:
     @classmethod
-    def __class_getitem__(cls, key) -> typing.Any:
+    def __class_getitem__(cls, key: tuple[str, type, list[type], str]) -> typing.Any:
         """Create a new ctypes function definition."""
 
         if not __frozen__ and int(os.environ.get("SDL_DEBUG", "0")) > 0:
@@ -260,7 +260,7 @@ def __inner__(*args: list[typing.Any], **kwargs: dict[str, typing.Any]) -> typin
 
 class SDL_POINTER:
     @classmethod
-    def __class_getitem__(cls, key) -> typing.Any:
+    def __class_getitem__(cls, key: type) -> type:
         """Create a ctypes pointer type from a ctypes type."""
 
         if not __frozen__ and int(os.environ.get("SDL_DEBUG", "0")) > 0:
@@ -271,7 +271,7 @@ def __class_getitem__(cls, key) -> typing.Any:
 
 class SDL_CAST:
     @classmethod
-    def __class_getitem__(cls, key) -> typing.Any:
+    def __class_getitem__(cls, key: tuple[typing.Any, type]) -> typing.Any:
         """Cast a ctypes pointer to an another type."""
 
         if not __frozen__ and int(os.environ.get("SDL_DEBUG", "0")) > 0:
@@ -284,7 +284,7 @@ def __class_getitem__(cls, key) -> typing.Any:
 
 class SDL_TYPE:
     @classmethod
-    def __class_getitem__(cls, key) -> typing.Any:
+    def __class_getitem__(cls, key: tuple[str, type]) -> type:
         """Create a new type from a ctypes type."""
 
         if not __frozen__ and int(os.environ.get("SDL_DEBUG", "0")) > 0:
@@ -297,7 +297,7 @@ def __class_getitem__(cls, key) -> typing.Any:
 
 class SDL_FUNC_TYPE:
     @classmethod
-    def __class_getitem__(cls, key) -> typing.Any:
+    def __class_getitem__(cls, key: tuple[str, type, list[type]]) -> type:
         """Create a new ctypes function type."""
 
         if not __frozen__ and int(os.environ.get("SDL_DEBUG", "0")) > 0:
