Merge branch 'pygame-community:main' into wasm-static-multiphase-init

pmp-p · web-flow · commit 2370ea5a9bdd · 2023-03-01T22:23:30.000+01:00
diff --git a/.github/workflows/build-debian-multiarch.yml b/.github/workflows/build-debian-multiarch.yml
@@ -32,7 +32,7 @@ on:
       - '!.github/workflows/build-debian-multiarch.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-debian-multiarch
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/build-emsdk.yml b/.github/workflows/build-emsdk.yml
@@ -28,7 +28,7 @@ on:
       - '!.github/workflows/build-emsdk.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-emsdk
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -32,7 +32,7 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-macos
   cancel-in-progress: true
 
 jobs:
@@ -169,6 +169,6 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pygame-wheels
+          name: pygame-wheels-macos
           path: ./wheelhouse/*.whl
 
diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml
@@ -32,7 +32,7 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-manylinux
   cancel-in-progress: true
 
 jobs:
@@ -124,6 +124,6 @@ jobs:
     - name: Upload dist
       uses: actions/upload-artifact@v3
       with:
-        name: pygame-manylinux-wheels
+        name: pygame-wheels-manylinux
         path: ./wheelhouse/*.whl
 
diff --git a/.github/workflows/build-ubuntu-sdist.yml b/.github/workflows/build-ubuntu-sdist.yml
@@ -39,7 +39,7 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-ubuntu-sdist
   cancel-in-progress: true
 
 jobs:
@@ -88,6 +88,6 @@ jobs:
       if: matrix.os == 'ubuntu-20.04' # upload sdist only once
       uses: actions/upload-artifact@v3
       with:
-        name: pygame-sdist
+        name: pygame-wheels-sdist
         path: dist/*.tar.gz
 
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -32,7 +32,7 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-windows
   cancel-in-progress: true
 
 jobs:
@@ -163,5 +163,5 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pygame-wheels
+          name: pygame-wheels-windows
           path: ./wheelhouse/*.whl
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -13,7 +13,7 @@ on:
       - 'src_c/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-cppcheck
   cancel-in-progress: true
 
 # TODO: Any more static checkers can be added here
diff --git a/.github/workflows/format-lint.yml b/.github/workflows/format-lint.yml
@@ -21,7 +21,7 @@ on:
       - '**.rst'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-format-lint
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/release-gh-draft.yml b/.github/workflows/release-gh-draft.yml
@@ -25,8 +25,6 @@ jobs:
 
       - name: Download all artifacts
         uses: actions/download-artifact@v3
-        with:
-          path: dist
       
       # Strips 'release/' from the ref_name, this helps us access the version
       # name as 'steps.ver.outputs.VER'
@@ -39,7 +37,7 @@ jobs:
         with:
           draft: true
           prerelease: ${{ contains(steps.ver.outputs.VER, 'dev') }}
-          files: dist/*
+          files: pygame-wheels-*/*
           name: '${{ steps.ver.outputs.VER }} - {TODO put a title here} [DRAFTED BY CI]'
           tag_name: ${{ steps.ver.outputs.VER }}
           target_commitish: ${{ github.ref_name }}
