Merge branch 'master' of https://github.com/marcusva/py-sdl2

Author: a-hurst

.github/workflows/run_tests.yml

@@ -52,7 +52,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install numpy pytest pillow
           python -m pip install pysdl2-dll
-      
+
       - name: Install and test PySDL2
         run: |
           python -m pip install .

doc/modules/ext/ttf.rst

@@ -3,5 +3,14 @@
 `sdl2.ext.ttf` - Rendering Text With TrueType Fonts
 ===================================================
 
+The :mod:`sdl2.ext.ttf` module provides the :class:`~sdl2.ext.FontTTF` class,
+which provides a friendly and Pythonic API for font rendering based around
+the **SDL_ttf** library. **SDL_ttf** can be installed as a Python dependency
+with ``pysdl2-dll`` on platforms that support it).
+
+Additionally, this module provides the deprecated :class:`~sdl2.ext.FontManager`
+class, which provides a different (and less featureful) API for rendering text
+using **SDL_ttf**.
+
 .. automodule:: sdl2.ext.ttf
 	:members:

doc/news.rst

@@ -62,6 +62,12 @@ New Features:
   widths and heights for each mapped character in a bitmap font (PR #208)
 * Added a new argument ``line_h`` to :meth:`sdl2.ext.BitmapFont.render_on` to
   allow specifying custom line heights (PR #208)
+* Added the :class:`~sdl2.ext.FontTTF` class, providing a new and flexible
+  Pythonic wrapper around the :mod:`~sdl2.sdlttf` module for opening and
+  rendering text with TrueType and OpenType fonts. New features include custom
+  line heights for multi-line text, left/right/center justification operations
+  for multiline text, and specifying font sizes in units of pixels in addition
+  to pt (PR #210)
 
 Fixed Bugs:
 
@@ -135,6 +141,8 @@ Deprecation Notices:
   have been deprecated due to their complexity and maintenance burden. New
   functions and classes for creating GUIs with PySDL2 may be introduced in a
   future release (PR #209)
+* The :class:`~sdl2.ext.FontManager` class has been deprecated in favor of the
+  new and more flexible :class:`~sdl2.ext.FontTTF` class (PR #210)
 
 
 0.9.9

examples/ttf.py

@@ -0,0 +1,125 @@
+# Test font rendering using the FontTTF class
+
+# This example allows you to try typing out some text in a given font, and
+# supports the following keys:
+#   - Left/Right Arrow Keys: Cycles text alignment (left/right/center)
+#   - Up/Down Arrow Keys: Increases/decreases line height
+#   - Tab: Cycles font rendering style
+
+import os
+import sys
+import sdl2.ext
+from sdl2.sdlttf import TTF_FontLineSkip
+from sdl2.ext import FontTTF
+
+filepath = os.path.abspath(os.path.dirname(__file__))
+RESOURCES = sdl2.ext.Resources(filepath, "resources")
+BLACK_RGBA = (0, 0, 0, 255)
+WHITE_RGBA = (255, 255, 255, 255)
+
+
+def update_text(renderer, surface):
+    # Create a texture for the surface and render it to the screen
+    tx = sdl2.ext.Texture(renderer, surface)
+    renderer.clear(BLACK_RGBA)
+    renderer.copy(tx, dstrect=(10, 10))
+    renderer.present()
+
+
+def run():
+    # Initialize SDL2 and create a Window and Renderer
+    sdl2.ext.init()
+    window = sdl2.ext.Window("Font Rendering", size=(800, 500))
+    renderflags = sdl2.SDL_RENDERER_SOFTWARE
+    if "-hardware" in sys.argv:
+        renderflags = (
+            sdl2.SDL_RENDERER_ACCELERATED | sdl2.SDL_RENDERER_PRESENTVSYNC
+        )
+    renderer = sdl2.ext.Renderer(window, flags=renderflags)
+    window.show()
+
+    # Create and initialize a font to render text with
+    fontpath = RESOURCES.get_path("tuffy.ttf")
+    font = FontTTF(fontpath, "20px", WHITE_RGBA)
+
+    # Add some additional font styles
+    styles = ['default', 'small', 'red', 'large', 'bg_fill']
+    font.add_style('small', '10px', WHITE_RGBA)
+    font.add_style('red', '20px', (255, 0, 0))
+    font.add_style('large', '35px', WHITE_RGBA)
+    font.add_style('bg_fill', '20px', BLACK_RGBA, WHITE_RGBA)
+
+    # Initialize font rendering options
+    line_height = TTF_FontLineSkip(font.get_ttf_font())
+    alignments = ["left", "center", "right"]
+    align_idx = 0
+    style_idx = 0
+
+    # Set a default string with which to render text
+    txt = u"Hi There!\nYou can edit this text using the keyboard and delete keys."
+
+    # Render the text and present it on the screen
+    txt_rendered = font.render_text(txt, width=780)
+    update_text(renderer, txt_rendered)
+
+    # Tell SDL2 to start reading Text Editing events. This allows for proper
+    # handling of unicode characters and modifier keys.
+    sdl2.SDL_StartTextInput()
+
+    # Create a simple event loop and wait for keydown, text editing, and quit events.
+    running = True
+    while running:
+        events = sdl2.ext.get_events()
+        for event in events:
+            update_txt = False
+            if event.type == sdl2.SDL_QUIT:
+                running = False
+                break
+
+            # Handle non-standard keyboard events
+            elif event.type == sdl2.SDL_KEYDOWN:
+                update_txt = True
+                sdl_keysym = event.key.keysym.sym
+                # If backspace pressed, remove last character (if any) from txt
+                if sdl_keysym == sdl2.SDLK_BACKSPACE:
+                    txt = txt[:-1]
+                # If enter/return pressed, insert a newline
+                elif sdl_keysym == sdl2.SDLK_RETURN:
+                    txt = txt + u"\n"
+                # If left or right arrow pressed, change text alignment mode
+                elif sdl_keysym == sdl2.SDLK_LEFT:
+                    align_idx = (align_idx - 1) % 3
+                elif sdl_keysym == sdl2.SDLK_RIGHT:
+                    align_idx = (align_idx + 1) % 3
+                elif sdl_keysym == sdl2.SDLK_UP:
+                    line_height += 1
+                elif sdl_keysym == sdl2.SDLK_DOWN:
+                    if line_height > 1:
+                        line_height -= 1 
+                # If tab pressed, cycle through the different font styles
+                elif sdl_keysym == sdl2.SDLK_TAB:
+                    style_idx = (style_idx + 1) % len(styles)
+
+            # Handle text input events
+            elif event.type == sdl2.SDL_TEXTINPUT:
+                update_txt = True
+                txt += event.text.text.decode("utf-8")
+
+            # If txt has changed since the start of the loop, update the renderer
+            if update_txt:
+                align = alignments[align_idx]
+                style = styles[style_idx]
+                txt_rendered = font.render_text(
+                    txt, style, width=780, line_h=line_height, align=align
+                )
+                update_text(renderer, txt_rendered)
+
+    # Now that we're done, close everything down and quit SDL2
+    font.close()
+    renderer.destroy()
+    window.close()
+    sdl2.ext.quit()
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(run())

sdl2/ext/compat.py

@@ -37,6 +37,10 @@ def _to_unicode(x, enc):
             return str(x)
 
 
+def _is_text(x):
+    return isinstance(x, (str, bytes, unicode))
+
+
 def utf8(x):
     """Converts input to a unicode string in a Python 2/3 agnostic manner.