Skip to content

Commit 99ff246

Browse files
committed
Use 'SDL_ENUM' type instead.
1 parent 2624bc3 commit 99ff246

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+589
-1465
lines changed

sdl3/SDL_assert.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
from .__init__ import os, inspect, ctypes, typing, abc, re, SDL_FUNC_TYPE, SDL_POINTER, \
2-
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_GET_BINARY, SDL_BINARY
2+
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_GET_BINARY, SDL_BINARY, SDL_ENUM
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
55

66
SDL_ASSERT_LEVEL = 2
77
SDL_NULL_WHILE_LOOP_CONDITION = 0
88

9-
SDL_AssertState: typing.TypeAlias = SDL_TYPE["SDL_AssertState", ctypes.c_int]
9+
SDL_AssertState: typing.TypeAlias = SDL_TYPE["SDL_AssertState", SDL_ENUM]
1010

11-
SDL_ASSERTION_RETRY = 0
12-
SDL_ASSERTION_BREAK = 1
13-
SDL_ASSERTION_ABORT = 2
14-
SDL_ASSERTION_IGNORE = 3
15-
SDL_ASSERTION_ALWAYS_IGNORE = 4
11+
SDL_ASSERTION_RETRY, SDL_ASSERTION_BREAK, SDL_ASSERTION_ABORT, \
12+
SDL_ASSERTION_IGNORE, SDL_ASSERTION_ALWAYS_IGNORE = range(5)
1613

1714
SDL_AssertData: typing.TypeAlias = SDL_TYPE["SDL_AssertData", ctypes.c_void_p]
1815

sdl3/SDL_asyncio.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
from .__init__ import ctypes, typing, abc, SDL_POINTER, \
1+
from .__init__ import ctypes, typing, abc, SDL_POINTER, SDL_ENUM, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
55

66
class SDL_AsyncIO(ctypes.c_void_p):
77
...
88

9-
SDL_AsyncIOTaskType: typing.TypeAlias = SDL_TYPE["SDL_AsyncIOTaskType", ctypes.c_int]
9+
SDL_AsyncIOTaskType: typing.TypeAlias = SDL_TYPE["SDL_AsyncIOTaskType", SDL_ENUM]
1010

11-
SDL_ASYNCIO_TASK_READ = 0
12-
SDL_ASYNCIO_TASK_WRITE = 1
13-
SDL_ASYNCIO_TASK_CLOSE = 2
11+
SDL_ASYNCIO_TASK_READ, SDL_ASYNCIO_TASK_WRITE, SDL_ASYNCIO_TASK_CLOSE = range(3)
1412

15-
SDL_AsyncIOResult: typing.TypeAlias = SDL_TYPE["SDL_AsyncIOResult", ctypes.c_int]
13+
SDL_AsyncIOResult: typing.TypeAlias = SDL_TYPE["SDL_AsyncIOResult", SDL_ENUM]
1614

17-
SDL_ASYNCIO_COMPLETE = 0
18-
SDL_ASYNCIO_FAILURE = 1
19-
SDL_ASYNCIO_CANCELED = 2
15+
SDL_ASYNCIO_COMPLETE, SDL_ASYNCIO_FAILURE, SDL_ASYNCIO_CANCELED = range(3)
2016

