Update libtcod and SDL versions.

Apply new fixes from libtcod and warn for changes in renderers.

Update parser to handle a more complex deprecation qualifier.

Remove references to GLAD.

Update Numpy typing.

Author: HexDecimal

CHANGELOG.md

@@ -4,6 +4,14 @@ Changes relevant to the users of python-tcod are documented here.
 This project adheres to [Semantic Versioning](https://semver.org/) since version `2.0.0`.
 
 ## [Unreleased]
+### Changed
+- Using `libtcod 1.23.1`.
+- Bundle `SDL 2.26.0` on Windows and MacOS.
+- Code Page 437: Character 0x7F is now assigned to 0x2302 (HOUSE).
+- Forced all renderers to ``RENDERER_SDL2`` to fix rare graphical artifacts with OpenGL.
+
+### Deprecated
+- The `renderer` parameter of new contexts is now deprecated.
 
 ## [13.8.1] - 2022-09-23
 ### Fixed

build_libtcod.py

@@ -29,6 +29,7 @@
 RE_INCLUDE = re.compile(r'#include "([^"]*)"')
 RE_TAGS = re.compile(
     r"TCODLIB_C?API|TCOD_PUBLIC|TCOD_NODISCARD|TCOD_DEPRECATED_NOMESSAGE|TCOD_DEPRECATED_ENUM"
+    r"|(TCOD_DEPRECATED\(\".*?\"\))"
     r"|(TCOD_DEPRECATED|TCODLIB_FORMAT)\([^)]*\)|__restrict"
 )
 RE_VAFUNC = re.compile(r"^[^;]*\([^;]*va_list.*\);", re.MULTILINE)
@@ -151,7 +152,6 @@ def walk_sources(directory: str) -> Iterator[str]:
 sources += walk_sources("tcod/")
 sources += walk_sources("libtcod/src/libtcod/")
 sources += ["libtcod/src/vendor/stb.c"]
-sources += ["libtcod/src/vendor/glad.c"]
 sources += ["libtcod/src/vendor/lodepng.c"]
 sources += ["libtcod/src/vendor/utf8proc/utf8proc.c"]
 sources += glob.glob("libtcod/src/vendor/zlib/*.c")
@@ -265,6 +265,8 @@ def parse_sdl_attrs(prefix: str, all_names: List[str]) -> Tuple[str, str]:
     names = []
     lookup = []
     for name, value in sorted(find_sdl_attrs(prefix), key=lambda item: item[1]):
+        if name == "KMOD_RESERVED":
+            continue
         all_names.append(name)
         names.append(f"{name} = {value}")
         lookup.append(f'{value}: "{name}"')

build_sdl.py

@@ -22,7 +22,7 @@
 # The SDL2 version to parse and export symbols from.
 SDL2_PARSE_VERSION = os.environ.get("SDL_VERSION", "2.0.20")
 # The SDL2 version to include in binary distributions.
-SDL2_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "2.24.0")
+SDL2_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "2.26.0")
 
 
 # Used to remove excessive newlines in debug outputs.

docs/tcod/charmap-reference.rst

@@ -173,7 +173,7 @@ https://en.wikipedia.org/wiki/Code_page_437
          124  0x7C       \'\|\'     VERTICAL LINE
          125  0x7D       \'}\'      RIGHT CURLY BRACKET
          126  0x7E       \'~\'      TILDE
-         127  0x7F       \'\\x7f\'
+         127  0x2302     \'⌂\'      HOUSE
          128  0xC7       \'Ç\'      LATIN CAPITAL LETTER C WITH CEDILLA
          129  0xFC       \'ü\'      LATIN SMALL LETTER U WITH DIAERESIS
          130  0xE9       \'é\'      LATIN SMALL LETTER E WITH ACUTE

libtcod

