Update SDL2 bindings to 2.0.22 (#226)

* Update bindings and unit tests for 2.0.22

* Update macOS and Windows CI setup

* Bump SDL2 version for Linux CI tests

* Update news.rst

Author: a-hurst

.ci/getsdl2.py

@@ -25,6 +25,13 @@
 }
 
 libversions = {
+    '2.0.22': {
+        'SDL2': '2.0.22',
+        'SDL2_mixer': '2.0.4',
+        'SDL2_ttf': '2.0.18',
+        'SDL2_image': '2.0.5',
+        'SDL2_gfx': '1.0.4'
+    },
     '2.0.20': {
         'SDL2': '2.0.20',
         'SDL2_mixer': '2.0.4',

.github/workflows/run_tests.yml

@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
-        sdl2: ['2.0.20']
+        sdl2: ['2.0.22']
         name-prefix: ['Linux (Python ']
         include:
           - python-version: 'pypy-2.7'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'Experimental / Linux ('
           - python-version: 'pypy-3.7'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'Experimental / Linux ('
 
     env:
@@ -71,11 +71,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.9]
-        sdl2: ['2.0.20', '2.0.16', '2.0.14']
+        sdl2: ['2.0.22', '2.0.20', '2.0.16']
         name-prefix: ['macOS (Python ']
         include:
           - python-version: '2.7'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'macOS (Python '
           - python-version: '3.9'
             sdl2: 'from Homebrew'
@@ -127,21 +127,21 @@ jobs:
       matrix:
         python-version: [3.9]
         architecture: ['x64']
-        sdl2: ['2.0.20', '2.0.18', '2.0.16', '2.0.14', '2.0.12',
+        sdl2: ['2.0.22', '2.0.20', '2.0.18', '2.0.16', '2.0.14', '2.0.12',
               '2.0.10', '2.0.9', '2.0.8', '2.0.7', '2.0.6', '2.0.5']
         name-prefix: ['Windows (Python ']
         include:
           - python-version: '2.7'
             architecture: 'x64'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'Windows (Python '
           - python-version: '2.7'
             architecture: 'x86'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'Windows 32-bit (Python '
           - python-version: '3.9'
             architecture: 'x86'
-            sdl2: '2.0.20'
+            sdl2: '2.0.22'
             name-prefix: 'Windows 32-bit (Python '
           - python-version: '2.7'
             architecture: 'x86'

doc/news.rst

@@ -9,6 +9,7 @@ Released on XXXX-XX-XX.
 
 New Features:
 
+* Updated to wrap new functions and constants in SDL2 2.0.22 (PR #226)
 * Added a new stable API for accessing the raw ctypes function bindings for each
   submodule. Each submodule (e.g. ``sdl2.sdlttf``, ``sdl2.video``) now contains
   a ``_ctypes`` object through which the raw ctypes function objects can be

sdl2/events.py

@@ -14,7 +14,8 @@
 __all__ = [
     # Structs, Unions, & Opaque Types
     "SDL_CommonEvent", "SDL_DisplayEvent", "SDL_WindowEvent", 
-    "SDL_KeyboardEvent", "SDL_TextEditingEvent", "SDL_TextInputEvent",
+    "SDL_KeyboardEvent", "SDL_TextEditingEvent",
+    "SDL_TextEditingExtEvent", "SDL_TextInputEvent",
     "SDL_MouseMotionEvent", "SDL_MouseButtonEvent", "SDL_MouseWheelEvent",
     "SDL_JoyAxisEvent", "SDL_JoyBallEvent", "SDL_JoyHatEvent",
     "SDL_JoyButtonEvent", "SDL_JoyDeviceEvent", "SDL_ControllerAxisEvent",
@@ -38,7 +39,8 @@
     "SDL_LOCALECHANGED", "SDL_DISPLAYEVENT",
     "SDL_WINDOWEVENT", "SDL_SYSWMEVENT",
     "SDL_KEYDOWN", "SDL_KEYUP", "SDL_TEXTEDITING", "SDL_TEXTINPUT",
-    "SDL_KEYMAPCHANGED", "SDL_MOUSEMOTION", "SDL_MOUSEBUTTONDOWN",
+    "SDL_KEYMAPCHANGED", "SDL_TEXTEDITING_EXT",
+    "SDL_MOUSEMOTION", "SDL_MOUSEBUTTONDOWN",
     "SDL_MOUSEBUTTONUP", "SDL_MOUSEWHEEL",
     "SDL_JOYAXISMOTION", "SDL_JOYBALLMOTION",
     "SDL_JOYHATMOTION", "SDL_JOYBUTTONDOWN", "SDL_JOYBUTTONUP",
@@ -90,6 +92,7 @@
 SDL_TEXTEDITING = 0x302
 SDL_TEXTINPUT = 0x303
 SDL_KEYMAPCHANGED = 0x304
+SDL_TEXTEDITING_EXT = 0x305
 SDL_MOUSEMOTION = 0x400
 SDL_MOUSEBUTTONDOWN = 0x401
 SDL_MOUSEBUTTONUP = 0x402
@@ -200,6 +203,16 @@ class SDL_TextEditingEvent(Structure):
         ("length", Sint32),
     ]
 
+class SDL_TextEditingExtEvent(Structure):
+    _fields_ = [
+        ("type", Uint32),
+        ("timestamp", Uint32),
+        ("windowID", Uint32),
+        ("text", c_char_p),
+        ("start", Sint32),
+        ("length", Sint32),
+    ]
+
 class SDL_TextInputEvent(Structure):
     _fields_ = [
         ("type", Uint32),
@@ -468,6 +481,7 @@ class SDL_Event(Union):
         ("window", SDL_WindowEvent),
         ("key", SDL_KeyboardEvent),
         ("edit", SDL_TextEditingEvent),
+        ("editExt", SDL_TextEditingExtEvent),
         ("text", SDL_TextInputEvent),
         ("motion", SDL_MouseMotionEvent),
         ("button", SDL_MouseButtonEvent),

sdl2/hints.py

@@ -29,6 +29,7 @@
     "SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT",
     "SDL_HINT_ENABLE_STEAM_CONTROLLERS",
     "SDL_HINT_EVENT_LOGGING",
+    "SDL_HINT_FORCE_RAISEWINDOW",
     "SDL_HINT_FRAMEBUFFER_ACCELERATION",
     "SDL_HINT_GAMECONTROLLERCONFIG",
     "SDL_HINT_GAMECONTROLLERCONFIG_FILE",
@@ -40,10 +41,12 @@
     "SDL_HINT_IDLE_TIMER_DISABLED",
     "SDL_HINT_IME_INTERNAL_EDITING",
     "SDL_HINT_IME_SHOW_UI",
+    "SDL_HINT_IME_SUPPORT_EXTENDED_TEXT",
     "SDL_HINT_IOS_HIDE_HOME_INDICATOR",
     "SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS",
     "SDL_HINT_JOYSTICK_HIDAPI",
     "SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE",
+    "SDL_HINT_JOYSTICK_GAMECUBE_RUMBLE_BRAKE",
     "SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS",
     "SDL_HINT_JOYSTICK_HIDAPI_LUNA",
     "SDL_HINT_JOYSTICK_HIDAPI_PS4",
@@ -59,6 +62,7 @@
     "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_KMSDRM_REQUIRE_DRM_MASTER",
     "SDL_HINT_JOYSTICK_DEVICE",
@@ -70,10 +74,12 @@
     "SDL_HINT_MOUSE_DOUBLE_CLICK_TIME",
     "SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH",
     "SDL_HINT_MOUSE_NORMAL_SPEED_SCALE",
+    "SDL_HINT_MOUSE_RELATIVE_MODE_CENTER",
     "SDL_HINT_MOUSE_RELATIVE_MODE_WARP",
     "SDL_HINT_MOUSE_RELATIVE_SCALING",
     "SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE",
     "SDL_HINT_MOUSE_TOUCH_EVENTS",
+    "SDL_HINT_MOUSE_AUTO_CAPTURE",
     "SDL_HINT_NO_SIGNAL_HANDLERS",
     "SDL_HINT_OPENGL_ES_DRIVER",
     "SDL_HINT_ORIENTATIONS",
@@ -98,6 +104,7 @@
     "SDL_HINT_THREAD_STACK_SIZE",
     "SDL_HINT_TIMER_RESOLUTION",
     "SDL_HINT_TOUCH_MOUSE_EVENTS",
+    "SDL_HINT_VITA_TOUCH_MOUSE_DEVICE",
     "SDL_HINT_TV_REMOTE_AS_JOYSTICK",
     "SDL_HINT_VIDEO_ALLOW_SCREENSAVER",
     "SDL_HINT_VIDEO_DOUBLE_BUFFER",
@@ -107,7 +114,10 @@
     "SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES",
     "SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS",
     "SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR",
+    "SDL_HINT_VIDEO_WAYLAND_PREFER_LIBDECOR",
     "SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT",
+    "SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL",
+    "SDL_HINT_VIDEO_FOREIGN_WINDOW_VULKAN",
     "SDL_HINT_VIDEO_WIN_D3DCOMPILER",
     "SDL_HINT_VIDEO_X11_FORCE_EGL",
     "SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR",
@@ -136,6 +146,10 @@
     "SDL_HINT_XINPUT_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",
 
     # Enums
     "SDL_HintPriority",
@@ -154,6 +168,7 @@
 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"
+SDL_HINT_QUIT_ON_LAST_WINDOW_CLOSE = b"SDL_QUIT_ON_LAST_WINDOW_CLOSE"
 SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME = b"SDL_SCREENSAVER_INHIBIT_ACTIVITY_NAME"
 SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL = b"SDL_THREAD_FORCE_REALTIME_TIME_CRITICAL"
 SDL_HINT_THREAD_PRIORITY_POLICY = b"SDL_THREAD_PRIORITY_POLICY"
@@ -172,11 +187,15 @@
 SDL_HINT_RENDER_OPENGL_SHADERS = b"SDL_RENDER_OPENGL_SHADERS"
 SDL_HINT_RENDER_SCALE_QUALITY = b"SDL_RENDER_SCALE_QUALITY"
 SDL_HINT_RENDER_VSYNC = b"SDL_RENDER_VSYNC"
+SDL_HINT_VIDEODRIVER = b"SDL_VIDEODRIVER"
 SDL_HINT_VIDEO_ALLOW_SCREENSAVER = b"SDL_VIDEO_ALLOW_SCREENSAVER"
 SDL_HINT_VIDEO_DOUBLE_BUFFER = b"SDL_VIDEO_DOUBLE_BUFFER"
 SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY = b"SDL_VIDEO_EGL_ALLOW_TRANSPARENCY"
 SDL_HINT_VIDEO_EXTERNAL_CONTEXT = b"SDL_VIDEO_EXTERNAL_CONTEXT"
+SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL = b"SDL_VIDEO_FOREIGN_WINDOW_OPENGL"
+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_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"
@@ -186,10 +205,12 @@
 SDL_HINT_VIDEO_X11_XRANDR = b"SDL_VIDEO_X11_XRANDR"
 SDL_HINT_VIDEO_X11_XVIDMODE = b"SDL_VIDEO_X11_XVIDMODE"
 SDL_HINT_X11_FORCE_OVERRIDE_REDIRECT = b"SDL_X11_FORCE_OVERRIDE_REDIRECT"
+SDL_HINT_X11_WINDOW_TYPE = b"SDL_X11_WINDOW_TYPE"
 
 
 # Audio Hints
 
+SDL_HINT_AUDIODRIVER = b"SDL_AUDIODRIVER"
 SDL_HINT_AUDIO_CATEGORY = b"SDL_AUDIO_CATEGORY"
 SDL_HINT_AUDIO_DEVICE_APP_NAME = b"SDL_AUDIO_DEVICE_APP_NAME"
 SDL_HINT_AUDIO_DEVICE_STREAM_NAME = b"SDL_AUDIO_DEVICE_STREAM_NAME"
@@ -206,6 +227,7 @@
 SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED = b"SDL_ALLOW_ALT_TAB_WHILE_GRABBED"
 SDL_HINT_ALLOW_TOPMOST = b"SDL_ALLOW_TOPMOST"
 SDL_HINT_DISPLAY_USABLE_BOUNDS = b"SDL_DISPLAY_USABLE_BOUNDS"
+SDL_HINT_FORCE_RAISEWINDOW = b"SDL_HINT_FORCE_RAISEWINDOW"
 SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION = b"SDL_QTWAYLAND_CONTENT_ORIENTATION"
 SDL_HINT_QTWAYLAND_WINDOW_FLAGS = b"SDL_QTWAYLAND_WINDOW_FLAGS"
 SDL_HINT_VIDEO_HIGHDPI_DISABLED = b"SDL_VIDEO_HIGHDPI_DISABLED"
@@ -219,10 +241,13 @@
 SDL_HINT_GRAB_KEYBOARD = b"SDL_GRAB_KEYBOARD"
 SDL_HINT_IME_INTERNAL_EDITING = b"SDL_IME_INTERNAL_EDITING"
 SDL_HINT_IME_SHOW_UI = b"SDL_IME_SHOW_UI"
+SDL_HINT_IME_SUPPORT_EXTENDED_TEXT = b"SDL_IME_SUPPORT_EXTENDED_TEXT"
+SDL_HINT_MOUSE_AUTO_CAPTURE = b"SDL_MOUSE_AUTO_CAPTURE"
 SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS = b"SDL_MOUSE_DOUBLE_CLICK_RADIUS"
 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_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"
 SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE = b"SDL_MOUSE_RELATIVE_SPEED_SCALE"
@@ -245,6 +270,7 @@
 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"
+SDL_HINT_JOYSTICK_GAMECUBE_RUMBLE_BRAKE = b"SDL_JOYSTICK_GAMECUBE_RUMBLE_BRAKE"
 SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS = b"SDL_JOYSTICK_HIDAPI_JOY_CONS"
 SDL_HINT_JOYSTICK_HIDAPI_LUNA = b"SDL_JOYSTICK_HIDAPI_LUNA"
 SDL_HINT_JOYSTICK_HIDAPI_PS4 = b"SDL_JOYSTICK_HIDAPI_PS4"
@@ -259,6 +285,7 @@
 SDL_HINT_JOYSTICK_HIDAPI_XBOX = b"SDL_JOYSTICK_HIDAPI_XBOX"
 SDL_HINT_JOYSTICK_RAWINPUT = b"SDL_JOYSTICK_RAWINPUT"
 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_DEVICE = b"SDL_JOYSTICK_DEVICE"
 
@@ -305,6 +332,7 @@
 SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION = b"SDL_APPLE_TV_REMOTE_ALLOW_ROTATION"
 SDL_HINT_IDLE_TIMER_DISABLED = b"SDL_IOS_IDLE_TIMER_DISABLED"
 SDL_HINT_IOS_HIDE_HOME_INDICATOR = "SDL_IOS_HIDE_HOME_INDICATOR"
+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"
 SDL_HINT_WINRT_HANDLE_BACK_BUTTON = b"SDL_WINRT_HANDLE_BACK_BUTTON"

sdl2/keyboard.py

@@ -40,6 +40,8 @@ class SDL_Keysym(Structure):
     SDLFunc("SDL_StartTextInput"),
     SDLFunc("SDL_IsTextInputActive", None, SDL_bool),
     SDLFunc("SDL_StopTextInput"),
+    SDLFunc("SDL_ClearComposition", added='2.0.22'),
+    SDLFunc("SDL_IsTextInputShown", None, SDL_bool, added='2.0.22'),
     SDLFunc("SDL_SetTextInputRect", [_P(SDL_Rect)]),
     SDLFunc("SDL_HasScreenKeyboardSupport", None, SDL_bool),
     SDLFunc("SDL_IsScreenKeyboardShown", [_P(SDL_Window)], SDL_bool),
@@ -65,6 +67,8 @@ class SDL_Keysym(Structure):
 SDL_StartTextInput = _ctypes["SDL_StartTextInput"]
 SDL_IsTextInputActive = _ctypes["SDL_IsTextInputActive"]
 SDL_StopTextInput = _ctypes["SDL_StopTextInput"]
+SDL_ClearComposition = _ctypes["SDL_ClearComposition"]
+SDL_IsTextInputShown = _ctypes["SDL_IsTextInputShown"]
 SDL_SetTextInputRect = _ctypes["SDL_SetTextInputRect"]
 SDL_HasScreenKeyboardSupport = _ctypes["SDL_HasScreenKeyboardSupport"]
 SDL_IsScreenKeyboardShown = _ctypes["SDL_IsScreenKeyboardShown"]

sdl2/rect.py

@@ -1,14 +1,16 @@
 from ctypes import Structure, c_int, c_float
 from ctypes import POINTER as _P
 from .dll import _bind, SDLFunc, AttributeDict
-from .stdinc import SDL_bool
+from .stdinc import SDL_bool, SDL_FLT_EPSILON
 
 __all__ = [
     # Structs
     "SDL_Point", "SDL_FPoint", "SDL_Rect", "SDL_FRect",
 
     # Macro Functions
     "SDL_PointInRect", "SDL_RectEmpty", "SDL_RectEquals",
+    "SDL_PointInFRect", "SDL_FRectEmpty", "SDL_FRectEqualsEpsilon",
+    "SDL_FRectEquals"
 ]
 
 
@@ -145,6 +147,20 @@ def SDL_RectEquals(a, b):
 def SDL_PointInRect(p, r):
     return (p.x >= r.x) and (p.x < (r.x+r.w)) and (p.y >= r.y) and (p.y < (r.y+r.h))
 
+SDL_PointInFRect = SDL_PointInRect
+SDL_FRectEmpty = SDL_RectEmpty
+
+def SDL_FRectEqualsEpsilon(a, b, epsilon):
+    return (a and b and a == b) or (
+        abs(a.x - b.x) <= epsilon and
+        abs(a.y - b.y) <= epsilon and
+        abs(a.w - b.w) <= epsilon and
+        abs(a.h - b.h) <= epsilon
+    )
+
+def SDL_FRectEquals(a, b):
+    return SDL_FRectEqualsEpsilon(a, b, SDL_FLT_EPSILON)
+
 
 # Raw ctypes function definitions
 
@@ -157,6 +173,20 @@ def SDL_PointInRect(p, r):
         [_P(SDL_Rect), _P(c_int), _P(c_int), _P(c_int), _P(c_int)],
         returns = SDL_bool
     ),
+    SDLFunc("SDL_HasIntersectionF", [_P(SDL_FRect), _P(SDL_FRect)], SDL_bool, added='2.0.22'),
+    SDLFunc("SDL_IntersectFRect",
+        [_P(SDL_FRect), _P(SDL_FRect), _P(SDL_FRect)],
+        returns = SDL_bool, added = '2.0.22'
+    ),
+    SDLFunc("SDL_UnionFRect", [_P(SDL_FRect), _P(SDL_FRect), _P(SDL_FRect)], added='2.0.22'),
+    SDLFunc("SDL_EncloseFPoints",
+        [_P(SDL_FPoint), c_int, _P(SDL_FRect), _P(SDL_FRect)],
+        returns = SDL_bool, added = '2.0.22'
+    ),
+    SDLFunc("SDL_IntersectFRectAndLine",
+        [_P(SDL_FRect), _P(c_float), _P(c_float), _P(c_float), _P(c_float)],
+        returns = SDL_bool, added = '2.0.22'
+    ),
 ]
 _ctypes = AttributeDict()
 for f in _funcdefs:
@@ -171,3 +201,8 @@ def SDL_PointInRect(p, r):
 SDL_UnionRect = _ctypes["SDL_UnionRect"]
 SDL_EnclosePoints = _ctypes["SDL_EnclosePoints"]
 SDL_IntersectRectAndLine = _ctypes["SDL_IntersectRectAndLine"]
+SDL_HasIntersectionF = _ctypes["SDL_HasIntersectionF"]
+SDL_IntersectFRect = _ctypes["SDL_IntersectFRect"]
+SDL_UnionFRect = _ctypes["SDL_UnionFRect"]
+SDL_EncloseFPoints = _ctypes["SDL_EncloseFPoints"]
+SDL_IntersectFRectAndLine = _ctypes["SDL_IntersectFRectAndLine"]

sdl2/render.py

@@ -144,6 +144,7 @@ class SDL_Texture(c_void_p):
     SDLFunc("SDL_CreateRenderer", [_P(SDL_Window), c_int, Uint32], _P(SDL_Renderer)),
     SDLFunc("SDL_CreateSoftwareRenderer", [_P(SDL_Surface)], _P(SDL_Renderer)),
     SDLFunc("SDL_GetRenderer", [_P(SDL_Window)], _P(SDL_Renderer)),
+    SDLFunc("SDL_RenderGetWindow", [_P(SDL_Renderer)], _P(SDL_Window), added='2.0.22'),
     SDLFunc("SDL_GetRendererInfo", [_P(SDL_Renderer), _P(SDL_RendererInfo)], c_int),
     SDLFunc("SDL_GetRendererOutputSize", [_P(SDL_Renderer), _P(c_int), _P(c_int)], c_int),
     SDLFunc("SDL_CreateTexture", [_P(SDL_Renderer), Uint32, c_int, c_int, c_int], _P(SDL_Texture)),
@@ -293,6 +294,7 @@ class SDL_Texture(c_void_p):
 SDL_CreateRenderer = _ctypes["SDL_CreateRenderer"]
 SDL_CreateSoftwareRenderer = _ctypes["SDL_CreateSoftwareRenderer"]
 SDL_GetRenderer = _ctypes["SDL_GetRenderer"]
+SDL_RenderGetWindow = _ctypes["SDL_RenderGetWindow"]
 SDL_GetRendererInfo = _ctypes["SDL_GetRendererInfo"]
 SDL_GetRendererOutputSize = _ctypes["SDL_GetRendererOutputSize"]
 SDL_CreateTexture = _ctypes["SDL_CreateTexture"]