diff --git a/buildconfig/stubs/pygame/__init__.pyi b/buildconfig/stubs/pygame/__init__.pyi
@@ -181,6 +181,9 @@ from .constants import (
     FINGERDOWN as FINGERDOWN,
     FINGERMOTION as FINGERMOTION,
     FINGERUP as FINGERUP,
+    FONT_CENTER as FONT_CENTER,
+    FONT_LEFT as FONT_LEFT,
+    FONT_RIGHT as FONT_RIGHT,
     FULLSCREEN as FULLSCREEN,
     GL_ACCELERATED_VISUAL as GL_ACCELERATED_VISUAL,
     GL_ACCUM_ALPHA_SIZE as GL_ACCUM_ALPHA_SIZE,
diff --git a/buildconfig/stubs/pygame/constants.pyi b/buildconfig/stubs/pygame/constants.pyi
@@ -103,6 +103,9 @@ DROPTEXT: int
 FINGERDOWN: int
 FINGERMOTION: int
 FINGERUP: int
+FONT_CENTER: int
+FONT_LEFT: int
+FONT_RIGHT: int
 FULLSCREEN: int
 GL_ACCELERATED_VISUAL: int
 GL_ACCUM_ALPHA_SIZE: int
diff --git a/buildconfig/stubs/pygame/font.pyi b/buildconfig/stubs/pygame/font.pyi
@@ -32,13 +32,15 @@ class Font:
     italic: bool
     underline: bool
     strikethrough: bool
+    align: int
     def __init__(self, name: Optional[FileArg], size: int) -> None: ...
     def render(
         self,
         text: Union[str, bytes, None],
         antialias: bool,
         color: ColorValue,
         background: Optional[ColorValue] = None,
+        wraplength: int = 0
     ) -> Surface: ...
     def size(self, text: Union[str, bytes]) -> Tuple[int, int]: ...
     def set_underline(self, value: bool) -> None: ...
diff --git a/buildconfig/stubs/pygame/locals.pyi b/buildconfig/stubs/pygame/locals.pyi
@@ -104,6 +104,9 @@ DROPTEXT: int
 FINGERDOWN: int
 FINGERMOTION: int
 FINGERUP: int
+FONT_CENTER: int
+FONT_LEFT: int
+FONT_RIGHT: int
 FULLSCREEN: int
 GL_ACCELERATED_VISUAL: int
 GL_ACCUM_ALPHA_SIZE: int
diff --git a/docs/reST/conf.py b/docs/reST/conf.py
@@ -49,7 +49,7 @@
 # The short X.Y version.
 version = '2.1.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.4.dev1'
+release = '2.1.4.dev3'
 
 # Format strings for the version directives
 versionadded_format = 'New in pygame %s'
diff --git a/docs/reST/ref/font.rst b/docs/reST/ref/font.rst
@@ -244,17 +244,32 @@ solves no longer exists, it will likely be removed in the future.
 
       .. ## Font.strikethrough ##
 
+   .. attribute:: align
+
+      | :sl:`Set how rendered text is aligned when given a wrap length`
+      | :sg:`align -> int`
+
+      Can be set to `pygame.FONT_LEFT`, `pygame.FONT_RIGHT`, or
+      `pygame.FONT_CENTER`. This controls the text alignment behavior for the
+      font.
+
+      Requires pygame built with SDL_ttf 2.20.0, as all official pygame
+      distributions are.
+
+      .. versionadded:: 2.1.4
+
+      .. ## Font.align ##
+
    .. method:: render
 
       | :sl:`draw text on a new Surface`
-      | :sg:`render(text, antialias, color, background=None) -> Surface`
+      | :sg:`render(text, antialias, color, background=None, wraplength=0) -> Surface`
 
       This creates a new Surface with the specified text rendered on it. 
       :mod:`pygame.font` provides no way to directly draw text on an existing
       Surface: instead you must use :func:`Font.render` to create an image
       (Surface) of the text, then blit this image onto another Surface.
 
-      The text can only be a single line: newline characters are not rendered.
       Null characters ('\x00') raise a TypeError. Both Unicode and char (byte)
       strings are accepted. For Unicode strings only UCS-2 characters
       ('\\u0001' to '\\uFFFF') were previously supported and any greater
@@ -266,6 +281,10 @@ solves no longer exists, it will likely be removed in the future.
       to use for the text background. If no background is passed the area
       outside the text will be transparent.
 
+      The `wraplength` argument describes the width (in pixels) a line of text
+      should be before wrapping to a new line. See
+      :attr:`pygame.font.Font.align` for line-alignment settings.
+
       The Surface returned will be of the dimensions required to hold the text.
       (the same as those returned by :func:`Font.size`). If an empty string is passed
       for the text, a blank surface will be returned that is zero pixel wide and
@@ -285,9 +304,6 @@ solves no longer exists, it will likely be removed in the future.
       cause the resulting image to maintain transparency information by
       colorkey rather than (much less efficient) alpha values.
 
-      If you render '\\n' an unknown char will be rendered. Usually a
-      rectangle. Instead you need to handle newlines yourself.
-
       Font rendering is not thread safe: only a single thread can render text
       at any time.
 
@@ -296,6 +312,11 @@ solves no longer exists, it will likely be removed in the future.
         pygame supports rendering UCS4 unicode including more languages and
         emoji.
 
+      .. versionchanged:: 2.1.4 newline characters now will break text into
+         multiple lines.
+
+      .. versionadded:: 2.1.4 wraplength parameter
+
       .. ## Font.render ##
 
    .. method:: size
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 METADATA = {
     "name": "pygame-ce",
-    "version": "2.1.4.dev1",
+    "version": "2.1.4.dev3",
     "license": "LGPL",
     "url": "https://pyga.me",
     "author": "A community project.",
diff --git a/src_c/constants.c b/src_c/constants.c
@@ -623,6 +623,11 @@ MODINIT_DEFINE(constants)
     // https://github.com/pygame-community/pygame-ce/issues/1845
     DEC_CONSTS(IS_CE, 1)
 
+    /* Font alignment constants */
+    DEC_CONSTS(FONT_LEFT, 0);
+    DEC_CONSTS(FONT_CENTER, 1);
+    DEC_CONSTS(FONT_RIGHT, 2);
+
     if (PyModule_AddObject(module, "__all__", all_list)) {
         Py_DECREF(all_list);
         Py_DECREF(module);
diff --git a/src_c/doc/font_doc.h b/src_c/doc/font_doc.h
@@ -13,7 +13,8 @@
 #define DOC_FONTITALIC "italic -> bool\nGets or sets whether the font should be rendered in (faked) italics."
 #define DOC_FONTUNDERLINE "underline -> bool\nGets or sets whether the font should be rendered with an underline."
 #define DOC_FONTSTRIKETHROUGH "strikethrough -> bool\nGets or sets whether the font should be rendered with a strikethrough."
-#define DOC_FONTRENDER "render(text, antialias, color, background=None) -> Surface\ndraw text on a new Surface"
+#define DOC_FONTALIGN "align -> int\nSet how rendered text is aligned when given a wrap length"
+#define DOC_FONTRENDER "render(text, antialias, color, background=None, wraplength=0) -> Surface\ndraw text on a new Surface"
 #define DOC_FONTSIZE "size(text) -> (width, height)\ndetermine the amount of space needed to render text"
 #define DOC_FONTSETUNDERLINE "set_underline(bool) -> None\ncontrol if text is rendered with an underline"
 #define DOC_FONTGETUNDERLINE "get_underline() -> bool\ncheck if text will be rendered with an underline"
@@ -92,8 +93,12 @@ pygame.font.Font.strikethrough
  strikethrough -> bool
 Gets or sets whether the font should be rendered with a strikethrough.
 
+pygame.font.Font.align
+ align -> int
+Set how rendered text is aligned when given a wrap length
+
 pygame.font.Font.render
- render(text, antialias, color, background=None) -> Surface
+ render(text, antialias, color, background=None, wraplength=0) -> Surface
 draw text on a new Surface
 
 pygame.font.Font.size
diff --git a/src_c/font.c b/src_c/font.c
diff --git a/src_c/rect.c b/src_c/rect.c
diff --git a/test/font_test.py b/test/font_test.py
diff --git a/test/rect_test.py b/test/rect_test.py
