SDL API renaming: *Is* functions

Feedback from @icculus:
"IsTablet" uses "is" as a form of "to be" ...like, the actual question is of its nature.

The rest is just a superfluous word in the question and it flows as better English with if (RectEmpty) than if (IsRectEmpty)

Fixes https://github.com/libsdl-org/SDL/issues/6932

docs/README-ios.md

@@ -160,7 +160,7 @@ void SDL_StartTextInput()
 void SDL_StopTextInput()
 	-- disables text events and hides the onscreen keyboard.
 
-SDL_bool SDL_IsTextInputActive()
+SDL_bool SDL_TextInputActive()
 	-- returns whether or not text events are enabled (and the onscreen keyboard is visible)
 
 

docs/README-migration.md

@@ -140,7 +140,7 @@ The following functions have been renamed:
 * SDL_GameControllerFromPlayerIndex => SDL_GetGamepadFromPlayerIndex
 * SDL_GameControllerGetAppleSFSymbolsNameForAxis => SDL_GetGamepadAppleSFSymbolsNameForAxis
 * SDL_GameControllerGetAppleSFSymbolsNameForButton => SDL_GetGamepadAppleSFSymbolsNameForButton
-* SDL_GameControllerGetAttached => SDL_IsGamepadConnected
+* SDL_GameControllerGetAttached => SDL_GamepadConnected
 * SDL_GameControllerGetAxis => SDL_GetGamepadAxis
 * SDL_GameControllerGetAxisFromString => SDL_GetGamepadAxisFromString
 * SDL_GameControllerGetBindForAxis => SDL_GetGamepadBindForAxis
@@ -168,7 +168,7 @@ The following functions have been renamed:
 * SDL_GameControllerHasRumble => SDL_GamepadHasRumble
 * SDL_GameControllerHasRumbleTriggers => SDL_GamepadHasRumbleTriggers
 * SDL_GameControllerHasSensor => SDL_GamepadHasSensor
-* SDL_GameControllerIsSensorEnabled => SDL_IsGamepadSensorEnabled
+* SDL_GameControllerIsSensorEnabled => SDL_GamepadSensorEnabled
 * SDL_GameControllerMapping => SDL_GetGamepadMapping
 * SDL_GameControllerMappingForGUID => SDL_GetGamepadMappingForGUID
 * SDL_GameControllerMappingForIndex => SDL_GetGamepadMappingForIndex
@@ -307,7 +307,7 @@ The following functions have been renamed:
 * SDL_JoystickDetachVirtual => SDL_DetachVirtualJoystick
 * SDL_JoystickFromInstanceID => SDL_GetJoystickFromInstanceID
 * SDL_JoystickFromPlayerIndex => SDL_GetJoystickFromPlayerIndex
-* SDL_JoystickGetAttached => SDL_IsJoystickConnected
+* SDL_JoystickGetAttached => SDL_JoystickConnected
 * SDL_JoystickGetAxis => SDL_GetJoystickAxis
 * SDL_JoystickGetAxisInitialState => SDL_GetJoystickAxisInitialState
 * SDL_JoystickGetButton => SDL_GetJoystickButton
@@ -432,18 +432,17 @@ The preprocessor symbol __MACOSX__ has been renamed __MACOS__, and __IPHONEOS__
 The following functions have been renamed:
 * SDL_EncloseFPoints => SDL_GetRectEnclosingPointsF
 * SDL_EnclosePoints => SDL_GetRectEnclosingPoints
-* SDL_FRectEmpty => SDL_IsRectEmptyF
-* SDL_FRectEqualsEpsilon => SDL_AreRectsEqualF
+* SDL_FRectEmpty => SDL_RectEmptyF
+* SDL_FRectEquals => SDL_RectsEqualF
+* SDL_FRectEqualsEpsilon => SDL_RectsEqualEpsilon
 * SDL_HasIntersection => SDL_HasRectIntersection
 * SDL_HasIntersectionF => SDL_HasRectIntersectionF
 * SDL_IntersectFRect => SDL_GetRectIntersectionF
 * SDL_IntersectFRectAndLine => SDL_GetRectAndLineIntersectionF
 * SDL_IntersectRect => SDL_GetRectIntersection
 * SDL_IntersectRectAndLine => SDL_GetRectAndLineIntersection
-* SDL_PointInFRect => SDL_IsPointInRectF
-* SDL_PointInRect => SDL_IsPointInRect
-* SDL_RectEmpty => SDL_IsRectEmpty
-* SDL_RectEquals => SDL_AreRectsEqual
+* SDL_PointInFRect => SDL_PointInRectF
+* SDL_RectEquals => SDL_RectsEqual
 * SDL_UnionFRect => SDL_GetRectUnionF
 * SDL_UnionRect => SDL_GetRectUnion
 
@@ -486,14 +485,13 @@ The following functions have been renamed:
 * SDL_RenderGetScale => SDL_GetRenderScale
 * SDL_RenderGetViewport => SDL_GetRenderViewport
 * SDL_RenderGetWindow => SDL_GetRenderWindow
-* SDL_RenderIsClipEnabled => SDL_IsRenderClipEnabled
+* SDL_RenderIsClipEnabled => SDL_RenderClipEnabled
 * SDL_RenderSetClipRect => SDL_SetRenderClipRect
 * SDL_RenderSetIntegerScale => SDL_SetRenderIntegerScale
 * SDL_RenderSetLogicalSize => SDL_SetRenderLogicalSize
 * SDL_RenderSetScale => SDL_SetRenderScale
 * SDL_RenderSetVSync => SDL_SetRenderVSync
 * SDL_RenderSetViewport => SDL_SetRenderViewport
-* SDL_RenderTargetSupported => SDL_IsRenderTargetSupported
 
 ## SDL_rwops.h
 

include/SDL3/SDL_gamepad.h