@@ -489,9 +489,7 @@ def new(
 
     Providing no size information at all is also acceptable.
 
-    `renderer` is the desired libtcod renderer to use.
-    The default is :any:`tcod.context.RENDERER_SDL2` which is a fast renderer that runs reliably on all platforms.
-    If unsure then don't set this parameter.
+    `renderer` now does nothing and should not be set.  It may be removed in the future.
 
     `tileset` is the font/tileset for the new context to render with.
     The fall-back tileset available from passing None is useful for
@@ -524,14 +522,14 @@ def new(
     .. versionchanged:: 13.2
         Added the `console` parameter.
     """
-    if renderer is None:
-        renderer = RENDERER_SDL2
-    if renderer != RENDERER_SDL2:
+    if renderer is not None:
         warnings.warn(
-            "In the future all renderers other than tcod.RENDERER_SDL2 may be removed or ignored.",
-            PendingDeprecationWarning,
+            "The renderer parameter was deprecated and will likely be removed in a future version of libtcod.  "
+            "Remove the renderer parameter to fix this warning.",
+            FutureWarning,
             stacklevel=2,
         )
+    renderer = RENDERER_SDL2
     if sdl_window_flags is None:
         sdl_window_flags = SDL_WINDOW_RESIZABLE
     if argv is None:

tcod/context.py

@@ -1583,7 +1583,7 @@ def get_keyboard_state() -> NDArray[np.bool_]:
     numkeys = ffi.new("int[1]")
     keyboard_state = lib.SDL_GetKeyboardState(numkeys)
     out: NDArray[np.bool_] = np.frombuffer(ffi.buffer(keyboard_state[0 : numkeys[0]]), dtype=np.bool_)
-    out.flags["WRITEABLE"] = False  # type: ignore[index]  # This buffer is supposed to be const.
+    out.flags["WRITEABLE"] = False  # This buffer is supposed to be const.
     return out
 
 
@@ -2094,6 +2094,8 @@ class Scancode(enum.IntEnum):
     SLEEP = 282
     APP1 = 283
     APP2 = 284
+    AUDIOREWIND = 285
+    AUDIOFASTFORWARD = 286
     # --- end ---
 
     @property
@@ -2639,6 +2641,10 @@ class KeySym(enum.IntEnum):
     KBDILLUMUP = 1073742104
     EJECT = 1073742105
     SLEEP = 1073742106
+    APP1 = 1073742107
+    APP2 = 1073742108
+    AUDIOREWIND = 1073742109
+    AUDIOFASTFORWARD = 1073742110
     # --- end ---
 
     @property

tcod/event.py

@@ -245,6 +245,8 @@
 SCANCODE_SLEEP = 282
 SCANCODE_APP1 = 283
 SCANCODE_APP2 = 284
+SCANCODE_AUDIOREWIND = 285
+SCANCODE_AUDIOFASTFORWARD = 286
 
 # --- SDL keyboard symbols ---
 K_UNKNOWN = 0
@@ -484,6 +486,10 @@
 K_KBDILLUMUP = 1073742104
 K_EJECT = 1073742105
 K_SLEEP = 1073742106
+K_APP1 = 1073742107
+K_APP2 = 1073742108
+K_AUDIOREWIND = 1073742109
+K_AUDIOFASTFORWARD = 1073742110
 
 # --- SDL keyboard modifiers ---
 KMOD_NONE = 0
@@ -502,7 +508,7 @@
 KMOD_NUM = 4096
 KMOD_CAPS = 8192
 KMOD_MODE = 16384
-KMOD_RESERVED = 32768
+KMOD_SCROLL = 32768
 _REVERSE_MOD_TABLE = {
     0: "KMOD_NONE",
     1: "KMOD_LSHIFT",
@@ -520,7 +526,7 @@
     4096: "KMOD_NUM",
     8192: "KMOD_CAPS",
     16384: "KMOD_MODE",
-    32768: "KMOD_RESERVED",
+    32768: "KMOD_SCROLL",
 }
 
 # --- SDL wheel ---
@@ -775,6 +781,8 @@
     "SCANCODE_SLEEP",
     "SCANCODE_APP1",
     "SCANCODE_APP2",
+    "SCANCODE_AUDIOREWIND",
+    "SCANCODE_AUDIOFASTFORWARD",
     "K_UNKNOWN",
     "K_BACKSPACE",
     "K_TAB",
@@ -1012,6 +1020,10 @@
     "K_KBDILLUMUP",
     "K_EJECT",
     "K_SLEEP",
+    "K_APP1",
+    "K_APP2",
+    "K_AUDIOREWIND",
+    "K_AUDIOFASTFORWARD",
     "KMOD_NONE",
     "KMOD_LSHIFT",
     "KMOD_RSHIFT",
@@ -1028,7 +1040,7 @@
     "KMOD_NUM",
     "KMOD_CAPS",
     "KMOD_MODE",
-    "KMOD_RESERVED",
+    "KMOD_SCROLL",
     "MOUSEWHEEL_NORMAL",
     "MOUSEWHEEL_FLIPPED",
     "MOUSEWHEEL",

tcod/event_constants.py

@@ -584,7 +584,7 @@ def procedural_block_elements(*, tileset: Tileset) -> None:
     0x007C,
     0x007D,
     0x007E,
-    0x007F,
+    0x2302,
     0x00C7,
     0x00FC,
     0x00E9,
@@ -719,6 +719,9 @@ def procedural_block_elements(*, tileset: Tileset) -> None:
 See :ref:`code-page-437` for more info and a table of glyphs.
 
 .. versionadded:: 11.12
+
+.. versionchanged:: Unreleased
+    Character at index ``0x7F`` was changed from value ``0x7F`` to the HOUSE ``⌂`` glyph ``0x2302``.
 """
 
 CHARMAP_TCOD = [