SDL3: image+key+scrap+transform+debug: runtime fixes

Author: ankith26

src_c/image.c

@@ -454,17 +454,10 @@ tobytes_surf_32bpp(SDL_Surface *surf, SDL_PixelFormat *format_details,
 {
     int w, h;
 
-#if SDL_VERSION_ATLEAST(3, 0, 0)
-    Uint32 Rloss = format_details->Rbits;
-    Uint32 Gloss = format_details->Gbits;
-    Uint32 Bloss = format_details->Bbits;
-    Uint32 Aloss = format_details->Abits;
-#else
-    Uint32 Rloss = format_details->Rloss;
-    Uint32 Gloss = format_details->Gloss;
-    Uint32 Bloss = format_details->Bloss;
-    Uint32 Aloss = format_details->Aloss;
-#endif
+    Uint32 Rloss = PG_FORMAT_R_LOSS(format_details);
+    Uint32 Gloss = PG_FORMAT_G_LOSS(format_details);
+    Uint32 Bloss = PG_FORMAT_B_LOSS(format_details);
+    Uint32 Aloss = PG_FORMAT_A_LOSS(format_details);
     Uint32 Rmask = format_details->Rmask;
     Uint32 Gmask = format_details->Gmask;
     Uint32 Bmask = format_details->Bmask;
@@ -565,19 +558,15 @@ image_tobytes(PyObject *self, PyObject *arg, PyObject *kwarg)
     if (!format_details) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
-    SDL_Palette *surf_palette = SDL_GetSurfacePalette(surf);
-    Rloss = format_details->Rbits;
-    Gloss = format_details->Gbits;
-    Bloss = format_details->Bbits;
-    Aloss = format_details->Abits;
+    SDL_Palette *surf_palette = PG_GetSurfacePalette(surf);
 #else
     SDL_PixelFormat *format_details = surf->format;
     SDL_Palette *surf_palette = surf->format->palette;
-    Rloss = format_details->Rloss;
-    Gloss = format_details->Gloss;
-    Bloss = format_details->Bloss;
-    Aloss = format_details->Aloss;
 #endif
+    Rloss = PG_FORMAT_R_LOSS(format_details);
+    Gloss = PG_FORMAT_G_LOSS(format_details);
+    Bloss = PG_FORMAT_B_LOSS(format_details);
+    Aloss = PG_FORMAT_A_LOSS(format_details);
     Rmask = format_details->Rmask;
     Gmask = format_details->Gmask;
     Bmask = format_details->Bmask;
@@ -1722,7 +1711,7 @@ SaveTGA_RW(SDL_Surface *surface, SDL_RWops *out, int rle)
     }
     SDL_PixelFormat output_format;
 
-    SDL_Palette *surf_palette = SDL_GetSurfacePalette(surface);
+    SDL_Palette *surf_palette = PG_GetSurfacePalette(surface);
 #else
     SDL_PixelFormat *surf_format = surface->format;
     SDL_Palette *surf_palette = surface->format->palette;

src_c/key.c

@@ -389,7 +389,11 @@ static const struct {
     {1073742054, "right alt"},       /* K_RALT */
     {1073742055, "right meta"},      /* K_RGUI, K_RMETA, K_RSUPER */
     {1073742081, "alt gr"},          /* K_MODE */
-    {1073742094, "AC Back"},         /* K_AC_BACK */
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    {1073742106, "AC Back"}, /* K_AC_BACK */
+#else
+    {1073742094, "AC Back"}, /* K_AC_BACK */
+#endif
 };
 
 /* Get name from keycode using pygame compat table */

src_c/scrap.c

@@ -441,7 +441,11 @@ _scrap_put_text(PyObject *self, PyObject *args)
         return NULL;
     }
 
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    if (!SDL_SetClipboardText(text)) {
+#else
     if (SDL_SetClipboardText(text)) {
+#endif
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
 

src_c/scrap_sdl2.c

@@ -109,7 +109,11 @@ pygame_scrap_put(char *type, Py_ssize_t srclen, char *src)
 
     if (strcmp(type, pygame_scrap_plaintext_type) == 0 ||
         strcmp(type, pygame_scrap_utf8text_type) == 0) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+        if (SDL_SetClipboardText(src)) {
+#else
         if (SDL_SetClipboardText(src) == 0) {
+#endif
             return 1;
         }
     }

src_c/transform.c

@@ -3737,7 +3737,7 @@ surf_average_color(PyObject *self, PyObject *args, PyObject *kwargs)
     Uint8 r, g, b, a;
     int x, y, w, h;
     static char *keywords[] = {"surface", "rect", "consider_alpha", NULL};
-    SDL_bool consider_alpha = SDL_FALSE;
+    int consider_alpha = SDL_FALSE;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|Op", keywords,
                                      &pgSurface_Type, &surfobj, &rectobj,
@@ -4051,7 +4051,7 @@ surf_box_blur(PyObject *self, PyObject *args, PyObject *kwargs)
     pgSurfaceObject *dst_surf_obj = NULL;
     pgSurfaceObject *src_surf_obj;
     SDL_Surface *new_surf = NULL;
-    SDL_bool repeat_edge_pixels = SDL_TRUE;
+    int repeat_edge_pixels = SDL_TRUE;
 
     int radius;
 
@@ -4084,7 +4084,7 @@ surf_gaussian_blur(PyObject *self, PyObject *args, PyObject *kwargs)
     pgSurfaceObject *dst_surf_obj = NULL;
     pgSurfaceObject *src_surf_obj;
     SDL_Surface *new_surf = NULL;
-    SDL_bool repeat_edge_pixels = SDL_TRUE;
+    int repeat_edge_pixels = SDL_TRUE;
 
     int radius;
 

src_py/_debug.py

@@ -106,10 +106,18 @@ def default_return(linked=True):
         get_driver as get_display_driver,
         get_init as display_init,
     )
-    from pygame.mixer import (
-        get_driver as get_mixer_driver,
-        get_init as mixer_init,
-    )
+
+    debug_str, *mixer = attempt_import("pygame.mixer", "get_driver", debug_str)
+    if not mixer[0]:
+        get_mixer_driver = lambda: None
+    else:
+        get_mixer_driver = mixer[1]
+
+    debug_str, *mixer = attempt_import("pygame.mixer", "get_init", debug_str)
+    if not mixer[0]:
+        mixer_init = lambda: False
+    else:
+        mixer_init = mixer[1]
 
     debug_str, *mixer = attempt_import(
         "pygame.mixer", "get_sdl_mixer_version", debug_str

test/key_test.py

@@ -8,6 +8,7 @@
 
 # keys that are not tested for const-name match
 SKIPPED_KEYS = {"K_UNKNOWN"}
+SKIPPED_KEYS_NEW = {"K_MODE"}
 
 # This is the expected compat output
 KEY_NAME_COMPAT = {
@@ -286,7 +287,8 @@ def test_name_and_key_code(self):
             # This is a test for an implementation detail of name with use_compat=False
             # If this test breaks in the future for any key, it is safe to put skips on
             # failing keys (the implementation detail is documented as being unreliable)
-            self.assertEqual(pygame.key.key_code(alt_name), const_val)
+            if const_name not in SKIPPED_KEYS_NEW:
+                self.assertEqual(pygame.key.key_code(alt_name), const_val)
 
         self.assertRaises(TypeError, pygame.key.name, "fizzbuzz")
         self.assertRaises(TypeError, pygame.key.key_code, pygame.K_a)