@@ -625,7 +625,7 @@ extern DECLSPEC const char * SDLCALL SDL_GetGamepadSerial(SDL_Gamepad *gamepad);
  * \sa SDL_CloseGamepad
  * \sa SDL_OpenGamepad
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsGamepadConnected(SDL_Gamepad *gamepad);
+extern DECLSPEC SDL_bool SDLCALL SDL_GamepadConnected(SDL_Gamepad *gamepad);
 
 /**
  * Get the underlying joystick from a gamepad
@@ -905,7 +905,7 @@ extern DECLSPEC int SDLCALL SDL_SetGamepadSensorEnabled(SDL_Gamepad *gamepad, SD
  *
  * \since This function is available since SDL 3.0.0.
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsGamepadSensorEnabled(SDL_Gamepad *gamepad, SDL_SensorType type);
+extern DECLSPEC SDL_bool SDLCALL SDL_GamepadSensorEnabled(SDL_Gamepad *gamepad, SDL_SensorType type);
 
 /**
  * Get the data rate (number of events per second) of a gamepad

include/SDL3/SDL_joystick.h

@@ -657,7 +657,7 @@ extern DECLSPEC void SDLCALL SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint
  * \sa SDL_CloseJoystick
  * \sa SDL_OpenJoystick
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsJoystickConnected(SDL_Joystick *joystick);
+extern DECLSPEC SDL_bool SDLCALL SDL_JoystickConnected(SDL_Joystick *joystick);
 
 /**
  * Get the instance ID of an opened joystick.

include/SDL3/SDL_keyboard.h

@@ -269,7 +269,7 @@ extern DECLSPEC void SDLCALL SDL_StartTextInput(void);
  *
  * \sa SDL_StartTextInput
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_TextInputActive(void);
 
 /**
  * Stop receiving any text input events.
@@ -295,7 +295,7 @@ extern DECLSPEC void SDLCALL SDL_ClearComposition(void);
  *
  * \since This function is available since SDL 3.0.0.
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputShown(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_TextInputShown(void);
 
 /**
  * Set the rectangle used to type Unicode text inputs.
@@ -326,7 +326,7 @@ extern DECLSPEC void SDLCALL SDL_SetTextInputRect(const SDL_Rect *rect);
  * \since This function is available since SDL 3.0.0.
  *
  * \sa SDL_StartTextInput
- * \sa SDL_IsScreenKeyboardShown
+ * \sa SDL_ScreenKeyboardShown
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
 
@@ -340,7 +340,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
  *
  * \sa SDL_HasScreenKeyboardSupport
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
+extern DECLSPEC SDL_bool SDLCALL SDL_ScreenKeyboardShown(SDL_Window *window);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus

include/SDL3/SDL_oldnames.h

@@ -129,7 +129,7 @@
 #define SDL_GameControllerFromPlayerIndex SDL_GetGamepadFromPlayerIndex
 #define SDL_GameControllerGetAppleSFSymbolsNameForAxis SDL_GetGamepadAppleSFSymbolsNameForAxis
 #define SDL_GameControllerGetAppleSFSymbolsNameForButton SDL_GetGamepadAppleSFSymbolsNameForButton
-#define SDL_GameControllerGetAttached SDL_IsGamepadConnected
+#define SDL_GameControllerGetAttached SDL_GamepadConnected
 #define SDL_GameControllerGetAxis SDL_GetGamepadAxis
 #define SDL_GameControllerGetAxisFromString SDL_GetGamepadAxisFromString
 #define SDL_GameControllerGetBindForAxis SDL_GetGamepadBindForAxis
@@ -157,7 +157,7 @@
 #define SDL_GameControllerHasRumble SDL_GamepadHasRumble
 #define SDL_GameControllerHasRumbleTriggers SDL_GamepadHasRumbleTriggers
 #define SDL_GameControllerHasSensor SDL_GamepadHasSensor
-#define SDL_GameControllerIsSensorEnabled SDL_IsGamepadSensorEnabled
+#define SDL_GameControllerIsSensorEnabled SDL_GamepadSensorEnabled
 #define SDL_GameControllerMapping SDL_GetGamepadMapping
 #define SDL_GameControllerMappingForGUID SDL_GetGamepadMappingForGUID
 #define SDL_GameControllerMappingForIndex SDL_GetGamepadMappingForIndex
@@ -185,7 +185,7 @@
 #define SDL_JoystickDetachVirtual SDL_DetachVirtualJoystick
 #define SDL_JoystickFromInstanceID SDL_GetJoystickFromInstanceID
 #define SDL_JoystickFromPlayerIndex SDL_GetJoystickFromPlayerIndex
-#define SDL_JoystickGetAttached SDL_IsJoystickConnected
+#define SDL_JoystickGetAttached SDL_JoystickConnected
 #define SDL_JoystickGetAxis SDL_GetJoystickAxis
 #define SDL_JoystickGetAxisInitialState SDL_GetJoystickAxisInitialState
 #define SDL_JoystickGetButton SDL_GetJoystickButton
@@ -258,18 +258,17 @@
 /* ##SDL_rect.h */
 #define SDL_EncloseFPoints SDL_GetRectEnclosingPointsF
 #define SDL_EnclosePoints SDL_GetRectEnclosingPoints
-#define SDL_FRectEmpty SDL_IsRectEmptyF
-#define SDL_FRectEqualsEpsilon SDL_AreRectsEqualF
+#define SDL_FRectEmpty SDL_RectEmptyF
+#define SDL_FRectEquals SDL_RectsEqualF
+#define SDL_FRectEqualsEpsilon SDL_RectsEqualEpsilon
 #define SDL_HasIntersection SDL_HasRectIntersection
 #define SDL_HasIntersectionF SDL_HasRectIntersectionF
 #define SDL_IntersectFRect SDL_GetRectIntersectionF
 #define SDL_IntersectFRectAndLine SDL_GetRectAndLineIntersectionF
 #define SDL_IntersectRect SDL_GetRectIntersection
 #define SDL_IntersectRectAndLine SDL_GetRectAndLineIntersection
-#define SDL_PointInFRect SDL_IsPointInRectF
-#define SDL_PointInRect SDL_IsPointInRect
-#define SDL_RectEmpty SDL_IsRectEmpty
-#define SDL_RectEquals SDL_AreRectsEqual
+#define SDL_PointInFRect SDL_PointInRectF
+#define SDL_RectEquals SDL_RectsEqual
 #define SDL_UnionFRect SDL_GetRectUnionF
 #define SDL_UnionRect SDL_GetRectUnion
 
@@ -298,14 +297,13 @@
 #define SDL_RenderGetScale SDL_GetRenderScale
 #define SDL_RenderGetViewport SDL_GetRenderViewport
 #define SDL_RenderGetWindow SDL_GetRenderWindow
-#define SDL_RenderIsClipEnabled SDL_IsRenderClipEnabled
+#define SDL_RenderIsClipEnabled SDL_RenderClipEnabled
 #define SDL_RenderSetClipRect SDL_SetRenderClipRect
 #define SDL_RenderSetIntegerScale SDL_SetRenderIntegerScale
 #define SDL_RenderSetLogicalSize SDL_SetRenderLogicalSize
 #define SDL_RenderSetScale SDL_SetRenderScale
 #define SDL_RenderSetVSync SDL_SetRenderVSync
 #define SDL_RenderSetViewport SDL_SetRenderViewport
-#define SDL_RenderTargetSupported SDL_IsRenderTargetSupported
 
 /* ##SDL_rwops.h */
 #define RW_SEEK_CUR SDL_RW_SEEK_CUR
@@ -439,7 +437,7 @@
 #define SDL_GameControllerFromPlayerIndex SDL_GameControllerFromPlayerIndex_renamed_SDL_GetGamepadFromPlayerIndex
 #define SDL_GameControllerGetAppleSFSymbolsNameForAxis SDL_GameControllerGetAppleSFSymbolsNameForAxis_renamed_SDL_GetGamepadAppleSFSymbolsNameForAxis
 #define SDL_GameControllerGetAppleSFSymbolsNameForButton SDL_GameControllerGetAppleSFSymbolsNameForButton_renamed_SDL_GetGamepadAppleSFSymbolsNameForButton
-#define SDL_GameControllerGetAttached SDL_GameControllerGetAttached_renamed_SDL_IsGamepadConnected
+#define SDL_GameControllerGetAttached SDL_GameControllerGetAttached_renamed_SDL_GamepadConnected
 #define SDL_GameControllerGetAxis SDL_GameControllerGetAxis_renamed_SDL_GetGamepadAxis
 #define SDL_GameControllerGetAxisFromString SDL_GameControllerGetAxisFromString_renamed_SDL_GetGamepadAxisFromString
 #define SDL_GameControllerGetBindForAxis SDL_GameControllerGetBindForAxis_renamed_SDL_GetGamepadBindForAxis
@@ -467,7 +465,7 @@
 #define SDL_GameControllerHasRumble SDL_GameControllerHasRumble_renamed_SDL_GamepadHasRumble
 #define SDL_GameControllerHasRumbleTriggers SDL_GameControllerHasRumbleTriggers_renamed_SDL_GamepadHasRumbleTriggers
 #define SDL_GameControllerHasSensor SDL_GameControllerHasSensor_renamed_SDL_GamepadHasSensor
-#define SDL_GameControllerIsSensorEnabled SDL_GameControllerIsSensorEnabled_renamed_SDL_IsGamepadSensorEnabled
+#define SDL_GameControllerIsSensorEnabled SDL_GameControllerIsSensorEnabled_renamed_SDL_GamepadSensorEnabled
 #define SDL_GameControllerMapping SDL_GameControllerMapping_renamed_SDL_GetGamepadMapping
 #define SDL_GameControllerMappingForDeviceIndex SDL_GameControllerMappingForDeviceIndex_renamed_SDL_GetGamepadMappingForDeviceIndex
 #define SDL_GameControllerMappingForGUID SDL_GameControllerMappingForGUID_renamed_SDL_GetGamepadMappingForGUID
@@ -499,7 +497,7 @@
 #define SDL_JoystickDetachVirtual SDL_JoystickDetachVirtual_renamed_SDL_DetachVirtualJoystick
 #define SDL_JoystickFromInstanceID SDL_JoystickFromInstanceID_renamed_SDL_GetJoystickFromInstanceID
 #define SDL_JoystickFromPlayerIndex SDL_JoystickFromPlayerIndex_renamed_SDL_GetJoystickFromPlayerIndex
-#define SDL_JoystickGetAttached SDL_JoystickGetAttached_renamed_SDL_IsJoystickConnected
+#define SDL_JoystickGetAttached SDL_JoystickGetAttached_renamed_SDL_JoystickConnected
 #define SDL_JoystickGetAxis SDL_JoystickGetAxis_renamed_SDL_GetJoystickAxis
 #define SDL_JoystickGetAxisInitialState SDL_JoystickGetAxisInitialState_renamed_SDL_GetJoystickAxisInitialState
 #define SDL_JoystickGetButton SDL_JoystickGetButton_renamed_SDL_GetJoystickButton
