Merge branch 'main' into hwnd-param

Author: yunline

.github/workflows/build-macos.yml

@@ -165,7 +165,7 @@ jobs:
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.12.0
+        uses: pypa/cibuildwheel@v2.12.1
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/build-manylinux.yml

@@ -118,7 +118,7 @@ jobs:
         CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
 
-      uses: pypa/cibuildwheel@v2.12.0
+      uses: pypa/cibuildwheel@v2.12.1
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-ubuntu-sdist.yml

@@ -57,7 +57,6 @@ jobs:
       # install numpy from pip and not apt because the one from pip is newer,
       # and has typestubs
       run: |
-        sudo apt-mark hold grub-efi-amd64-signed
         sudo apt-get update --fix-missing
         sudo apt-get upgrade
         sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev

.github/workflows/cppcheck.yml

@@ -26,7 +26,6 @@ jobs:
 
       - name: Install deps
         run: |
-          sudo apt-mark hold grub-efi-amd64-signed
           sudo apt-get update --fix-missing
           sudo apt-get upgrade
           sudo apt install cppcheck

.gitignore

@@ -1,4 +1,4 @@
-# Pygame build process: config.py setup.py
+# pygame-ce build process: config.py setup.py
 /Setup
 *.pyc
 /build/

buildconfig/Setup.Emscripten.SDL2.in

@@ -42,7 +42,7 @@ image src_c/void.c
 base src_c/void.c
 bufferproxy src_c/void.c
 color src_c/void.c
-controller src_c/void.c
+controller_old src_c/void.c
 display src_c/void.c
 draw src_c/void.c
 event src_c/void.c
@@ -60,9 +60,10 @@ surface src_c/void.c
 surflock src_c/void.c
 rect src_c/void.c
 rwobject src_c/void.c
+system src_c/void.c
 
 #_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/void.c
+_sdl2.controller_old src_c/void.c
 
 #_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.touch src_c/void.c

buildconfig/Setup.SDL2.in

@@ -37,7 +37,7 @@ _sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
 _sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.controller_old src_c/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc_c
 
 GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
 #GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
@@ -74,3 +74,4 @@ pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
 math src_c/math.c $(SDL) $(DEBUG)
 pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
+system src_c/system.c $(SDL) $(DEBUG)

buildconfig/bundle_docs.py

@@ -1,8 +1,8 @@
 #! /usr/bin/env python
 
-"""Tar-zip the pygame documents and examples.
+"""Tar-zip the pygame-ce documents and examples.
 