2117
class SDL_AsyncIOOutcome(ctypes.Structure):
2218
_fields_ = [

sdl3/SDL_audio.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .__init__ import ctypes, typing, abc, SDL_FUNC_TYPE, SDL_POINTER, \
2-
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
2+
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY, SDL_ENUM
33

44
from .SDL_endian import SDL_BYTEORDER, SDL_LIL_ENDIAN
55
from .SDL_properties import SDL_PropertiesID
@@ -15,7 +15,7 @@
1515
SDL_DEFINE_AUDIO_FORMAT = lambda signed, bigendian, _float, size: \
1616
(signed << 15) | (bigendian << 12) | (_float << 8) | (size & SDL_AUDIO_MASK_BITSIZE)
1717

18-
SDL_AudioFormat: typing.TypeAlias = SDL_TYPE["SDL_AudioFormat", ctypes.c_int]
18+
SDL_AudioFormat: typing.TypeAlias = SDL_TYPE["SDL_AudioFormat", SDL_ENUM]
1919

2020
SDL_AUDIO_UNKNOWN = 0x0000
2121
SDL_AUDIO_U8 = 0x0008

sdl3/SDL_blendmode.py

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .__init__ import ctypes, typing, abc, SDL_POINTER, \
1+
from .__init__ import ctypes, typing, abc, SDL_ENUM, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
@@ -14,25 +14,15 @@
1414
SDL_BLENDMODE_MUL = 0x00000008
1515
SDL_BLENDMODE_INVALID = 0x7FFFFFFF
1616

17-
SDL_BlendOperation: typing.TypeAlias = SDL_TYPE["SDL_BlendOperation", ctypes.c_int]
18-
19-
SDL_BLENDOPERATION_ADD = 0x1
20-
SDL_BLENDOPERATION_SUBTRACT = 0x2
21-
SDL_BLENDOPERATION_REV_SUBTRACT = 0x3
22-
SDL_BLENDOPERATION_MINIMUM = 0x4
23-
SDL_BLENDOPERATION_MAXIMUM = 0x5
24-
25-
SDL_BlendFactor: typing.TypeAlias = SDL_TYPE["SDL_BlendFactor", ctypes.c_int]
26-
27-
SDL_BLENDFACTOR_ZERO = 0x1
28-
SDL_BLENDFACTOR_ONE = 0x2
29-
SDL_BLENDFACTOR_SRC_COLOR = 0x3
30-
SDL_BLENDFACTOR_ONE_MINUS_SRC_COLOR = 0x4
31-
SDL_BLENDFACTOR_SRC_ALPHA = 0x5
32-
SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA = 0x6
33-
SDL_BLENDFACTOR_DST_COLOR = 0x7
34-
SDL_BLENDFACTOR_ONE_MINUS_DST_COLOR = 0x8
35-
SDL_BLENDFACTOR_DST_ALPHA = 0x9
36-
SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = 0xA
17+
SDL_BlendOperation: typing.TypeAlias = SDL_TYPE["SDL_BlendOperation", SDL_ENUM]
18+
19+
SDL_BLENDOPERATION_ADD, SDL_BLENDOPERATION_SUBTRACT, SDL_BLENDOPERATION_REV_SUBTRACT, \
20+
SDL_BLENDOPERATION_MINIMUM, SDL_BLENDOPERATION_MAXIMUM = range(1, 6)
21+
22+
SDL_BlendFactor: typing.TypeAlias = SDL_TYPE["SDL_BlendFactor", SDL_ENUM]
23+
24+
SDL_BLENDFACTOR_ZERO, SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_SRC_COLOR, SDL_BLENDFACTOR_ONE_MINUS_SRC_COLOR, \
25+
SDL_BLENDFACTOR_SRC_ALPHA, SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA, SDL_BLENDFACTOR_DST_COLOR, SDL_BLENDFACTOR_ONE_MINUS_DST_COLOR, \
26+
SDL_BLENDFACTOR_DST_ALPHA, SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = range(1, 11)
3727

3828
SDL_ComposeCustomBlendMode: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ComposeCustomBlendMode", SDL_BlendMode, [SDL_BlendFactor, SDL_BlendFactor, SDL_BlendOperation, SDL_BlendFactor, SDL_BlendFactor, SDL_BlendOperation]]

sdl3/SDL_camera.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .__init__ import ctypes, typing, abc, SDL_POINTER, \
1+
from .__init__ import ctypes, typing, abc, SDL_POINTER, SDL_ENUM, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
33

44
from .SDL_pixels import SDL_PixelFormat, SDL_Colorspace
@@ -22,11 +22,9 @@ class SDL_CameraSpec(ctypes.Structure):
2222
("framerate_denominator", ctypes.c_int)
2323
]
2424

25-
SDL_CameraPosition: typing.TypeAlias = SDL_TYPE["SDL_CameraPosition", ctypes.c_int]
25+
SDL_CameraPosition: typing.TypeAlias = SDL_TYPE["SDL_CameraPosition", SDL_ENUM]
2626

