mini-arcade-native-backend 0.4.1__tar.gz → 0.4.2__tar.gz

{mini_arcade_native_backend-0.4.1 → mini_arcade_native_backend-0.4.2}/CHANGELOG.md

@@ -6,6 +6,11 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.4.2] - 2025-12-16
+
+### Added
+- enhance event handling by adding key_code to event mapping in NativeBackend
+
 ## [0.4.1] - 2025-12-15
 
 ### Added

{mini_arcade_native_backend-0.4.1 → mini_arcade_native_backend-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mini-arcade-native-backend
-Version: 0.4.1
+Version: 0.4.2
 Summary: Native SDL2 backend for mini-arcade-core using SDL2 + pybind11.
 Author-Email: Santiago Rincon <rincores@gmail.com>
 License: Copyright (c) 2025 Santiago Rincón

{mini_arcade_native_backend-0.4.1 → mini_arcade_native_backend-0.4.2}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "mini-arcade-native-backend"
-version = "0.4.1"
+version = "0.4.2"
 description = "Native SDL2 backend for mini-arcade-core using SDL2 + pybind11."
 authors = [
   { name = "Santiago Rincon", email = "rincores@gmail.com" },

{mini_arcade_native_backend-0.4.1 → mini_arcade_native_backend-0.4.2}/src/mini_arcade_native_backend/__init__.py

@@ -37,6 +37,7 @@ if sys.platform == "win32":
 # Justification: Need to import core after setting DLL path on Windows
 # pylint: disable=wrong-import-position
 from mini_arcade_core import Backend, Event, EventType
+from mini_arcade_core.keymaps.sdl import SDL_KEYCODE_TO_KEY
 
 # Justification: Importing the native extension module
 # pylint: disable=import-self,no-name-in-module
@@ -127,34 +128,64 @@ class NativeBackend(Backend):
         for ev in self._engine.poll_events():
             etype = _NATIVE_TO_CORE.get(ev.type, EventType.UNKNOWN)
 
-            # "0 means not present" convention from C++ side
-            key = ev.key if getattr(ev, "key", 0) != 0 else None
+            key = None
+            key_code = None
+            scancode = None
+            mod = None
+            repeat = None
+
+            x = y = dx = dy = None
+            button = None
+            wheel = None
+            size = None
+            text = None
+
+            if etype in (EventType.KEYDOWN, EventType.KEYUP):
+                raw_key = int(getattr(ev, "key", 0) or 0)
+                key_code = raw_key if raw_key != 0 else None
+                key = SDL_KEYCODE_TO_KEY.get(raw_key) if raw_key != 0 else None
+
+                scancode = (
+                    int(ev.scancode) if getattr(ev, "scancode", 0) else None
+                )
+                mod = int(ev.mod) if getattr(ev, "mod", 0) else None
+
+                rep = int(getattr(ev, "repeat", 0) or 0)
+                repeat = bool(rep) if etype == EventType.KEYDOWN else None
 
-            x = getattr(ev, "x", 0) or None
-            y = getattr(ev, "y", 0) or None
-            dx = getattr(ev, "dx", 0) or None
-            dy = getattr(ev, "dy", 0) or None
-            button = getattr(ev, "button", 0) or None
+            elif etype == EventType.MOUSEMOTION:
+                x = int(ev.x)
+                y = int(ev.y)
+                dx = int(ev.dx)
+                dy = int(ev.dy)
 
-            wheel_x = getattr(ev, "wheel_x", 0)
-            wheel_y = getattr(ev, "wheel_y", 0)
-            wheel = (wheel_x, wheel_y) if (wheel_x or wheel_y) else None
+            elif etype in (EventType.MOUSEBUTTONDOWN, EventType.MOUSEBUTTONUP):
+                button = int(ev.button) if ev.button else None
+                x = int(ev.x)
+                y = int(ev.y)
 
-            w = getattr(ev, "width", 0)
-            h = getattr(ev, "height", 0)
-            size = (w, h) if (w and h) else None
+            elif etype == EventType.MOUSEWHEEL:
+                wx = int(ev.wheel_x)
+                wy = int(ev.wheel_y)
+                wheel = (wx, wy) if (wx or wy) else None
 
-            text = getattr(ev, "text", "") or None
+            elif etype == EventType.WINDOWRESIZED:
+                w = int(ev.width)
+                h = int(ev.height)
+                size = (w, h) if (w and h) else None
 
-            scancode = getattr(ev, "scancode", 0) or None
-            mod = getattr(ev, "mod", 0) or None
-            repeat_raw = getattr(ev, "repeat", 0)
-            repeat = bool(repeat_raw) if repeat_raw else None
+            elif etype == EventType.TEXTINPUT:
+                t = getattr(ev, "text", "")
+                text = t if t else None
 
             out.append(
                 Event(
                     type=etype,
                     key=key,
+                    key_code=key_code,
+                    scancode=scancode,
+                    mod=mod,
+                    repeat=repeat,
                     x=x,
                     y=y,
                     dx=dx,
@@ -163,9 +194,6 @@ class NativeBackend(Backend):
                     wheel=wheel,
                     size=size,
                     text=text,
-                    scancode=scancode,
-                    mod=mod,
-                    repeat=repeat,
                 )
             )
         return out

{mini_arcade_native_backend-0.4.1 → mini_arcade_native_backend-0.4.2}/tests/test_init.py

@@ -34,6 +34,7 @@ def setup_fake_core_and_native(monkeypatch):
     class FakeEvent:
         type: object
         key: object = None
+        key_code: object = None
         x: object = None
         y: object = None
         dx: object = None
@@ -52,6 +53,13 @@ def setup_fake_core_and_native(monkeypatch):
 
     sys.modules["mini_arcade_core"] = fake_core
 
+    fake_keymaps = types.ModuleType("mini_arcade_core.keymaps")
+    fake_sdl = types.ModuleType("mini_arcade_core.keymaps.sdl")
+    fake_sdl.SDL_KEYCODE_TO_KEY = {}  # or mapping your test expects
+
+    sys.modules["mini_arcade_core.keymaps"] = fake_keymaps
+    sys.modules["mini_arcade_core.keymaps.sdl"] = fake_sdl
+
     # --- Fake native extension: mini_arcade_native_backend._native -------------
     fake_native = types.ModuleType("mini_arcade_native_backend._native")
 
@@ -253,6 +261,7 @@ def test_poll_events_maps_native_events_to_core_events_and_keys(
     class FakeNativeEvent:
         type: object
         key: int = 0
+        key_code: int = 0
         x: int = 0
         y: int = 0
         dx: int = 0
@@ -298,7 +307,7 @@ def test_poll_events_maps_native_events_to_core_events_and_keys(
 
     # KeyDown: key passes through
     assert events[1].type == fake_core.EventType.KEYDOWN
-    assert events[1].key == 32
+    assert events[1].key_code == 32
 
     # MouseMotion: x/y/dx/dy mapped (0 becomes None; here non-zero)
     assert events[2].type == fake_core.EventType.MOUSEMOTION
@@ -327,4 +336,4 @@ def test_poll_events_maps_native_events_to_core_events_and_keys(
 
     # Unknown
     assert events[7].type == fake_core.EventType.UNKNOWN
-    assert events[7].key == 10
+    assert events[7].key_code is None