Merge branch 'main' of https://github.com/pygame-community/pygame-ce into free-threading

Author: oddbookworm

docs/reST/c_api/slots.rst

@@ -16,7 +16,7 @@ base.c has this exposing the pg_RGBAFromObj function to the `c_api` structure:
 
 Then in src_c/include/_pygame.h there is an
 
-	#define pg_RGBAFromObj.
+    #define pg_RGBAFromObj.
 
 Also in _pygame.h, it needs to define the number of slots the base module uses. This is PYGAMEAPI_BASE_NUMSLOTS. So if you were adding another function, you need to increment this PYGAMEAPI_BASE_NUMSLOTS number.
 
@@ -25,6 +25,6 @@ Then to use the pg_RGBAFromObj in other files,
 1) include the "pygame.h" file,
 2) they have to make sure base is imported with:
 
-	import_pygame_base();
+    import_pygame_base();
 
 Examples that use pg_RGBAFromObj are: _freetype.c, color.c, gfxdraw.c, and surface.c.

docs/reST/ref/bufferproxy.rst

@@ -47,8 +47,8 @@
 
       ``"strides"`` : tuple : (optional)
          Array stride information as a tuple of integers. It is required
-	 only of non C-contiguous arrays. The tuple length must match
-	 that of ``"shape"``.
+         only of non C-contiguous arrays. The tuple length must match
+         that of ``"shape"``.
 
       ``"parent"`` : object : (optional)
          The exporting object. It can be used to keep the parent object
@@ -57,7 +57,7 @@
       ``"before"`` : callable : (optional)
          Callback invoked when the :class:`BufferProxy` instance
          exports the buffer. The callback is given one argument, the
-	   ``"parent"`` object if given, otherwise ``None``.
+         ``"parent"`` object if given, otherwise ``None``.
          The callback is useful for setting a lock on the parent.
 
       ``"after"`` : callable : (optional)

docs/reST/ref/mask.rst

@@ -535,8 +535,8 @@ to store which parts collide.
       component.
 
       :param int minimum: (optional) indicates the minimum number of bits (to
-	 filter out noise) per connected component (default is 0, which equates
- 	 to no minimum and is equivalent to setting it to 1, as a connected
+         filter out noise) per connected component (default is 0, which equates
+         to no minimum and is equivalent to setting it to 1, as a connected
          component must have at least 1 bit set)
 
       :returns: a list containing a :class:`Mask` object for each connected

docs/reST/ref/mouse.rst

@@ -275,7 +275,7 @@ scroll, such as ``which`` (it will tell you what exact mouse device trigger the
 
    .. note:: Code that unpacked a get_cursor() call into
              ``size, hotspot, xormasks, andmasks`` will still work,
-	     assuming the call returns an old school type cursor.
+             assuming the call returns an old school type cursor.
 
    .. versionchangedold:: 2.0.1
 

docs/reST/ref/sdl2_video.rst

@@ -7,10 +7,10 @@
    :synopsis: Experimental pygame module for porting new SDL video systems
 
 .. warning::
-	This module isn't ready for prime time yet, it's still in development.
-        These docs are primarily meant to help the pygame developers and
-        super-early adopters who are in communication with the developers.
-        This API will change.
+   This module isn't ready for prime time yet, it's still in development.
+   These docs are primarily meant to help the pygame developers and
+   super-early adopters who are in communication with the developers.
+   This API will change.
 
 | :sl:`Experimental pygame module for porting new SDL video systems`
 

docs/reST/tutorials/en/tom-games6.rst

@@ -28,19 +28,19 @@ after we've worked out the new position of the ball.
 
 ::
 
-  if not self.area.contains(newpos):
-  	tl = not self.area.collidepoint(newpos.topleft)
-  	tr = not self.area.collidepoint(newpos.topright)
-  	bl = not self.area.collidepoint(newpos.bottomleft)
-  	br = not self.area.collidepoint(newpos.bottomright)
-  	if tr and tl or (br and bl):
-  		angle = -angle
-  	if tl and bl:
-  		self.offcourt(player=2)
-  	if tr and br:
-  		self.offcourt(player=1)
-
-  self.vector = (angle,z)
+    if not self.area.contains(newpos):
+        tl = not self.area.collidepoint(newpos.topleft)
+        tr = not self.area.collidepoint(newpos.topright)
+        bl = not self.area.collidepoint(newpos.bottomleft)
+        br = not self.area.collidepoint(newpos.bottomright)
+        if tr and tl or (br and bl):
+            angle = -angle
+        if tl and bl:
+            self.offcourt(player=2)
+        if tr and br:
+            self.offcourt(player=1)
+
+    self.vector = (angle,z)
 
 Here we check to see if the ``area``
 contains the new position of the ball (it always should, so we needn't have an ``else`` clause,

src_c/joystick.c

@@ -112,7 +112,17 @@ static PyObject *
 get_count(PyObject *self, PyObject *_null)
 {
     JOYSTICK_INIT_CHECK();
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    int ret;
+    SDL_JoystickID *joysticks = SDL_GetJoysticks(&ret);
+    if (!joysticks) {
+        return RAISE(pgExc_SDLError, SDL_GetError());
+    }
+    SDL_free(joysticks);
+    return PyLong_FromLong(ret);
+#else
     return PyLong_FromLong(SDL_NumJoysticks());
+#endif
 }
 
 static PyObject *
@@ -200,18 +210,53 @@ joy_get_guid(PyObject *self, PyObject *_null)
         guid = SDL_JoystickGetGUID(joy);
     }
     else {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+        return RAISE(pgExc_SDLError, "Invalid/closed joystick object");
+#else
         guid = SDL_JoystickGetDeviceGUID(pgJoystick_AsID(self));
+#endif
     }
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    SDL_GUIDToString(guid, strguid, 33);
+#else
     SDL_JoystickGetGUIDString(guid, strguid, 33);
+#endif
 
     return PyUnicode_FromString(strguid);
 }
 
 const char *
