convert() and convert_alpha() now support Window

Author: yunline

src_c/_pygame.h

@@ -485,7 +485,7 @@ typedef enum {
 #define PYGAMEAPI_PIXELARRAY_NUMSLOTS 2
 #define PYGAMEAPI_COLOR_NUMSLOTS 5
 #define PYGAMEAPI_MATH_NUMSLOTS 2
-#define PYGAMEAPI_BASE_NUMSLOTS 27
+#define PYGAMEAPI_BASE_NUMSLOTS 29
 #define PYGAMEAPI_EVENT_NUMSLOTS 8
 #define PYGAMEAPI_WINDOW_NUMSLOTS 1
 #define PYGAMEAPI_GEOMETRY_NUMSLOTS 1

src_c/base.c

@@ -2057,6 +2057,23 @@ pg_SetDefaultWindowSurface(pgSurfaceObject *screen)
     pg_default_screen = screen;
 }
 
+SDL_PixelFormat *pg_default_convert_format = NULL;
+
+static SDL_PixelFormat *
+pg_GetDefaultConvertFormat(void)
+{
+    if (pg_default_screen) {
+        return pg_default_screen->surf->format;
+    }
+    return pg_default_convert_format;
+}
+
+static void
+pg_SetDefaultConvertFormat(SDL_PixelFormat *fmt)
+{
+    pg_default_convert_format = fmt;
+}
+
 static char *
 pg_EnvShouldBlendAlphaSDL2(void)
 {
@@ -2273,8 +2290,10 @@ MODINIT_DEFINE(base)
     c_api[24] = pg_DoubleFromObj;
     c_api[25] = pg_TwoDoublesFromObj;
     c_api[26] = pg_TwoDoublesFromFastcallArgs;
+    c_api[27] = pg_GetDefaultConvertFormat;
+    c_api[28] = pg_SetDefaultConvertFormat;
 
-#define FILLED_SLOTS 27
+#define FILLED_SLOTS 29
 
 #if PYGAMEAPI_BASE_NUMSLOTS != FILLED_SLOTS
 #error export slot count mismatch

src_c/include/_pygame.h

@@ -173,6 +173,12 @@ typedef struct pg_bufferinfo_s {
 #define pg_EnvShouldBlendAlphaSDL2 \
     (*(char *(*)(void))PYGAMEAPI_GET_SLOT(base, 23))
 
+#define pg_GetDefaultConvertFormat \
+    (*(SDL_PixelFormat * (*)(void)) PYGAMEAPI_GET_SLOT(base, 27))
+
+#define pg_SetDefaultConvertFormat \
+    (*(void (*)(SDL_PixelFormat *))PYGAMEAPI_GET_SLOT(base, 28))
+
 #define import_pygame_base() IMPORT_PYGAME_MODULE(base)
 #endif /* ~PYGAMEAPI_BASE_INTERNAL */
 

src_c/surface.c

@@ -1590,32 +1590,34 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
 static SDL_Surface *
 pg_DisplayFormat(SDL_Surface *surface)
 {
-    SDL_Surface *displaysurf;
-    if (!pg_GetDefaultWindowSurface()) {
-        SDL_SetError("No video mode has been set");
+    if (!pg_GetDefaultConvertFormat()) {
+        SDL_SetError("No convert format has been set, try display.set_mode()"
+                     // " or Window.get_surface()"
+                     // (uncomment when Window API is published)
+        );
         return NULL;
     }
-    displaysurf = pgSurface_AsSurface(pg_GetDefaultWindowSurface());
-    return PG_ConvertSurface(surface, displaysurf->format);
+    return PG_ConvertSurface(surface, pg_GetDefaultConvertFormat());
 }
 
 static SDL_Surface *
 pg_DisplayFormatAlpha(SDL_Surface *surface)
 {
-    SDL_Surface *displaysurf;
     SDL_PixelFormat *dformat;
     Uint32 pfe;
     Uint32 amask = 0xff000000;
     Uint32 rmask = 0x00ff0000;
     Uint32 gmask = 0x0000ff00;
     Uint32 bmask = 0x000000ff;
 
-    if (!pg_GetDefaultWindowSurface()) {
-        SDL_SetError("No video mode has been set");
+    if (!pg_GetDefaultConvertFormat()) {
+        SDL_SetError("No convert format has been set, try display.set_mode()"
+                     // " or Window.get_surface()"
+                     // (uncomment when Window API is published)
+        );
         return NULL;
     }
-    displaysurf = pgSurface_AsSurface(pg_GetDefaultWindowSurface());
-    dformat = displaysurf->format;
+    dformat = pg_GetDefaultConvertFormat();
 
     switch (dformat->BytesPerPixel) {
         case 2:

src_c/window.c

@@ -163,6 +163,10 @@ window_get_surface(pgWindowObject *self)
             return NULL;
     }
     self->surf->surf = _surf;
+
+    if (pg_GetDefaultConvertFormat() == NULL)
+        pg_SetDefaultConvertFormat(_surf->format);
+
     Py_INCREF(self->surf);
     return (PyObject *)self->surf;
 }