Fix mouse tile regressions and improve integer coordinate handling

Refactor Point to be generic to better track what uses int and float types

Fix wrong C type in get_mouse_state, added function to samples

Added separate integer attributes to mouse events

Author: HexDecimal

CHANGELOG.md

@@ -9,19 +9,30 @@ This project adheres to [Semantic Versioning](https://semver.org/) since version
 ### Added
 
 - `tcod.sdl.video.Window` now accepts an SDL WindowID.
+- `MouseState.integer_position` and `MouseMotion.integer_motion` to handle cases where integer values are preferred.
 
 ### Changed
 
 - Event classes are now more strict with attribute types
 - Event class initializers are keyword-only and no longer take a type parameter, with exceptions.
   Generally event class initialization is an internal process.
 - `MouseButtonEvent` no longer a subclass of `MouseState`.
+- `tcod.event.Point` is now a generic type containing `int` or `float` values depending on the context.
+- When converting mouse events to tiles:
+  `MouseState.position` and `MouseMotion.motion` refers to sub-tile coordinates.
+  `MouseState.integer_position` and `MouseMotion.integer_motion` refers to integer tile coordinates.
 
 ### Deprecated
 
 - `Event.type` is deprecated except for special cases such as `ControllerDevice`, `WindowEvent`, etc.
 - `MouseButtonEvent.state` is deprecated, replaced by the existing `.button` attribute.
 
+### Fixed
+
+- Fixed incorrect C FFI types inside `tcod.event.get_mouse_state`.
+- Fixed regression in mouse event tile coordinates being `float` instead of `int`.
+  `convert_coordinates_from_window` can be used if sub-tile coordinates were desired.
+
 ## [20.1.0] - 2026-02-25
 
 ### Added

examples/samples_tcod.py

@@ -1011,7 +1011,6 @@ class MouseSample(Sample):
 
     def __init__(self) -> None:
         self.motion = tcod.event.MouseMotion()
-        self.mouse_left = self.mouse_middle = self.mouse_right = 0
         self.log: list[str] = []
 
     def on_enter(self) -> None:
@@ -1022,15 +1021,18 @@ def on_enter(self) -> None:
 
     def on_draw(self) -> None:
         sample_console.clear(bg=GREY)
+        mouse_state = tcod.event.get_mouse_state()
         sample_console.print(
             1,
             1,
-            f"Pixel position : {self.motion.position.x:4.0f}x{self.motion.position.y:4.0f}\n"
-            f"Tile position  : {self.motion.tile.x:4.0f}x{self.motion.tile.y:4.0f}\n"
-            f"Tile movement  : {self.motion.tile_motion.x:4.0f}x{self.motion.tile_motion.y:4.0f}\n"
-            f"Left button    : {'ON' if self.mouse_left else 'OFF'}\n"
-            f"Right button   : {'ON' if self.mouse_right else 'OFF'}\n"
-            f"Middle button  : {'ON' if self.mouse_middle else 'OFF'}\n",
+            f"Pixel position : {mouse_state.position.x:4.0f}x{mouse_state.position.y:4.0f}\n"
+            f"Tile position  : {self.motion.tile.x:4d}x{self.motion.tile.y:4d}\n"
+            f"Tile movement  : {self.motion.tile_motion.x:4d}x{self.motion.tile_motion.y:4d}\n"
+            f"Left button    : {'ON' if mouse_state.state & tcod.event.MouseButtonMask.LEFT else 'OFF'}\n"
+            f"Middle button  : {'ON' if mouse_state.state & tcod.event.MouseButtonMask.MIDDLE else 'OFF'}\n"
+            f"Right button   : {'ON' if mouse_state.state & tcod.event.MouseButtonMask.RIGHT else 'OFF'}\n"
+            f"X1 button      : {'ON' if mouse_state.state & tcod.event.MouseButtonMask.X1 else 'OFF'}\n"
+            f"X2 button      : {'ON' if mouse_state.state & tcod.event.MouseButtonMask.X2 else 'OFF'}\n",
             fg=LIGHT_YELLOW,
             bg=None,
         )
@@ -1046,18 +1048,6 @@ def on_event(self, event: tcod.event.Event) -> None:
         match event:
             case tcod.event.MouseMotion():
                 self.motion = event
-            case tcod.event.MouseButtonDown(button=tcod.event.MouseButton.LEFT):
-                self.mouse_left = True
-            case tcod.event.MouseButtonDown(button=tcod.event.MouseButton.MIDDLE):
-                self.mouse_middle = True
-            case tcod.event.MouseButtonDown(button=tcod.event.MouseButton.RIGHT):
-                self.mouse_right = True
-            case tcod.event.MouseButtonUp(button=tcod.event.MouseButton.LEFT):
-                self.mouse_left = False
-            case tcod.event.MouseButtonUp(button=tcod.event.MouseButton.MIDDLE):
-                self.mouse_middle = False
-            case tcod.event.MouseButtonUp(button=tcod.event.MouseButton.RIGHT):
-                self.mouse_right = False
             case tcod.event.KeyDown(sym=KeySym.N1):
                 tcod.sdl.mouse.show(visible=False)
             case tcod.event.KeyDown(sym=KeySym.N2):
@@ -1422,8 +1412,8 @@ def handle_events() -> None:
         tile_event = tcod.event.convert_coordinates_from_window(event, context, root_console)
         SAMPLES[cur_sample].on_event(tile_event)
         match tile_event:
-            case tcod.event.MouseMotion(position=(x, y)):
-                mouse_tile_xy = int(x), int(y)
+            case tcod.event.MouseMotion(integer_position=(x, y)):
+                mouse_tile_xy = x, y
             case tcod.event.WindowEvent(type="WindowLeave"):
                 mouse_tile_xy = -1, -1
 

tcod/context.py

@@ -29,6 +29,7 @@
 import pickle
 import sys
 import warnings
+from math import floor
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, NoReturn, TypeVar
 
@@ -256,16 +257,22 @@ def convert_event(self, event: _Event) -> _Event:
         event_copy = copy.copy(event)
         if isinstance(event, (tcod.event.MouseState, tcod.event.MouseMotion)):
             assert isinstance(event_copy, (tcod.event.MouseState, tcod.event.MouseMotion))
-            event_copy.position = event._tile = tcod.event.Point(*self.pixel_to_tile(*event.position))
+            event_copy.position = tcod.event.Point(*self.pixel_to_tile(event.position[0], event.position[1]))
+            event._tile = tcod.event.Point(floor(event_copy.position[0]), floor(event_copy.position[1]))
         if isinstance(event, tcod.event.MouseMotion):
             assert isinstance(event_copy, tcod.event.MouseMotion)
             assert event._tile is not None
             prev_tile = self.pixel_to_tile(
                 event.position[0] - event.motion[0],
                 event.position[1] - event.motion[1],
             )
-            event_copy.motion = event._tile_motion = tcod.event.Point(
-                int(event._tile[0]) - int(prev_tile[0]), int(event._tile[1]) - int(prev_tile[1])
+            event_copy.motion = tcod.event.Point(
+                event_copy.position[0] - prev_tile[0],
+                event_copy.position[1] - prev_tile[1],
+            )
+            event._tile_motion = tcod.event.Point(
+                event._tile[0] - floor(prev_tile[0]),
+                event._tile[1] - floor(prev_tile[1]),
             )
         return event_copy