Use SDL3 struct attributes for controller events

Names were changed from SDL2 and were causing crashes

Author: HexDecimal

.vscode/settings.json

@@ -71,11 +71,8 @@
         "bysource",
         "caeldera",
         "CAPSLOCK",
-        "caxis",
-        "cbutton",
         "ccoef",
         "cdef",
-        "cdevice",
         "cffi",
         "cflags",
         "CFLAGS",
@@ -169,6 +166,9 @@
         "fwidth",
         "GAMECONTROLLER",
         "gamepad",
+        "gaxis",
+        "gbutton",
+        "gdevice",
         "genindex",
         "getbbox",
         "GFORCE",

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](https://semver.org/) since version
 ### Fixed
 
 - `SDL_RENDER_SCALE_QUALITY` is now respected again since the change to SDL3.
+- Fixed crash on controller events.
 
 ## [19.4.1] - 2025-08-27
 

tcod/event.py

@@ -1060,9 +1060,9 @@ def __init__(self, type: str, which: int, axis: tcod.sdl.joystick.ControllerAxis
     def from_sdl_event(cls, sdl_event: Any) -> ControllerAxis:
         return cls(
             "CONTROLLERAXISMOTION",
-            sdl_event.caxis.which,
-            tcod.sdl.joystick.ControllerAxis(sdl_event.caxis.axis),
-            sdl_event.caxis.value,
+            sdl_event.gaxis.which,
+            tcod.sdl.joystick.ControllerAxis(sdl_event.gaxis.axis),
+            sdl_event.gaxis.value,
         )
 
     def __repr__(self) -> str:
@@ -1099,9 +1099,9 @@ def from_sdl_event(cls, sdl_event: Any) -> ControllerButton:
         }[sdl_event.type]
         return cls(
             type,
-            sdl_event.cbutton.which,
-            tcod.sdl.joystick.ControllerButton(sdl_event.cbutton.button),
-            bool(sdl_event.cbutton.down),
+            sdl_event.gbutton.which,
+            tcod.sdl.joystick.ControllerButton(sdl_event.gbutton.button),
+            bool(sdl_event.gbutton.down),
         )
 
     def __repr__(self) -> str:
@@ -1130,7 +1130,7 @@ def from_sdl_event(cls, sdl_event: Any) -> ControllerDevice:
             lib.SDL_EVENT_GAMEPAD_REMOVED: "CONTROLLERDEVICEREMOVED",
             lib.SDL_EVENT_GAMEPAD_REMAPPED: "CONTROLLERDEVICEREMAPPED",
         }[sdl_event.type]
-        return cls(type, sdl_event.cdevice.which)
+        return cls(type, sdl_event.gdevice.which)
 
 
 @functools.cache