-_pg_powerlevel_string(SDL_JoystickPowerLevel level)
+_pg_powerlevel_string(SDL_Joystick *joy)
 {
-    switch (level) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    int percent = -1;
+    SDL_PowerState state = SDL_GetJoystickPowerInfo(joy, &percent);
+    if (state == SDL_POWERSTATE_ON_BATTERY) {
+        /* These percentages are based on SDL_JoystickCurrentPowerLevel defined
+         * in sdl2-compat */
+        if (percent > 70) {
+            return "full";
+        }
+        else if (percent > 20) {
+            return "medium";
+        }
+        else if (percent > 5) {
+            return "low";
+        }
+        else {
+            return "empty";
+        }
+    }
+    else if (state == SDL_POWERSTATE_UNKNOWN ||
+             state == SDL_POWERSTATE_ERROR) {
+        return "unknown";
+    }
+    else {
+        return "wired";
+    }
+#else
+    switch (SDL_JoystickCurrentPowerLevel(joy)) {
         case SDL_JOYSTICK_POWER_EMPTY:
             return "empty";
         case SDL_JOYSTICK_POWER_LOW:
@@ -227,12 +272,12 @@ _pg_powerlevel_string(SDL_JoystickPowerLevel level)
         default:
             return "unknown";
     }
+#endif
 }
 
 static PyObject *
 joy_get_power_level(PyObject *self, PyObject *_null)
 {
-    SDL_JoystickPowerLevel level;
     const char *leveltext;
     SDL_Joystick *joy = pgJoystick_AsSDL(self);
 
@@ -241,8 +286,7 @@ joy_get_power_level(PyObject *self, PyObject *_null)
         return RAISE(pgExc_SDLError, "Joystick not initialized");
     }
 
-    level = SDL_JoystickCurrentPowerLevel(joy);
-    leveltext = _pg_powerlevel_string(level);
+    leveltext = _pg_powerlevel_string(joy);
 
     return PyUnicode_FromString(leveltext);
 }
@@ -287,7 +331,11 @@ joy_rumble(pgJoystickObject *self, PyObject *args, PyObject *kwargs)
     low = (Uint32)(lowf * 0xFFFF);
     high = (Uint32)(highf * 0xFFFF);
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    if (!SDL_JoystickRumble(joy, low, high, duration)) {
+#else
     if (SDL_JoystickRumble(joy, low, high, duration) == -1) {
+#endif
         Py_RETURN_FALSE;
     }
     Py_RETURN_TRUE;
@@ -545,9 +593,13 @@ pgJoystick_New(int id)
     JOYSTICK_INIT_CHECK();
 
     /* Open the SDL device */
+#if !SDL_VERSION_ATLEAST(3, 0, 0)
+    /* This check should be redundant because SDL_JoystickOpen already checks
+     * and errors if id is out of bounds on SDL3 */
     if (id >= SDL_NumJoysticks()) {
         return RAISE(pgExc_SDLError, "Invalid joystick device number");
     }
+#endif
     joy = SDL_JoystickOpen(id);
     if (!joy) {
         return RAISE(pgExc_SDLError, SDL_GetError());

src_c/meson.build

@@ -152,8 +152,6 @@ time = py.extension_module(
     subdir: pg,
 )
 
-# TODO: support SDL3
-if sdl_api != 3
 joystick = py.extension_module(
     'joystick',
     'joystick.c',
@@ -162,7 +160,6 @@ joystick = py.extension_module(
     install: true,
     subdir: pg,
 )
-endif
 
 draw = py.extension_module(
     'draw',