27-
SDL_CAMERA_POSITION_UNKNOWN = 0
28-
SDL_CAMERA_POSITION_FRONT_FACING = 1
29-
SDL_CAMERA_POSITION_BACK_FACING = 2
27+
SDL_CAMERA_POSITION_UNKNOWN, SDL_CAMERA_POSITION_FRONT_FACING, SDL_CAMERA_POSITION_BACK_FACING = range(3)
3028

3129
SDL_GetNumCameraDrivers: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetNumCameraDrivers", ctypes.c_int, []]
3230
SDL_GetCameraDriver: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetCameraDriver", ctypes.c_char_p, [ctypes.c_int]]

sdl3/SDL_dialog.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .__init__ import ctypes, typing, abc, SDL_POINTER, SDL_FUNC_TYPE, \
2-
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
2+
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY, SDL_ENUM
33

44
from .SDL_video import SDL_Window
55
from .SDL_properties import SDL_PropertiesID
@@ -18,11 +18,9 @@ class SDL_DialogFileFilter(ctypes.Structure):
1818
SDL_ShowSaveFileDialog: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ShowSaveFileDialog", None, [SDL_DialogFileCallback, ctypes.c_void_p, SDL_POINTER[SDL_Window], SDL_POINTER[SDL_DialogFileFilter], ctypes.c_int, ctypes.c_char_p]]
1919
SDL_ShowOpenFolderDialog: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ShowOpenFolderDialog", None, [SDL_DialogFileCallback, ctypes.c_void_p, SDL_POINTER[SDL_Window], ctypes.c_char_p, ctypes.c_bool]]
2020

21-
SDL_FileDialogType: typing.TypeAlias = SDL_TYPE["SDL_FileDialogType", ctypes.c_int]
21+
SDL_FileDialogType: typing.TypeAlias = SDL_TYPE["SDL_FileDialogType", SDL_ENUM]
2222

23-
SDL_FILEDIALOG_OPENFILE = 0
24-
SDL_FILEDIALOG_SAVEFILE = 1
25-
SDL_FILEDIALOG_OPENFOLDER = 2
23+
SDL_FILEDIALOG_OPENFILE, SDL_FILEDIALOG_SAVEFILE, SDL_FILEDIALOG_OPENFOLDER = range(3)
2624

2725
SDL_ShowFileDialogWithProperties: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ShowFileDialogWithProperties", None, [SDL_FileDialogType, SDL_DialogFileCallback, ctypes.c_void_p, SDL_PropertiesID]]
2826

sdl3/SDL_events.py

Lines changed: 55 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .__init__ import ctypes, typing, abc, SDL_POINTER, SDL_FUNC_TYPE, \
2-
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
2+
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY, SDL_ENUM
33

44
from .SDL_video import SDL_Window, SDL_WindowID, SDL_DisplayID
55
from .SDL_sensor import SDL_SensorID
@@ -16,139 +16,67 @@
1616

1717
SDL_SET_CURRENT_BINARY(SDL_BINARY)
1818

19-
SDL_EventType: typing.TypeAlias = SDL_TYPE["SDL_EventType", ctypes.c_int]
19+
SDL_EventType: typing.TypeAlias = SDL_TYPE["SDL_EventType", SDL_ENUM]
2020