-Run this script from the pygame source root directory.
+Run this script from the pygame-ce source root directory.
 """
 
 import os

buildconfig/config_msys2.py

@@ -1,7 +1,7 @@
 """Config on MSYS2"""
 
 # The search logic is adapted from config_win.
-# This assumes that the PyGame dependencies are resolved
+# This assumes that the pygame-ce dependencies are resolved
 # by MSYS2 packages.
 
 try:

buildconfig/stubs/gen_stubs.py

@@ -12,9 +12,9 @@
 doc_as_comment = __doc__.replace("\n", "\n# ").strip() if __doc__ else ""
 info_header = f"{doc_as_comment} IMPORTANT NOTE: Do not edit this file by hand!\n\n"
 
-# pygame submodules that are auto-imported must be kept in this list
-# keep in mind that not all pygame modules are auto-imported, hence not all
-# pygame submodules make it to this list
+# pygame-ce submodules that are auto-imported must be kept in this list
+# keep in mind that not all pygame-ce modules are auto-imported, hence not all
+# pygame-ce submodules make it to this list
 PG_AUTOIMPORT_SUBMODS = [
     "display",
     "draw",
@@ -34,7 +34,6 @@
     "sprite",
     "surfarray",
     "transform",
-    "fastevent",
     "scrap",
     "threads",
     "version",
@@ -50,6 +49,7 @@
     "surflock",
     "sysfont",
     "_debug"
+    "system",
 ]
 
 # pygame classes that are autoimported into main namespace are kept in this dict

buildconfig/stubs/mypy_allow_list.txt

@@ -29,3 +29,7 @@ pygame\.pkgdata
 pygame\.pypm
 pygame\._sdl2\.mixer
 pygame\.sysfont.*
+
+# temporarily ignore the controller module while it is being converted
+# to C
+pygame\._sdl2\.controller

buildconfig/stubs/pygame/__init__.pyi

@@ -26,7 +26,6 @@ from pygame import (
     sprite as sprite,
     surfarray as surfarray,
     transform as transform,
-    fastevent as fastevent,
     scrap as scrap,
     threads as threads,
     version as version,
@@ -42,6 +41,7 @@ from pygame import (
     surflock as surflock,
     sysfont as sysfont,
     _debug as _debug,
+    system as system,
 )
 
 from .rect import Rect as Rect

buildconfig/stubs/pygame/_sdl2/controller.pyi renamed to buildconfig/stubs/pygame/_sdl2/controller_old.pyi

@@ -76,3 +76,6 @@ def get_allow_screensaver() -> bool: ...
 def set_allow_screensaver(value: bool = True) -> None: ...
 def get_desktop_sizes() -> List[Tuple[int, int]]: ...
 def is_fullscreen() -> bool: ...
+def is_vsync() -> bool: ...
+def get_current_refresh_rate() -> int: ...
+def get_desktop_refresh_rates() -> List[int]: ...

buildconfig/stubs/pygame/display.pyi

@@ -28,6 +28,7 @@ def SysFont(
 ) -> Font: ...
 
 class Font:
+    name: str
     bold: bool
     italic: bool
     underline: bool

buildconfig/stubs/pygame/fastevent.pyi

@@ -12,8 +12,8 @@ _to_string_format = Literal[
 _from_buffer_format = Literal["P", "RGB", "BGR", "BGRA", "RGBX", "RGBA", "ARGB"]
 _from_string_format = Literal["P", "RGB", "RGBX", "RGBA", "ARGB", "BGRA"]
 
-def load(filename: FileArg, namehint: str = "") -> Surface: ...
-def save(surface: Surface, filename: FileArg, namehint: str = "") -> None: ...
+def load(file: FileArg, namehint: str = "") -> Surface: ...
+def save(surface: Surface, file: FileArg, namehint: str = "") -> None: ...
 def get_sdl_image_version(linked: bool = True) -> Optional[Tuple[int, int, int]]: ...
 def get_extended() -> bool: ...
 def tostring(
@@ -46,6 +46,6 @@ def frombuffer(
     format: _from_buffer_format,
     pitch: int = -1,
 ) -> Surface: ...
-def load_basic(filename: FileArg) -> Surface: ...
-def load_extended(filename: FileArg, namehint: str = "") -> Surface: ...
-def save_extended(surface: Surface, filename: FileArg, namehint: str = "") -> None: ...
+def load_basic(file: FileArg) -> Surface: ...
+def load_extended(file: FileArg, namehint: str = "") -> Surface: ...
+def save_extended(surface: Surface, file: FileArg, namehint: str = "") -> None: ...

buildconfig/stubs/pygame/font.pyi

@@ -27,6 +27,14 @@ _Group = AbstractGroup[_SpriteSupportsGroup]
 
 # protocol helps with structural subtyping for typevars in sprite group generics
 class _SupportsSprite(Protocol):
+    @property
+    def image(self) -> Optional[Surface]: ...
+    @image.setter
+    def image(self, value: Optional[Surface]) -> None: ...
+    @property
+    def rect(self) -> Optional[Rect]: ...
+    @rect.setter
+    def rect(self, value: Optional[Rect]) -> None: ...
     @property
     def layer(self) -> int: ...
     @layer.setter
@@ -53,6 +61,14 @@ class _SupportsDirtySprite(_SupportsSprite, Protocol):
 
 # concrete sprite implementation class
 class Sprite(_SupportsSprite):
+    @property
+    def image(self) -> Optional[Surface]: ...
+    @image.setter
+    def image(self, value: Optional[Surface]) -> None: ...
+    @property
+    def rect(self) -> Optional[Rect]: ...
+    @rect.setter
+    def rect(self, value: Optional[Rect]) -> None: ...
     @property
     def layer(self) -> int: ...
     @layer.setter
@@ -84,11 +100,13 @@ _TGroup = TypeVar("_TGroup", bound=AbstractGroup)
 # sprite functions don't need all sprite attributes to be present in the
 # arguments passed, they only use a few which are marked in the below protocols
 class _HasRect(Protocol):
-    rect: Rect
+    @property
+    def rect(self) -> Optional[Rect]: ...
 
 # image in addition to rect
 class _HasImageAndRect(_HasRect, Protocol):
-    image: Surface
+    @property
+    def image(self) -> Optional[Surface]: ...
 
 # mask in addition to rect
 class _HasMaskAndRect(_HasRect, Protocol):

buildconfig/stubs/pygame/image.pyi

@@ -0,0 +1,11 @@
+from typing import List, Optional
+
+from typing_extensions import TypedDict
+
+# dict at runtime, TypedDict exists solely for the typechecking benefits
+class _Locale(TypedDict):
+    language: str
+    country: Optional[str]
+
+def get_pref_path(org: str, app: str) -> str: ...
+def get_pref_locales() -> List[_Locale]: ...

buildconfig/stubs/pygame/sprite.pyi

@@ -53,3 +53,15 @@ def threshold(
     search_surf: Optional[Surface] = None,
     inverse_set: bool = False,
 ) -> int: ...
+def box_blur(
+    surface: Surface,
+    radius: int,
+    repeat_edge_pixels: bool = True,
+    dest_surface: Optional[Surface] = None
+) -> Surface: ...
+def gaussian_blur(
+    surface: Surface,
+    radius: int,
+    repeat_edge_pixels: bool = True,
+    dest_surface: Optional[Surface] = None
+) -> Surface: ...

buildconfig/stubs/pygame/system.pyi

@@ -12,7 +12,7 @@ def _iterpath(path):
         yield last
 
 
-# for test suite to confirm pygame built with local docs
+# for test suite to confirm pygame-ce built with local docs
 def has_local_docs():
     pkg_dir = os.path.dirname(os.path.abspath(__file__))
     main_page = os.path.join(pkg_dir, "generated", "index.html")

buildconfig/stubs/pygame/transform.pyi

@@ -42,11 +42,11 @@ Header file: src_c/include/pygame.h
    This is a macro. Argument *x* is assumed to be a Surface, or subclass of
    Surface, instance.
 
-.. c:function:: int pgSurface_Blit(PyObject *dstobj, PyObject *srcobj, SDL_Rect *dstrect, SDL_Rect *srcrect, int the_args)
+.. c:function:: int pgSurface_Blit(PyObject *dstobj, PyObject *srcobj, SDL_Rect *dstrect, SDL_Rect *srcrect, int blend_flags)
 
    Blit the *srcrect* portion of Surface *srcobj* onto Surface *dstobj* at *srcobj*
 
-   Argument *the_args* indicates the type of blit to perform:
+   Argument *blend_flags* indicates the type of blit to perform:
    Normal blit (``0``), ``PYGAME_BLEND_ADD``, ``PYGAME_BLEND_SUB``,
    ``PYGAME_BLEND_SUB``, ``PYGAME_BLEND_MULT``, ``PYGAME_BLEND_MIN``,
    ``PYGAME_BLEND_MAX``, ``PYGAME_BLEND_RGBA_ADD``, ``PYGAME_BLEND_RGBA_SUB``,

docs/__main__.py

@@ -1,5 +1,5 @@
 #
-# Pygame documentation build configuration file, created by
+# pygame-ce documentation build configuration file, created by
 # sphinx-quickstart on Sat Mar  5 11:56:39 2011.
 #
 # This file is execfile()d with the current directory set to its containing dir.