@@ -580,18 +578,17 @@
 /* ##SDL_rect.h */
 #define SDL_EncloseFPoints SDL_EncloseFPoints_renamed_SDL_GetRectEnclosingPointsF
 #define SDL_EnclosePoints SDL_EnclosePoints_renamed_SDL_GetRectEnclosingPoints
-#define SDL_FRectEmpty SDL_FRectEmpty_renamed_SDL_IsRectEmptyF
-#define SDL_FRectEqualsEpsilon SDL_FRectEqualsEpsilon_renamed_SDL_AreRectsEqualF
+#define SDL_FRectEmpty SDL_FRectEmpty_renamed_SDL_RectEmptyF
+#define SDL_FRectEquals SDL_FRectEquals_renamed_SDL_RectsEqualF
+#define SDL_FRectEqualsEpsilon SDL_FRectEqualsEpsilon_renamed_SDL_RectsEqualEpsilon
 #define SDL_HasIntersection SDL_HasIntersection_renamed_SDL_HasRectIntersection
 #define SDL_HasIntersectionF SDL_HasIntersectionF_renamed_SDL_HasRectIntersectionF
 #define SDL_IntersectFRect SDL_IntersectFRect_renamed_SDL_GetRectIntersectionF
 #define SDL_IntersectFRectAndLine SDL_IntersectFRectAndLine_renamed_SDL_GetRectAndLineIntersectionF
 #define SDL_IntersectRect SDL_IntersectRect_renamed_SDL_GetRectIntersection
 #define SDL_IntersectRectAndLine SDL_IntersectRectAndLine_renamed_SDL_GetRectAndLineIntersection
-#define SDL_PointInFRect SDL_PointInFRect_renamed_SDL_IsPointInRectF
-#define SDL_PointInRect SDL_PointInRect_renamed_SDL_IsPointInRect
-#define SDL_RectEmpty SDL_RectEmpty_renamed_SDL_IsRectEmpty
-#define SDL_RectEquals SDL_RectEquals_renamed_SDL_AreRectsEqual
+#define SDL_PointInFRect SDL_PointInFRect_renamed_SDL_PointInRectF
+#define SDL_RectEquals SDL_RectEquals_renamed_SDL_RectsEqual
 #define SDL_UnionFRect SDL_UnionFRect_renamed_SDL_GetRectUnionF
 #define SDL_UnionRect SDL_UnionRect_renamed_SDL_GetRectUnion
 
@@ -620,14 +617,13 @@
 #define SDL_RenderGetScale SDL_RenderGetScale_renamed_SDL_GetRenderScale
 #define SDL_RenderGetViewport SDL_RenderGetViewport_renamed_SDL_GetRenderViewport
 #define SDL_RenderGetWindow SDL_RenderGetWindow_renamed_SDL_GetRenderWindow
-#define SDL_RenderIsClipEnabled SDL_RenderIsClipEnabled_renamed_SDL_IsRenderClipEnabled
+#define SDL_RenderIsClipEnabled SDL_RenderIsClipEnabled_renamed_SDL_RenderClipEnabled
 #define SDL_RenderSetClipRect SDL_RenderSetClipRect_renamed_SDL_SetRenderClipRect
 #define SDL_RenderSetIntegerScale SDL_RenderSetIntegerScale_renamed_SDL_SetRenderIntegerScale
 #define SDL_RenderSetLogicalSize SDL_RenderSetLogicalSize_renamed_SDL_SetRenderLogicalSize
 #define SDL_RenderSetScale SDL_RenderSetScale_renamed_SDL_SetRenderScale
 #define SDL_RenderSetVSync SDL_RenderSetVSync_renamed_SDL_SetRenderVSync
 #define SDL_RenderSetViewport SDL_RenderSetViewport_renamed_SDL_SetRenderViewport
-#define SDL_RenderTargetSupported SDL_RenderTargetSupported_renamed_SDL_IsRenderTargetSupported
 
 /* ##SDL_rwops.h */
 #define RW_SEEK_CUR RW_SEEK_CUR_renamed_SDL_RW_SEEK_CUR

include/SDL3/SDL_rect.h