2121
SDL_EVENT_FIRST = 0x0
22-
SDL_EVENT_QUIT = 0x100
23-
SDL_EVENT_TERMINATING = 0x101
24-
SDL_EVENT_LOW_MEMORY = 0x102
25-
SDL_EVENT_WILL_ENTER_BACKGROUND = 0x103
26-
SDL_EVENT_DID_ENTER_BACKGROUND = 0x104
27-
SDL_EVENT_WILL_ENTER_FOREGROUND = 0x105
28-
SDL_EVENT_DID_ENTER_FOREGROUND = 0x106
29-
SDL_EVENT_LOCALE_CHANGED = 0x107
30-
SDL_EVENT_SYSTEM_THEME_CHANGED = 0x108
31-
32-
SDL_EVENT_DISPLAY_ORIENTATION = 0x151
33-
SDL_EVENT_DISPLAY_ADDED = 0x152
34-
SDL_EVENT_DISPLAY_REMOVED = 0x153
35-
SDL_EVENT_DISPLAY_MOVED = 0x154
36-
SDL_EVENT_DISPLAY_DESKTOP_MODE_CHANGED = 0x155
37-
SDL_EVENT_DISPLAY_CURRENT_MODE_CHANGED = 0x156
38-
SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED = 0x157
39-
SDL_EVENT_DISPLAY_FIRST = SDL_EVENT_DISPLAY_ORIENTATION
40-
SDL_EVENT_DISPLAY_LAST = SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED
41-
42-
SDL_EVENT_WINDOW_SHOWN = 0x202
43-
SDL_EVENT_WINDOW_HIDDEN = 0x203
44-
SDL_EVENT_WINDOW_EXPOSED = 0x204
45-
SDL_EVENT_WINDOW_MOVED = 0x205
46-
SDL_EVENT_WINDOW_RESIZED = 0x206
47-
SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED = 0x207
48-
SDL_EVENT_WINDOW_METAL_VIEW_RESIZED = 0x208
49-
SDL_EVENT_WINDOW_MINIMIZED = 0x209
50-
SDL_EVENT_WINDOW_MAXIMIZED = 0x20A
51-
SDL_EVENT_WINDOW_RESTORED = 0x20B
52-
SDL_EVENT_WINDOW_MOUSE_ENTER = 0x20C
53-
SDL_EVENT_WINDOW_MOUSE_LEAVE = 0x20D
54-
SDL_EVENT_WINDOW_FOCUS_GAINED = 0x20E
55-
SDL_EVENT_WINDOW_FOCUS_LOST = 0x20F
56-
SDL_EVENT_WINDOW_CLOSE_REQUESTED = 0x210
57-
SDL_EVENT_WINDOW_HIT_TEST = 0x211
58-
SDL_EVENT_WINDOW_ICCPROF_CHANGED = 0x212
59-
SDL_EVENT_WINDOW_DISPLAY_CHANGED = 0x213
60-
SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED = 0x214
61-
SDL_EVENT_WINDOW_SAFE_AREA_CHANGED = 0x215
62-
SDL_EVENT_WINDOW_OCCLUDED = 0x216
63-
SDL_EVENT_WINDOW_ENTER_FULLSCREEN = 0x217
64-
SDL_EVENT_WINDOW_LEAVE_FULLSCREEN = 0x218
65-
SDL_EVENT_WINDOW_DESTROYED = 0x219
66-
67-
SDL_EVENT_WINDOW_HDR_STATE_CHANGED = 0x21A
68-
SDL_EVENT_WINDOW_FIRST = SDL_EVENT_WINDOW_SHOWN
69-
SDL_EVENT_WINDOW_LAST = SDL_EVENT_WINDOW_HDR_STATE_CHANGED
70-
71-
SDL_EVENT_KEY_DOWN = 0x300
72-
SDL_EVENT_KEY_UP = 0x301
73-
SDL_EVENT_TEXT_EDITING = 0x302
74-
SDL_EVENT_TEXT_INPUT = 0x303
75-
SDL_EVENT_KEYMAP_CHANGED = 0x304
76-
77-
SDL_EVENT_KEYBOARD_ADDED = 0x305
78-
SDL_EVENT_KEYBOARD_REMOVED = 0x306
79-
SDL_EVENT_TEXT_EDITING_CANDIDATES = 0x307
80-
81-
SDL_EVENT_MOUSE_MOTION = 0x400
82-
SDL_EVENT_MOUSE_BUTTON_DOWN = 0x401
83-
SDL_EVENT_MOUSE_BUTTON_UP = 0x402
84-
SDL_EVENT_MOUSE_WHEEL = 0x403
85-
SDL_EVENT_MOUSE_ADDED = 0x404
86-
SDL_EVENT_MOUSE_REMOVED = 0x405
87-
88-
SDL_EVENT_JOYSTICK_AXIS_MOTION = 0x600
89-
SDL_EVENT_JOYSTICK_BALL_MOTION = 0x601
90-
SDL_EVENT_JOYSTICK_HAT_MOTION = 0x602
91-
SDL_EVENT_JOYSTICK_BUTTON_DOWN = 0x603
92-
SDL_EVENT_JOYSTICK_BUTTON_UP = 0x604
93-
SDL_EVENT_JOYSTICK_ADDED = 0x605
94-
SDL_EVENT_JOYSTICK_REMOVED = 0x606
95-
SDL_EVENT_JOYSTICK_BATTERY_UPDATED = 0x607
96-
SDL_EVENT_JOYSTICK_UPDATE_COMPLETE = 0x608
97-
98-
SDL_EVENT_GAMEPAD_AXIS_MOTION = 0x650
99-
SDL_EVENT_GAMEPAD_BUTTON_DOWN = 0x651
100-
SDL_EVENT_GAMEPAD_BUTTON_UP = 0x652
101-
SDL_EVENT_GAMEPAD_ADDED = 0x653
102-
SDL_EVENT_GAMEPAD_REMOVED = 0x654
103-
SDL_EVENT_GAMEPAD_REMAPPED = 0x655
104-
SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN = 0x656
105-
SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION = 0x657
106-
SDL_EVENT_GAMEPAD_TOUCHPAD_UP = 0x658
107-
SDL_EVENT_GAMEPAD_SENSOR_UPDATE = 0x659
108-
SDL_EVENT_GAMEPAD_UPDATE_COMPLETE = 0x65A
109-
SDL_EVENT_GAMEPAD_STEAM_HANDLE_UPDATED = 0x65B
110-
111-
SDL_EVENT_FINGER_DOWN = 0x700
112-
SDL_EVENT_FINGER_UP = 0x701
113-
SDL_EVENT_FINGER_MOTION = 0x702
114-
SDL_EVENT_FINGER_CANCELED = 0x703
22+
23+
SDL_EVENT_QUIT, SDL_EVENT_TERMINATING, SDL_EVENT_LOW_MEMORY, SDL_EVENT_WILL_ENTER_BACKGROUND, \
24+
SDL_EVENT_DID_ENTER_BACKGROUND, SDL_EVENT_WILL_ENTER_FOREGROUND, SDL_EVENT_DID_ENTER_FOREGROUND, \
25+
SDL_EVENT_LOCALE_CHANGED, SDL_EVENT_SYSTEM_THEME_CHANGED = range(_ := 0x100, _ + 9)
26+
27+
SDL_EVENT_DISPLAY_ORIENTATION, SDL_EVENT_DISPLAY_ADDED, SDL_EVENT_DISPLAY_REMOVED, SDL_EVENT_DISPLAY_MOVED, \
28+
SDL_EVENT_DISPLAY_DESKTOP_MODE_CHANGED, SDL_EVENT_DISPLAY_CURRENT_MODE_CHANGED, SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED = range(_ := 0x151, _ + 7)
29+
30+
SDL_EVENT_DISPLAY_FIRST, SDL_EVENT_DISPLAY_LAST = \
31+
SDL_EVENT_DISPLAY_ORIENTATION, SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED
32+
33+
SDL_EVENT_WINDOW_SHOWN, SDL_EVENT_WINDOW_HIDDEN, SDL_EVENT_WINDOW_EXPOSED, SDL_EVENT_WINDOW_MOVED, SDL_EVENT_WINDOW_RESIZED, \
34+
SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED, SDL_EVENT_WINDOW_METAL_VIEW_RESIZED, SDL_EVENT_WINDOW_MINIMIZED, SDL_EVENT_WINDOW_MAXIMIZED, \
35+
SDL_EVENT_WINDOW_RESTORED, SDL_EVENT_WINDOW_MOUSE_ENTER, SDL_EVENT_WINDOW_MOUSE_LEAVE, SDL_EVENT_WINDOW_FOCUS_GAINED, SDL_EVENT_WINDOW_FOCUS_LOST, \
36+
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, \
37+
SDL_EVENT_WINDOW_SAFE_AREA_CHANGED, SDL_EVENT_WINDOW_OCCLUDED, SDL_EVENT_WINDOW_ENTER_FULLSCREEN, SDL_EVENT_WINDOW_LEAVE_FULLSCREEN, \
38+
SDL_EVENT_WINDOW_DESTROYED, SDL_EVENT_WINDOW_HDR_STATE_CHANGED = range(_ := 0x202, _ + 25)
39+
40+
SDL_EVENT_WINDOW_FIRST, SDL_EVENT_WINDOW_LAST = \
41+
SDL_EVENT_WINDOW_SHOWN, SDL_EVENT_WINDOW_HDR_STATE_CHANGED
42+
43+
SDL_EVENT_KEY_DOWN, SDL_EVENT_KEY_UP, SDL_EVENT_TEXT_EDITING, SDL_EVENT_TEXT_INPUT, SDL_EVENT_KEYMAP_CHANGED, \
44+
SDL_EVENT_KEYBOARD_ADDED, SDL_EVENT_KEYBOARD_REMOVED, SDL_EVENT_TEXT_EDITING_CANDIDATES = range(_ := 0x300, _ + 8)
45+
46+
SDL_EVENT_MOUSE_MOTION, SDL_EVENT_MOUSE_BUTTON_DOWN, SDL_EVENT_MOUSE_BUTTON_UP, \
47+
SDL_EVENT_MOUSE_WHEEL, SDL_EVENT_MOUSE_ADDED, SDL_EVENT_MOUSE_REMOVED = range(_ := 0x400, _ + 6)
48+
49+
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, \
50+
SDL_EVENT_JOYSTICK_ADDED, SDL_EVENT_JOYSTICK_REMOVED, SDL_EVENT_JOYSTICK_BATTERY_UPDATED, SDL_EVENT_JOYSTICK_UPDATE_COMPLETE = range(_ := 0x600, _ + 9)
51+
52+
SDL_EVENT_GAMEPAD_AXIS_MOTION, SDL_EVENT_GAMEPAD_BUTTON_DOWN, SDL_EVENT_GAMEPAD_BUTTON_UP, SDL_EVENT_GAMEPAD_ADDED, SDL_EVENT_GAMEPAD_REMOVED, \
53+
SDL_EVENT_GAMEPAD_REMAPPED, SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN, SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION, SDL_EVENT_GAMEPAD_TOUCHPAD_UP, SDL_EVENT_GAMEPAD_SENSOR_UPDATE, \
54+
SDL_EVENT_GAMEPAD_UPDATE_COMPLETE, SDL_EVENT_GAMEPAD_STEAM_HANDLE_UPDATED = range(_ := 0x650, _ + 12)
55+
56+
SDL_EVENT_FINGER_DOWN, SDL_EVENT_FINGER_UP, SDL_EVENT_FINGER_MOTION, \
57+
SDL_EVENT_FINGER_CANCELED = range(_ := 0x700, _ + 4)
11558