@@ -43,7 +43,7 @@ extern "C" {
  * The structure that defines a point (integer)
  *
  * \sa SDL_GetRectEnclosingPoints
- * \sa SDL_IsPointInRect
+ * \sa SDL_PointInRect
  */
 typedef struct SDL_Point
 {
@@ -55,7 +55,7 @@ typedef struct SDL_Point
  * The structure that defines a point (floating point)
  *
  * \sa SDL_GetRectEnclosingPointsF
- * \sa SDL_IsPointInRectF
+ * \sa SDL_PointInRectF
  */
 typedef struct SDL_FPoint
 {
@@ -67,8 +67,8 @@ typedef struct SDL_FPoint
 /**
  * A rectangle, with the origin at the upper left (integer).
  *
- * \sa SDL_IsRectEmpty
- * \sa SDL_AreRectsEqual
+ * \sa SDL_RectEmpty
+ * \sa SDL_RectsEqual
  * \sa SDL_HasRectIntersection
  * \sa SDL_GetRectIntersection
  * \sa SDL_GetRectAndLineIntersection
@@ -85,15 +85,15 @@ typedef struct SDL_Rect
 /**
  * A rectangle, with the origin at the upper left (floating point).
  *
- * \sa SDL_IsRectEmptyF
- * \sa SDL_FRectEquals
- * \sa SDL_AreRectsEqualF
+ * \sa SDL_RectEmptyF
+ * \sa SDL_RectsEqualF
+ * \sa SDL_RectsEqualEpsilon
  * \sa SDL_HasRectIntersectionF
  * \sa SDL_GetRectIntersectionF
  * \sa SDL_GetRectAndLineIntersectionF
  * \sa SDL_GetRectUnionF
  * \sa SDL_GetRectEnclosingPointsF
- * \sa SDL_IsPointInRectF
+ * \sa SDL_PointInRectF
  */
 typedef struct SDL_FRect
 {
@@ -107,7 +107,7 @@ typedef struct SDL_FRect
 /**
  * Returns true if point resides inside a rectangle.
  */
-SDL_FORCE_INLINE SDL_bool SDL_IsPointInRect(const SDL_Point *p, const SDL_Rect *r)
+SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r)
 {
     return ( (p->x >= r->x) && (p->x < (r->x + r->w)) &&
              (p->y >= r->y) && (p->y < (r->y + r->h)) ) ? SDL_TRUE : SDL_FALSE;
@@ -116,7 +116,7 @@ SDL_FORCE_INLINE SDL_bool SDL_IsPointInRect(const SDL_Point *p, const SDL_Rect *
 /**
  * Returns true if the rectangle has no area.
  */
-SDL_FORCE_INLINE SDL_bool SDL_IsRectEmpty(const SDL_Rect *r)
+SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r)
 {
     return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE;
 }
@@ -124,7 +124,7 @@ SDL_FORCE_INLINE SDL_bool SDL_IsRectEmpty(const SDL_Rect *r)
 /**
  * Returns true if the two rectangles are equal.
  */
-SDL_FORCE_INLINE SDL_bool SDL_AreRectsEqual(const SDL_Rect *a, const SDL_Rect *b)
+SDL_FORCE_INLINE SDL_bool SDL_RectsEqual(const SDL_Rect *a, const SDL_Rect *b)
 {
     return (a && b && (a->x == b->x) && (a->y == b->y) &&
             (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE;
@@ -230,7 +230,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetRectAndLineIntersection(const SDL_Rect *
 /**
  * Returns true if point resides inside a rectangle.
  */
-SDL_FORCE_INLINE SDL_bool SDL_IsPointInRectF(const SDL_FPoint *p, const SDL_FRect *r)
+SDL_FORCE_INLINE SDL_bool SDL_PointInRectF(const SDL_FPoint *p, const SDL_FRect *r)
 {
     return ( (p->x >= r->x) && (p->x < (r->x + r->w)) &&
              (p->y >= r->y) && (p->y < (r->y + r->h)) ) ? SDL_TRUE : SDL_FALSE;
@@ -239,7 +239,7 @@ SDL_FORCE_INLINE SDL_bool SDL_IsPointInRectF(const SDL_FPoint *p, const SDL_FRec
 /**
  * Returns true if the rectangle has no area.
  */
-SDL_FORCE_INLINE SDL_bool SDL_IsRectEmptyF(const SDL_FRect *r)
+SDL_FORCE_INLINE SDL_bool SDL_RectEmptyF(const SDL_FRect *r)
 {
     return ((!r) || (r->w <= 0.0f) || (r->h <= 0.0f)) ? SDL_TRUE : SDL_FALSE;
 }
@@ -249,7 +249,7 @@ SDL_FORCE_INLINE SDL_bool SDL_IsRectEmptyF(const SDL_FRect *r)
  *
  * \since This function is available since SDL 2.0.22.
  */
-SDL_FORCE_INLINE SDL_bool SDL_AreRectsEqualF(const SDL_FRect *a, const SDL_FRect *b, const float epsilon)
+SDL_FORCE_INLINE SDL_bool SDL_RectsEqualEpsilon(const SDL_FRect *a, const SDL_FRect *b, const float epsilon)
 {
     return (a && b && ((a == b) ||
             ((SDL_fabsf(a->x - b->x) <= epsilon) &&
@@ -264,9 +264,9 @@ SDL_FORCE_INLINE SDL_bool SDL_AreRectsEqualF(const SDL_FRect *a, const SDL_FRect
  *
  * \since This function is available since SDL 2.0.22.
  */
-SDL_FORCE_INLINE SDL_bool SDL_FRectEquals(const SDL_FRect *a, const SDL_FRect *b)
+SDL_FORCE_INLINE SDL_bool SDL_RectsEqualF(const SDL_FRect *a, const SDL_FRect *b)
 {
-    return SDL_AreRectsEqualF(a, b, SDL_FLT_EPSILON);
+    return SDL_RectsEqualEpsilon(a, b, SDL_FLT_EPSILON);
 }
 
 /**

include/SDL3/SDL_render.h

@@ -769,7 +769,7 @@ extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
  *
  * \sa SDL_SetRenderTarget
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsRenderTargetSupported(SDL_Renderer *renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer);
 
 /**
  * Set a texture as the current rendering target.
@@ -938,7 +938,7 @@ extern DECLSPEC void SDLCALL SDL_GetRenderViewport(SDL_Renderer * renderer,
  * \since This function is available since SDL 3.0.0.
  *
  * \sa SDL_GetRenderClipRect
- * \sa SDL_IsRenderClipEnabled
+ * \sa SDL_RenderClipEnabled
  */
 extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer * renderer,
                                                   const SDL_Rect * rect);
@@ -953,7 +953,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer * renderer,
  *
  * \since This function is available since SDL 3.0.0.
  *
- * \sa SDL_IsRenderClipEnabled
+ * \sa SDL_RenderClipEnabled
  * \sa SDL_SetRenderClipRect
  */
 extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer * renderer,
@@ -971,7 +971,7 @@ extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer * renderer,
  * \sa SDL_GetRenderClipRect
  * \sa SDL_SetRenderClipRect
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsRenderClipEnabled(SDL_Renderer * renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderClipEnabled(SDL_Renderer * renderer);
 
 
 /**

include/SDL3/SDL_video.h

@@ -1612,7 +1612,7 @@ extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window);
  * \sa SDL_DisableScreenSaver
  * \sa SDL_EnableScreenSaver
  */
-extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_ScreenSaverEnabled(void);
 
 /**
  * Allow the screen to be blanked by a screen saver.
@@ -1620,7 +1620,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
  * \since This function is available since SDL 3.0.0.
  *
  * \sa SDL_DisableScreenSaver
- * \sa SDL_IsScreenSaverEnabled
+ * \sa SDL_ScreenSaverEnabled
  */
 extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
 
@@ -1636,7 +1636,7 @@ extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
  * \since This function is available since SDL 3.0.0.
  *
  * \sa SDL_EnableScreenSaver
- * \sa SDL_IsScreenSaverEnabled
+ * \sa SDL_ScreenSaverEnabled
  */
 extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
 

src/dynapi/SDL_dynapi.sym

@@ -426,18 +426,18 @@ SDL3_0.0.0 {
     SDL_IsChromebook;
     SDL_IsDeXMode;
     SDL_IsGamepad;
-    SDL_IsGamepadConnected;
-    SDL_IsGamepadSensorEnabled;
-    SDL_IsJoystickConnected;
+    SDL_GamepadConnected;
+    SDL_GamepadSensorEnabled;
+    SDL_JoystickConnected;
     SDL_IsJoystickVirtual;
-    SDL_IsRenderClipEnabled;
-    SDL_IsRenderTargetSupported;
-    SDL_IsScreenKeyboardShown;
-    SDL_IsScreenSaverEnabled;
+    SDL_RenderClipEnabled;
+    SDL_RenderTargetSupported;
+    SDL_ScreenKeyboardShown;
+    SDL_ScreenSaverEnabled;
     SDL_IsShapedWindow;
     SDL_IsTablet;
-    SDL_IsTextInputActive;
-    SDL_IsTextInputShown;
+    SDL_TextInputActive;
+    SDL_TextInputShown;
     SDL_JoystickHasLED;
     SDL_JoystickHasRumble;
     SDL_JoystickHasRumbleTriggers;

src/dynapi/SDL_dynapi_overrides.h

@@ -452,18 +452,18 @@
 #define SDL_IsChromebook    SDL_IsChromebook_REAL
 #define SDL_IsDeXMode   SDL_IsDeXMode_REAL
 #define SDL_IsGamepad SDL_IsGamepad_REAL
-#define SDL_IsGamepadConnected SDL_IsGamepadConnected_REAL
-#define SDL_IsGamepadSensorEnabled SDL_IsGamepadSensorEnabled_REAL
-#define SDL_IsJoystickConnected SDL_IsJoystickConnected_REAL
+#define SDL_GamepadConnected SDL_GamepadConnected_REAL
+#define SDL_GamepadSensorEnabled SDL_GamepadSensorEnabled_REAL
+#define SDL_JoystickConnected SDL_JoystickConnected_REAL
 #define SDL_IsJoystickVirtual SDL_IsJoystickVirtual_REAL
-#define SDL_IsRenderClipEnabled SDL_IsRenderClipEnabled_REAL
-#define SDL_IsRenderTargetSupported SDL_IsRenderTargetSupported_REAL
-#define SDL_IsScreenKeyboardShown SDL_IsScreenKeyboardShown_REAL
-#define SDL_IsScreenSaverEnabled SDL_IsScreenSaverEnabled_REAL
+#define SDL_RenderClipEnabled SDL_RenderClipEnabled_REAL
+#define SDL_RenderTargetSupported SDL_RenderTargetSupported_REAL
+#define SDL_ScreenKeyboardShown SDL_ScreenKeyboardShown_REAL
+#define SDL_ScreenSaverEnabled SDL_ScreenSaverEnabled_REAL
 #define SDL_IsShapedWindow SDL_IsShapedWindow_REAL
 #define SDL_IsTablet SDL_IsTablet_REAL
-#define SDL_IsTextInputActive SDL_IsTextInputActive_REAL
-#define SDL_IsTextInputShown SDL_IsTextInputShown_REAL
+#define SDL_TextInputActive SDL_TextInputActive_REAL
+#define SDL_TextInputShown SDL_TextInputShown_REAL
 #define SDL_JoystickHasLED SDL_JoystickHasLED_REAL
 #define SDL_JoystickHasRumble SDL_JoystickHasRumble_REAL
 #define SDL_JoystickHasRumbleTriggers SDL_JoystickHasRumbleTriggers_REAL

src/dynapi/SDL_dynapi_procs.h

@@ -523,18 +523,18 @@ SDL_DYNAPI_PROC(void,SDL_HideWindow,(SDL_Window *a),(a),)
 SDL_DYNAPI_PROC(int,SDL_Init,(Uint32 a),(a),return)
 SDL_DYNAPI_PROC(int,SDL_InitSubSystem,(Uint32 a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_IsGamepad,(SDL_JoystickID a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsGamepadConnected,(SDL_Gamepad *a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsGamepadSensorEnabled,(SDL_Gamepad *a, SDL_SensorType b),(a,b),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsJoystickConnected,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GamepadConnected,(SDL_Gamepad *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GamepadSensorEnabled,(SDL_Gamepad *a, SDL_SensorType b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickConnected,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_IsJoystickVirtual,(SDL_JoystickID a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsRenderClipEnabled,(SDL_Renderer *a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsRenderTargetSupported,(SDL_Renderer *a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsScreenKeyboardShown,(SDL_Window *a),(a),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsScreenSaverEnabled,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_RenderClipEnabled,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_RenderTargetSupported,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_ScreenKeyboardShown,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_ScreenSaverEnabled,(void),(),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_IsShapedWindow,(const SDL_Window *a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_IsTablet,(void),(),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsTextInputActive,(void),(),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_IsTextInputShown,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_TextInputActive,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_TextInputShown,(void),(),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasLED,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasRumble,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasRumbleTriggers,(SDL_Joystick *a),(a),return)

src/joystick/SDL_gamepad.c

@@ -2572,7 +2572,7 @@ int SDL_SetGamepadSensorEnabled(SDL_Gamepad *gamepad, SDL_SensorType type, SDL_b
 /*
  *  Query whether sensor data reporting is enabled for a gamepad
  */
-SDL_bool SDL_IsGamepadSensorEnabled(SDL_Gamepad *gamepad, SDL_SensorType type)
+SDL_bool SDL_GamepadSensorEnabled(SDL_Gamepad *gamepad, SDL_SensorType type)
 {
     SDL_bool retval = SDL_FALSE;
 
@@ -2764,14 +2764,14 @@ const char * SDL_GetGamepadSerial(SDL_Gamepad *gamepad)
  * Return if the gamepad in question is currently attached to the system,
  *  \return 0 if not plugged in, 1 if still present.
  */
-SDL_bool SDL_IsGamepadConnected(SDL_Gamepad *gamepad)
+SDL_bool SDL_GamepadConnected(SDL_Gamepad *gamepad)
 {
     SDL_Joystick *joystick = SDL_GetGamepadJoystick(gamepad);
 
     if (joystick == NULL) {
         return SDL_FALSE;
     }
-    return SDL_IsJoystickConnected(joystick);
+    return SDL_JoystickConnected(joystick);
 }
 
 /*

src/joystick/SDL_joystick.c

@@ -906,7 +906,7 @@ Uint8 SDL_GetJoystickButton(SDL_Joystick *joystick, int button)
  * Return if the joystick in question is currently attached to the system,
  *  \return SDL_FALSE if not plugged in, SDL_TRUE if still present.
  */
-SDL_bool SDL_IsJoystickConnected(SDL_Joystick *joystick)
+SDL_bool SDL_JoystickConnected(SDL_Joystick *joystick)
 {
     SDL_bool retval;
 

src/render/SDL_render.c

@@ -2141,7 +2141,7 @@ void SDL_UnlockTexture(SDL_Texture *texture)
 }
 
 SDL_bool
-SDL_IsRenderTargetSupported(SDL_Renderer *renderer)
+SDL_RenderTargetSupported(SDL_Renderer *renderer)
 {
     if (renderer == NULL || !renderer->SetRenderTarget) {
         return SDL_FALSE;
@@ -2151,7 +2151,7 @@ SDL_IsRenderTargetSupported(SDL_Renderer *renderer)
 
 int SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture)
 {
-    if (!SDL_IsRenderTargetSupported(renderer)) {
+    if (!SDL_RenderTargetSupported(renderer)) {
         return SDL_Unsupported();
     }
 
@@ -2483,7 +2483,7 @@ void SDL_GetRenderClipRect(SDL_Renderer *renderer, SDL_Rect *rect)
 }
 
 SDL_bool
-SDL_IsRenderClipEnabled(SDL_Renderer *renderer)
+SDL_RenderClipEnabled(SDL_Renderer *renderer)
 {
     CHECK_RENDERER_MAGIC(renderer, SDL_FALSE)
     return renderer->clipping_enabled;

src/test/SDL_test_common.c

@@ -1295,7 +1295,7 @@ SDLTest_CommonInit(SDLTest_CommonState *state)
 
             SDL_ShowWindow(state->windows[i]);
 
-            if (!SDL_IsRectEmpty(&state->confine)) {
+            if (!SDL_RectEmpty(&state->confine)) {
                 SDL_SetWindowMouseRect(state->windows[i], &state->confine);
             }
 
@@ -1913,7 +1913,7 @@ void SDLTest_CommonEvent(SDLTest_CommonState *state, SDL_Event *event, int *done
                         SDL_Rect clip;
                         SDL_GetWindowSize(state->windows[i], &w, &h);
                         SDL_GetRenderClipRect(state->renderers[i], &clip);
-                        if (SDL_IsRectEmpty(&clip)) {
+                        if (SDL_RectEmpty(&clip)) {
                             clip.x = w / 4;
                             clip.y = h / 4;
                             clip.w = w / 2;

src/video/SDL_blit.c

@@ -59,7 +59,7 @@ static int SDLCALL SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect,
     }
 
     /* Set up source and destination buffer pointers, and BLIT! */
-    if (okay && !SDL_IsRectEmpty(srcrect)) {
+    if (okay && !SDL_RectEmpty(srcrect)) {
         SDL_BlitFunc RunBlit;
         SDL_BlitInfo *info = &src->map->info;
 

src/video/SDL_fillrect.c

@@ -240,7 +240,7 @@ int SDL_FillSurfaceRect(SDL_Surface *dst, const SDL_Rect *rect, Uint32 color)
     if (rect == NULL) {
         rect = &dst->clip_rect;
         /* Don't attempt to fill if the surface's clip_rect is empty */
-        if (SDL_IsRectEmpty(rect)) {
+        if (SDL_RectEmpty(rect)) {
             return 0;
         }
     }

src/video/SDL_rect.c

@@ -92,7 +92,7 @@ SDL_GetSpanEnclosingRect(int width, int height,
 #define COMPUTEOUTCODE           ComputeOutCode
 #define SDL_HASINTERSECTION      SDL_HasRectIntersection
 #define SDL_INTERSECTRECT        SDL_GetRectIntersection
-#define SDL_RECTEMPTY            SDL_IsRectEmpty
+#define SDL_RECTEMPTY            SDL_RectEmpty
 #define SDL_UNIONRECT            SDL_GetRectUnion
 #define SDL_ENCLOSEPOINTS        SDL_GetRectEnclosingPoints
 #define SDL_INTERSECTRECTANDLINE SDL_GetRectAndLineIntersection
@@ -104,7 +104,7 @@ SDL_GetSpanEnclosingRect(int width, int height,
 #define COMPUTEOUTCODE           ComputeOutCodeF
 #define SDL_HASINTERSECTION      SDL_HasRectIntersectionF
 #define SDL_INTERSECTRECT        SDL_GetRectIntersectionF
-#define SDL_RECTEMPTY            SDL_IsRectEmptyF
+#define SDL_RECTEMPTY            SDL_RectEmptyF
 #define SDL_UNIONRECT            SDL_GetRectUnionF
 #define SDL_ENCLOSEPOINTS        SDL_GetRectEnclosingPointsF
 #define SDL_INTERSECTRECTANDLINE SDL_GetRectAndLineIntersectionF

src/video/SDL_video.c

@@ -2899,7 +2899,7 @@ SDL_GetWindowMouseRect(SDL_Window *window)
 {
     CHECK_WINDOW_MAGIC(window, NULL);
 
-    if (SDL_IsRectEmpty(&window->mouse_rect)) {
+    if (SDL_RectEmpty(&window->mouse_rect)) {
         return NULL;
     } else {
         return &window->mouse_rect;
@@ -3148,7 +3148,7 @@ void SDL_DestroyWindow(SDL_Window *window)
 }
 
 SDL_bool
-SDL_IsScreenSaverEnabled()
+SDL_ScreenSaverEnabled()
 {
     if (_this == NULL) {
         return SDL_TRUE;
@@ -4252,7 +4252,7 @@ void SDL_ClearComposition(void)
 }
 
 SDL_bool
-SDL_IsTextInputShown(void)
+SDL_TextInputShown(void)
 {
     if (_this && _this->IsTextInputShown) {
         return _this->IsTextInputShown(_this);
@@ -4262,7 +4262,7 @@ SDL_IsTextInputShown(void)
 }
 
 SDL_bool
-SDL_IsTextInputActive(void)
+SDL_TextInputActive(void)
 {
     return SDL_EventEnabled(SDL_TEXTINPUT);
 }
@@ -4304,7 +4304,7 @@ SDL_HasScreenKeyboardSupport(void)
 }
 
 SDL_bool
-SDL_IsScreenKeyboardShown(SDL_Window *window)
+SDL_ScreenKeyboardShown(SDL_Window *window)
 {
     if (window && _this && _this->IsScreenKeyboardShown) {
         return _this->IsScreenKeyboardShown(_this, window);

src/video/android/SDL_androidevents.c

@@ -148,7 +148,7 @@ void Android_PumpEvents_Blocking(_THIS)
 #endif
 
             /* Make sure SW Keyboard is restored when an app becomes foreground */
-            if (SDL_IsTextInputActive()) {
+            if (SDL_TextInputActive()) {
                 Android_StartTextInput(_this); /* Only showTextInput */
             }
         }
@@ -232,7 +232,7 @@ void Android_PumpEvents_NonBlocking(_THIS)
 #endif
 
             /* Make sure SW Keyboard is restored when an app becomes foreground */
-            if (SDL_IsTextInputActive()) {
+            if (SDL_TextInputActive()) {
                 Android_StartTextInput(_this); /* Only showTextInput */
             }
         }

src/video/cocoa/SDL_cocoamouse.m

@@ -236,7 +236,7 @@ static SDL_Window *SDL_FindWindowAtPoint(const int x, const int y)
     SDL_Window *i;
     for (i = SDL_GetVideoDevice()->windows; i; i = i->next) {
         const SDL_Rect r = { i->x, i->y, i->w, i->h };
-        if (SDL_IsPointInRect(&pt, &r)) {
+        if (SDL_PointInRect(&pt, &r)) {
             return i;
         }
     }

src/video/cocoa/SDL_cocoawindow.m

@@ -432,12 +432,12 @@ static void Cocoa_UpdateClipCursor(SDL_Window *window)
             }
 
             if ((window->flags & SDL_WINDOW_MOUSE_GRABBED) != 0 &&
-                SDL_IsRectEmpty(&mouse_rect)) {
+                SDL_RectEmpty(&mouse_rect)) {
                 SDL_memcpy(&mouse_rect, &window_rect, sizeof(mouse_rect));
             }
         }
 
-        if (SDL_IsRectEmpty(&mouse_rect)) {
+        if (SDL_RectEmpty(&mouse_rect)) {
             nswindow.mouseConfinementRect = NSZeroRect;
         } else {
             NSRect rect;

src/video/wayland/SDL_waylandevents.c

@@ -2758,11 +2758,11 @@ int Wayland_input_confine_pointer(struct SDL_WaylandInput *input, SDL_Window *wi
     }
 
     /* Don't confine the pointer if it shouldn't be confined. */
-    if (SDL_IsRectEmpty(&window->mouse_rect) && !(window->flags & SDL_WINDOW_MOUSE_GRABBED)) {
+    if (SDL_RectEmpty(&window->mouse_rect) && !(window->flags & SDL_WINDOW_MOUSE_GRABBED)) {
         return 0;
     }
 
-    if (SDL_IsRectEmpty(&window->mouse_rect)) {
+    if (SDL_RectEmpty(&window->mouse_rect)) {
         confine_rect = NULL;
     } else {
         SDL_Rect scaled_mouse_rect;

src/video/wayland/SDL_waylandkeyboard.c

@@ -76,7 +76,7 @@ void Wayland_StartTextInput(_THIS)
             zwp_text_input_v3_set_content_type(input->text_input->text_input,
                                                ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE,
                                                ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL);
-            if (!SDL_IsRectEmpty(rect)) {
+            if (!SDL_RectEmpty(rect)) {
                 /* This gets reset on enable so we have to cache it */
                 zwp_text_input_v3_set_cursor_rectangle(input->text_input->text_input,
                                                        rect->x,
@@ -122,7 +122,7 @@ void Wayland_SetTextInputRect(_THIS, const SDL_Rect *rect)
     if (driverdata->text_input_manager) {
         struct SDL_WaylandInput *input = driverdata->input;
         if (input != NULL && input->text_input) {
-            if (!SDL_AreRectsEqual(rect, &input->text_input->cursor_rect)) {
+            if (!SDL_RectsEqual(rect, &input->text_input->cursor_rect)) {
                 SDL_copyp(&input->text_input->cursor_rect, rect);
                 zwp_text_input_v3_set_cursor_rectangle(input->text_input->text_input,
                                                        rect->x,

src/video/wayland/SDL_waylandwindow.c

@@ -1841,7 +1841,7 @@ void Wayland_SetWindowMouseRect(_THIS, SDL_Window *window)
      * Just know that this call lets you confine with a rect, SetWindowGrab
      * lets you confine without a rect.
      */
-    if (SDL_IsRectEmpty(&window->mouse_rect) && !(window->flags & SDL_WINDOW_MOUSE_GRABBED)) {
+    if (SDL_RectEmpty(&window->mouse_rect) && !(window->flags & SDL_WINDOW_MOUSE_GRABBED)) {
         Wayland_input_unconfine_pointer(data->input, window);
     } else {
         Wayland_input_confine_pointer(data->input, window);
@@ -1854,7 +1854,7 @@ void Wayland_SetWindowMouseGrab(_THIS, SDL_Window *window, SDL_bool grabbed)
 
     if (grabbed) {
         Wayland_input_confine_pointer(data->input, window);
-    } else if (SDL_IsRectEmpty(&window->mouse_rect)) {
+    } else if (SDL_RectEmpty(&window->mouse_rect)) {
         Wayland_input_unconfine_pointer(data->input, window);
     }
 }

src/video/x11/SDL_x11xfixes.c

@@ -71,7 +71,7 @@ int X11_XfixesIsInitialized()
 
 void X11_SetWindowMouseRect(_THIS, SDL_Window *window)
 {
-    if (SDL_IsRectEmpty(&window->mouse_rect)) {
+    if (SDL_RectEmpty(&window->mouse_rect)) {
         X11_ConfineCursorWithFlags(_this, window, NULL, 0);
     } else {
         if (window->flags & SDL_WINDOW_INPUT_FOCUS) {

test/checkkeys.c

@@ -201,7 +201,7 @@ void loop()
             SDLTest_TextWindowAddText(textwin, "%s", event.text.text);
             break;
         case SDL_FINGERDOWN:
-            if (SDL_IsTextInputActive()) {
+            if (SDL_TextInputActive()) {
                 SDL_Log("Stopping text input\n");
                 SDL_StopTextInput();
             } else {
@@ -214,7 +214,7 @@ void loop()
             if (event.button.button == SDL_BUTTON_LEFT) {
                 done = 1;
             } else {
-                if (SDL_IsTextInputActive()) {
+                if (SDL_TextInputActive()) {
                     SDL_Log("Stopping text input\n");
                     SDL_StopTextInput();
                 } else {

test/checkkeysthreads.c

@@ -191,7 +191,7 @@ void loop()
             if (event.button.button == SDL_BUTTON_LEFT) {
                 done = 1;
             } else {
-                if (SDL_IsTextInputActive()) {
+                if (SDL_TextInputActive()) {
                     SDL_Log("Stopping text input\n");
                     SDL_StopTextInput();
                 } else {

test/testautomation_rect.c

@@ -360,7 +360,7 @@ void _validateUnionRectResults(
 }
 
 /* !
- * \brief Private helper to check SDL_IsRectEmpty results
+ * \brief Private helper to check SDL_RectEmpty results
  */
 void _validateRectEmptyResults(
     SDL_bool empty, SDL_bool expectedEmpty,
@@ -378,7 +378,7 @@ void _validateRectEmptyResults(
 }
 
 /* !
- * \brief Private helper to check SDL_AreRectsEqual results
+ * \brief Private helper to check SDL_RectsEqual results
  */
 void _validateRectEqualsResults(
     SDL_bool equals, SDL_bool expectedEquals,
@@ -401,7 +401,7 @@ void _validateRectEqualsResults(
 }
 
 /* !
- * \brief Private helper to check SDL_FRectEquals results
+ * \brief Private helper to check SDL_RectsEqualF results
  */
 void _validateFRectEqualsResults(
     SDL_bool equals, SDL_bool expectedEquals,
@@ -648,7 +648,7 @@ int rect_testIntersectRectEmpty(void *arg)
     rectB = refRectB;
     intersection = SDL_GetRectIntersection(&rectA, &rectB, &result);
     _validateIntersectRectResults(intersection, SDL_FALSE, &rectA, &rectB, &refRectA, &refRectB, (SDL_Rect *)NULL, (SDL_Rect *)NULL);
-    empty = SDL_IsRectEmpty(&result);
+    empty = SDL_RectEmpty(&result);
     SDLTest_AssertCheck(empty == SDL_TRUE, "Validate result is empty Rect; got: %s", (empty == SDL_TRUE) ? "SDL_TRUE" : "SDL_FALSE");
 
     /* Rect B empty */
@@ -665,7 +665,7 @@ int rect_testIntersectRectEmpty(void *arg)
     rectB = refRectB;
     intersection = SDL_GetRectIntersection(&rectA, &rectB, &result);
     _validateIntersectRectResults(intersection, SDL_FALSE, &rectA, &rectB, &refRectA, &refRectB, (SDL_Rect *)NULL, (SDL_Rect *)NULL);
-    empty = SDL_IsRectEmpty(&result);
+    empty = SDL_RectEmpty(&result);
     SDLTest_AssertCheck(empty == SDL_TRUE, "Validate result is empty Rect; got: %s", (empty == SDL_TRUE) ? "SDL_TRUE" : "SDL_FALSE");
 
     /* Rect A and B empty */
@@ -684,7 +684,7 @@ int rect_testIntersectRectEmpty(void *arg)
     rectB = refRectB;
     intersection = SDL_GetRectIntersection(&rectA, &rectB, &result);
     _validateIntersectRectResults(intersection, SDL_FALSE, &rectA, &rectB, &refRectA, &refRectB, (SDL_Rect *)NULL, (SDL_Rect *)NULL);
-    empty = SDL_IsRectEmpty(&result);
+    empty = SDL_RectEmpty(&result);
     SDLTest_AssertCheck(empty == SDL_TRUE, "Validate result is empty Rect; got: %s", (empty == SDL_TRUE) ? "SDL_TRUE" : "SDL_FALSE");
 
     return TEST_COMPLETED;
@@ -1510,10 +1510,10 @@ int rect_testUnionRectParam(void *arg)
 }
 
 /* !
- * \brief Tests SDL_IsRectEmpty() with various inputs
+ * \brief Tests SDL_RectEmpty() with various inputs
  *
  * \sa
- * http://wiki.libsdl.org/SDL_IsRectEmpty
+ * http://wiki.libsdl.org/SDL_RectEmpty
  */
 int rect_testRectEmpty(void *arg)
 {
@@ -1530,7 +1530,7 @@ int rect_testRectEmpty(void *arg)
     refRect.h = SDLTest_RandomIntegerInRange(256, 1024);
     expectedResult = SDL_FALSE;
     rect = refRect;
-    result = SDL_IsRectEmpty(&rect);
+    result = SDL_RectEmpty(&rect);
     _validateRectEmptyResults(result, expectedResult, &rect, &refRect);
 
     /* Empty case */
@@ -1543,7 +1543,7 @@ int rect_testRectEmpty(void *arg)
                 refRect.h = h;
                 expectedResult = SDL_TRUE;
                 rect = refRect;
-                result = SDL_IsRectEmpty(&rect);
+                result = SDL_RectEmpty(&rect);
                 _validateRectEmptyResults(result, expectedResult, &rect, &refRect);
             }
         }
@@ -1553,27 +1553,27 @@ int rect_testRectEmpty(void *arg)
 }
 
 /* !
- * \brief Negative tests against SDL_IsRectEmpty() with invalid parameters
+ * \brief Negative tests against SDL_RectEmpty() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/SDL_IsRectEmpty
+ * http://wiki.libsdl.org/SDL_RectEmpty
  */
 int rect_testRectEmptyParam(void *arg)
 {
     SDL_bool result;
 
     /* invalid parameter combinations */
-    result = SDL_IsRectEmpty(NULL);
+    result = SDL_RectEmpty(NULL);
     SDLTest_AssertCheck(result == SDL_TRUE, "Check that function returns TRUE when 1st parameter is NULL");
 
     return TEST_COMPLETED;
 }
 
 /* !
- * \brief Tests SDL_AreRectsEqual() with various inputs
+ * \brief Tests SDL_RectsEqual() with various inputs
  *
  * \sa
- * http://wiki.libsdl.org/SDL_AreRectsEqual
+ * http://wiki.libsdl.org/SDL_RectsEqual
  */
 int rect_testRectEquals(void *arg)
 {
@@ -1593,17 +1593,17 @@ int rect_testRectEquals(void *arg)
     expectedResult = SDL_TRUE;
     rectA = refRectA;
     rectB = refRectB;
-    result = SDL_AreRectsEqual(&rectA, &rectB);
+    result = SDL_RectsEqual(&rectA, &rectB);
     _validateRectEqualsResults(result, expectedResult, &rectA, &rectB, &refRectA, &refRectB);
 
     return TEST_COMPLETED;
 }
 
 /* !
- * \brief Negative tests against SDL_AreRectsEqual() with invalid parameters
+ * \brief Negative tests against SDL_RectsEqual() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/SDL_AreRectsEqual
+ * http://wiki.libsdl.org/SDL_RectsEqual
  */
 int rect_testRectEqualsParam(void *arg)
 {
@@ -1622,21 +1622,21 @@ int rect_testRectEqualsParam(void *arg)
     rectB.h = SDLTest_RandomIntegerInRange(1, 1024);
 
     /* invalid parameter combinations */
-    result = SDL_AreRectsEqual(NULL, &rectB);
+    result = SDL_RectsEqual(NULL, &rectB);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 1st parameter is NULL");
-    result = SDL_AreRectsEqual(&rectA, NULL);
+    result = SDL_RectsEqual(&rectA, NULL);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 2nd parameter is NULL");
-    result = SDL_AreRectsEqual(NULL, NULL);
+    result = SDL_RectsEqual(NULL, NULL);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 1st and 2nd parameter are NULL");
 
     return TEST_COMPLETED;
 }
 
 /* !
- * \brief Tests SDL_FRectEquals() with various inputs
+ * \brief Tests SDL_RectsEqualF() with various inputs
  *
  * \sa
- * http://wiki.libsdl.org/SDL_FRectEquals
+ * http://wiki.libsdl.org/SDL_RectsEqualF
  */
 int rect_testFRectEquals(void *arg)
 {
@@ -1656,17 +1656,17 @@ int rect_testFRectEquals(void *arg)
     expectedResult = SDL_TRUE;
     rectA = refRectA;
     rectB = refRectB;
-    result = SDL_FRectEquals(&rectA, &rectB);
+    result = SDL_RectsEqualF(&rectA, &rectB);
     _validateFRectEqualsResults(result, expectedResult, &rectA, &rectB, &refRectA, &refRectB);
 
     return TEST_COMPLETED;
 }
 
 /* !
- * \brief Negative tests against SDL_FRectEquals() with invalid parameters
+ * \brief Negative tests against SDL_RectsEqualF() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/SDL_FRectEquals
+ * http://wiki.libsdl.org/SDL_RectsEqualF
  */
 int rect_testFRectEqualsParam(void *arg)
 {
@@ -1685,11 +1685,11 @@ int rect_testFRectEqualsParam(void *arg)
     rectB.h = SDLTest_RandomFloat();
 
     /* invalid parameter combinations */
-    result = SDL_FRectEquals(NULL, &rectB);
+    result = SDL_RectsEqualF(NULL, &rectB);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 1st parameter is NULL");
-    result = SDL_FRectEquals(&rectA, NULL);
+    result = SDL_RectsEqualF(&rectA, NULL);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 2nd parameter is NULL");
-    result = SDL_FRectEquals(NULL, NULL);
+    result = SDL_RectsEqualF(NULL, NULL);
     SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 1st and 2nd parameter are NULL");
 
     return TEST_COMPLETED;
@@ -1804,33 +1804,33 @@ static const SDLTest_TestCaseReference rectTest25 = {
     (SDLTest_TestCaseFp)rect_testUnionRectParam, "rect_testUnionRectParam", "Negative tests against SDL_GetRectUnion with invalid parameters", TEST_ENABLED
 };
 
-/* SDL_IsRectEmpty */
+/* SDL_RectEmpty */
 static const SDLTest_TestCaseReference rectTest26 = {
-    (SDLTest_TestCaseFp)rect_testRectEmpty, "rect_testRectEmpty", "Tests SDL_IsRectEmpty with various inputs", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testRectEmpty, "rect_testRectEmpty", "Tests SDL_RectEmpty with various inputs", TEST_ENABLED
 };
 
 static const SDLTest_TestCaseReference rectTest27 = {
-    (SDLTest_TestCaseFp)rect_testRectEmptyParam, "rect_testRectEmptyParam", "Negative tests against SDL_IsRectEmpty with invalid parameters", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testRectEmptyParam, "rect_testRectEmptyParam", "Negative tests against SDL_RectEmpty with invalid parameters", TEST_ENABLED
 };
 
-/* SDL_AreRectsEqual */
+/* SDL_RectsEqual */
 
 static const SDLTest_TestCaseReference rectTest28 = {
-    (SDLTest_TestCaseFp)rect_testRectEquals, "rect_testRectEquals", "Tests SDL_AreRectsEqual with various inputs", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testRectEquals, "rect_testRectEquals", "Tests SDL_RectsEqual with various inputs", TEST_ENABLED
 };
 
 static const SDLTest_TestCaseReference rectTest29 = {
-    (SDLTest_TestCaseFp)rect_testRectEqualsParam, "rect_testRectEqualsParam", "Negative tests against SDL_AreRectsEqual with invalid parameters", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testRectEqualsParam, "rect_testRectEqualsParam", "Negative tests against SDL_RectsEqual with invalid parameters", TEST_ENABLED
 };
 
-/* SDL_FRectEquals */
+/* SDL_RectsEqualF */
 
 static const SDLTest_TestCaseReference rectTest30 = {
-    (SDLTest_TestCaseFp)rect_testFRectEquals, "rect_testFRectEquals", "Tests SDL_FRectEquals with various inputs", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testFRectEquals, "rect_testFRectEquals", "Tests SDL_RectsEqualF with various inputs", TEST_ENABLED
 };
 
 static const SDLTest_TestCaseReference rectTest31 = {
-    (SDLTest_TestCaseFp)rect_testFRectEqualsParam, "rect_testFRectEqualsParam", "Negative tests against SDL_FRectEquals with invalid parameters", TEST_ENABLED
+    (SDLTest_TestCaseFp)rect_testFRectEqualsParam, "rect_testFRectEqualsParam", "Negative tests against SDL_RectsEqualF with invalid parameters", TEST_ENABLED
 };
 
 /* !

test/testautomation_video.c

@@ -52,8 +52,8 @@ int video_enableDisableScreensaver(void *arg)
     SDL_bool result;
 
     /* Get current state and proceed according to current state */
-    initialResult = SDL_IsScreenSaverEnabled();
-    SDLTest_AssertPass("Call to SDL_IsScreenSaverEnabled()");
+    initialResult = SDL_ScreenSaverEnabled();
+    SDLTest_AssertPass("Call to SDL_ScreenSaverEnabled()");
     if (initialResult == SDL_TRUE) {
 
         /* Currently enabled: disable first, then enable again */
@@ -61,16 +61,16 @@ int video_enableDisableScreensaver(void *arg)
         /* Disable screensaver and check */
         SDL_DisableScreenSaver();
         SDLTest_AssertPass("Call to SDL_DisableScreenSaver()");
-        result = SDL_IsScreenSaverEnabled();
-        SDLTest_AssertPass("Call to SDL_IsScreenSaverEnabled()");
-        SDLTest_AssertCheck(result == SDL_FALSE, "Verify result from SDL_IsScreenSaverEnabled, expected: %i, got: %i", SDL_FALSE, result);
+        result = SDL_ScreenSaverEnabled();
+        SDLTest_AssertPass("Call to SDL_ScreenSaverEnabled()");
+        SDLTest_AssertCheck(result == SDL_FALSE, "Verify result from SDL_ScreenSaverEnabled, expected: %i, got: %i", SDL_FALSE, result);
 
         /* Enable screensaver and check */
         SDL_EnableScreenSaver();
         SDLTest_AssertPass("Call to SDL_EnableScreenSaver()");
-        result = SDL_IsScreenSaverEnabled();
-        SDLTest_AssertPass("Call to SDL_IsScreenSaverEnabled()");
-        SDLTest_AssertCheck(result == SDL_TRUE, "Verify result from SDL_IsScreenSaverEnabled, expected: %i, got: %i", SDL_TRUE, result);
+        result = SDL_ScreenSaverEnabled();
+        SDLTest_AssertPass("Call to SDL_ScreenSaverEnabled()");
+        SDLTest_AssertCheck(result == SDL_TRUE, "Verify result from SDL_ScreenSaverEnabled, expected: %i, got: %i", SDL_TRUE, result);
 
     } else {
 
@@ -79,16 +79,16 @@ int video_enableDisableScreensaver(void *arg)
         /* Enable screensaver and check */
         SDL_EnableScreenSaver();
         SDLTest_AssertPass("Call to SDL_EnableScreenSaver()");
-        result = SDL_IsScreenSaverEnabled();
-        SDLTest_AssertPass("Call to SDL_IsScreenSaverEnabled()");
-        SDLTest_AssertCheck(result == SDL_TRUE, "Verify result from SDL_IsScreenSaverEnabled, expected: %i, got: %i", SDL_TRUE, result);
+        result = SDL_ScreenSaverEnabled();
+        SDLTest_AssertPass("Call to SDL_ScreenSaverEnabled()");
+        SDLTest_AssertCheck(result == SDL_TRUE, "Verify result from SDL_ScreenSaverEnabled, expected: %i, got: %i", SDL_TRUE, result);
 
         /* Disable screensaver and check */
         SDL_DisableScreenSaver();
         SDLTest_AssertPass("Call to SDL_DisableScreenSaver()");
-        result = SDL_IsScreenSaverEnabled();
-        SDLTest_AssertPass("Call to SDL_IsScreenSaverEnabled()");
-        SDLTest_AssertCheck(result == SDL_FALSE, "Verify result from SDL_IsScreenSaverEnabled, expected: %i, got: %i", SDL_FALSE, result);
+        result = SDL_ScreenSaverEnabled();
+        SDLTest_AssertPass("Call to SDL_ScreenSaverEnabled()");
+        SDLTest_AssertCheck(result == SDL_FALSE, "Verify result from SDL_ScreenSaverEnabled, expected: %i, got: %i", SDL_FALSE, result);
     }
 
     return TEST_COMPLETED;

test/testgamepad.c

@@ -440,7 +440,7 @@ static SDL_GamepadButton FindButtonAtPosition(int x, int y)
             rect.y = button_positions[i].y;
             rect.w = BUTTON_SIZE;
             rect.h = BUTTON_SIZE;
-            if (SDL_IsPointInRect(&point, &rect)) {
+            if (SDL_PointInRect(&point, &rect)) {
                 return (SDL_GamepadButton)i;
             }
         }
@@ -463,7 +463,7 @@ static SDL_GamepadAxis FindAxisAtPosition(int x, int y)
             rect.y = axis_positions[i].y;
             rect.w = AXIS_SIZE;
             rect.h = AXIS_SIZE;
-            if (SDL_IsPointInRect(&point, &rect)) {
+            if (SDL_PointInRect(&point, &rect)) {
                 return (SDL_GamepadAxis)i;
             }
         }

test/testhittesting.c

@@ -32,7 +32,7 @@ hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
     int w, h;
 
     for (i = 0; i < numareas; i++) {
-        if (SDL_IsPointInRect(pt, &areas[i])) {
+        if (SDL_PointInRect(pt, &areas[i])) {
             SDL_Log("HIT-TEST: DRAGGABLE\n");
             return SDL_HITTEST_DRAGGABLE;
         }

test/testwm2.c

@@ -120,7 +120,7 @@ draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_Rect viewport)
         cell_rect.w = text_length * FONT_CHARACTER_SIZE;
         cell_rect.h = lineHeight;
 
-        if (SDL_IsPointInRect(&mouse_pos, &cell_rect)) {
+        if (SDL_PointInRect(&mouse_pos, &cell_rect)) {
             SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
 
             /* Update cached mode under the mouse */