11659
SDL_EVENT_CLIPBOARD_UPDATE = 0x900
11760

118-
SDL_EVENT_DROP_FILE = 0x1000
119-
SDL_EVENT_DROP_TEXT = 0x1001
120-
SDL_EVENT_DROP_BEGIN = 0x1002
121-
SDL_EVENT_DROP_COMPLETE = 0x1003
122-
SDL_EVENT_DROP_POSITION = 0x1004
61+
SDL_EVENT_DROP_FILE, SDL_EVENT_DROP_TEXT, SDL_EVENT_DROP_BEGIN, \
62+
SDL_EVENT_DROP_COMPLETE, SDL_EVENT_DROP_POSITION = range(_ := 0x1000, _ + 5)
12363

124-
SDL_EVENT_AUDIO_DEVICE_ADDED = 0x1100
125-
SDL_EVENT_AUDIO_DEVICE_REMOVED = 0x1101
126-
SDL_EVENT_AUDIO_DEVICE_FORMAT_CHANGED = 0x1102
64+
SDL_EVENT_AUDIO_DEVICE_ADDED, SDL_EVENT_AUDIO_DEVICE_REMOVED, \
65+
SDL_EVENT_AUDIO_DEVICE_FORMAT_CHANGED = range(_ := 0x1100, _ + 3)
12766

12867
SDL_EVENT_SENSOR_UPDATE = 0x1200
12968

130-
SDL_EVENT_PEN_PROXIMITY_IN = 0x1300
131-
SDL_EVENT_PEN_PROXIMITY_OUT = 0x1301
132-
SDL_EVENT_PEN_DOWN = 0x1302
133-
SDL_EVENT_PEN_UP = 0x1303
134-
SDL_EVENT_PEN_BUTTON_DOWN = 0x1304
135-
SDL_EVENT_PEN_BUTTON_UP = 0x1305
136-
SDL_EVENT_PEN_MOTION = 0x1306
137-
SDL_EVENT_PEN_AXIS = 0x1307
138-
139-
SDL_EVENT_CAMERA_DEVICE_ADDED = 0x1400
140-
SDL_EVENT_CAMERA_DEVICE_REMOVED = 0x1401
141-
SDL_EVENT_CAMERA_DEVICE_APPROVED = 0x1402
142-
SDL_EVENT_CAMERA_DEVICE_DENIED = 0x1403
143-
144-
SDL_EVENT_RENDER_TARGETS_RESET = 0x2000
145-
SDL_EVENT_RENDER_DEVICE_RESET = 0x2001
146-
SDL_EVENT_RENDER_DEVICE_LOST = 0x2002
147-
148-
SDL_EVENT_PRIVATE0 = 0x4000
149-
SDL_EVENT_PRIVATE1 = 0x4001
150-
SDL_EVENT_PRIVATE2 = 0x4002
151-
SDL_EVENT_PRIVATE3 = 0x4003
69+
SDL_EVENT_PEN_PROXIMITY_IN, SDL_EVENT_PEN_PROXIMITY_OUT, SDL_EVENT_PEN_DOWN, SDL_EVENT_PEN_UP, SDL_EVENT_PEN_BUTTON_DOWN, \
70+
SDL_EVENT_PEN_BUTTON_UP, SDL_EVENT_PEN_MOTION, SDL_EVENT_PEN_AXIS = range(_ := 0x1300, _ + 8)
71+
72+
SDL_EVENT_CAMERA_DEVICE_ADDED, SDL_EVENT_CAMERA_DEVICE_REMOVED, \
73+
SDL_EVENT_CAMERA_DEVICE_APPROVED, SDL_EVENT_CAMERA_DEVICE_DENIED = range(_ := 0x1400, _ + 4)
74+
75+
SDL_EVENT_RENDER_TARGETS_RESET, SDL_EVENT_RENDER_DEVICE_RESET, \
76+
SDL_EVENT_RENDER_DEVICE_LOST = range(_ := 0x2000, _ + 3)
77+
78+
SDL_EVENT_PRIVATE0, SDL_EVENT_PRIVATE1, SDL_EVENT_PRIVATE2, \
79+
SDL_EVENT_PRIVATE3 = range(_ := 0x4000, _ + 4)
15280

15381
SDL_EVENT_POLL_SENTINEL = 0x7F00
15482
SDL_EVENT_USER = 0x8000
@@ -620,11 +548,9 @@ class SDL_Event(ctypes.Union):
620548

621549
SDL_PumpEvents: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_PumpEvents", None, []]
622550

623-
SDL_EventAction: typing.TypeAlias = SDL_TYPE["SDL_EventAction", ctypes.c_int]
551+
SDL_EventAction: typing.TypeAlias = SDL_TYPE["SDL_EventAction", SDL_ENUM]
624552

625-
SDL_ADDEVENT = 0
626-
SDL_PEEKEVENT = 1
627-
SDL_GETEVENT = 2
553+
SDL_ADDEVENT, SDL_PEEKEVENT, SDL_GETEVENT = range(3)
628554

629555
SDL_PeepEvents: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_PeepEvents", ctypes.c_int, [SDL_POINTER[SDL_Event], ctypes.c_int, SDL_EventAction, ctypes.c_uint32, ctypes.c_uint32]]
630556
SDL_HasEvent: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_HasEvent", ctypes.c_bool, [ctypes.c_uint32]]

0 commit comments

Comments
 (0)