Merge branch 'main' into fix-border-fix-flipped-title-colors-in-panel-border

Author: TomJGooding

CHANGELOG.md

@@ -11,8 +11,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fixed smooth scrolling broken on iTerm over SSH https://github.com/Textualize/textual/pull/5551
 - Fixed height of auto container which contains auto height children https://github.com/Textualize/textual/pull/5552
+- Fixed `Content.from_markup` not stripping control codes https://github.com/Textualize/textual/pull/5557
+- Fixed `delta_x` and `delta_y` in mouse events when smooth scrolling is enabled https://github.com/Textualize/textual/pull/5556
 - Fixed flipped title colors in panel border https://github.com/Textualize/textual/issues/5548
 
+### Added
+
+- Added `pointer_x`, `pointer_y`, `pointer_screen_x`, and `pointer_screen_y` attributes to mouse events https://github.com/Textualize/textual/pull/5556
+
 ## [2.0.4] - 2025-02-17
 
 ### Fixed

src/textual/_xterm_parser.py

@@ -83,13 +83,15 @@ def parse_mouse_code(self, code: str) -> Message | None:
                 and self.terminal_pixel_size is not None
                 and self.terminal_size is not None
             ):
-                x_ratio = self.terminal_pixel_size[0] / self.terminal_size[0]
-                y_ratio = self.terminal_pixel_size[1] / self.terminal_size[1]
+                pixel_width, pixel_height = self.terminal_pixel_size
+                width, height = self.terminal_size
+                x_ratio = pixel_width / width
+                y_ratio = pixel_height / height
                 x /= x_ratio
                 y /= y_ratio
 
-            delta_x = x - self.last_x
-            delta_y = y - self.last_y
+            delta_x = int(x) - int(self.last_x)
+            delta_y = int(y) - int(self.last_y)
             self.last_x = x
             self.last_y = y
             event_class: type[events.MouseEvent]

src/textual/content.py

@@ -193,6 +193,7 @@ def from_markup(cls, markup: str | Content, **variables: object) -> Content:
             if variables:
                 raise ValueError("A literal string is require to substitute variables.")
             return markup
+        markup = _strip_control_codes(markup)
         from textual.markup import to_content
 
         content = to_content(markup, template_variables=variables or None)

src/textual/events.py

@@ -362,8 +362,8 @@ def __init__(
         widget: Widget | None,
         x: float,
         y: float,
-        delta_x: float,
-        delta_y: float,
+        delta_x: int,
+        delta_y: int,
         button: int,
         shift: bool,
         meta: bool,
@@ -399,34 +399,54 @@ def __init__(
 
     @property
     def x(self) -> int:
-        """The relative X coordinate."""
+        """The relative X coordinate of the cell under the mouse."""
         return int(self._x)
 
     @property
     def y(self) -> int:
-        """The relative Y coordinate."""
+        """The relative Y coordinate of the cell under the mouse."""
         return int(self._y)
 
     @property
     def delta_x(self) -> int:
         """Change in `x` since last message."""
-        return int(self._delta_x)
+        return self._delta_x
 
     @property
     def delta_y(self) -> int:
         """Change in `y` since the last message."""
-        return int(self._delta_y)
+        return self._delta_y
 
     @property
     def screen_x(self) -> int:
-        """X coordinate relative to top left of screen."""
+        """X coordinate of the cell relative to top left of screen."""
         return int(self._screen_x)
 
     @property
     def screen_y(self) -> int:
-        """Y coordinate relative to top left of screen."""
+        """Y coordinate of the cell relative to top left of screen."""
         return int(self._screen_y)
 
+    @property
+    def pointer_x(self) -> float:
+        """The relative X coordinate of the pointer."""
+        return self._x
+
+    @property
+    def pointer_y(self) -> float:
+        """The relative Y coordinate of the pointer."""
+        return self._y
+
+    @property
+    def pointer_screen_x(self) -> float:
+        """The X coordinate of the pointer relative to the screen."""
+        return self._screen_x
+
+    @property
+    def pointer_screen_y(self) -> float:
+        """The Y coordinate of the pointer relative to the screen."""
+        return self._screen_y
+
     @classmethod
     def from_event(
         cls: Type[MouseEventT], widget: Widget, event: MouseEvent
@@ -449,10 +469,12 @@ def from_event(
 
     def __rich_repr__(self) -> rich.repr.Result:
         yield self.widget
-        yield "x", self._x
-        yield "y", self._y
-        yield "delta_x", self._delta_x, 0
-        yield "delta_y", self._delta_y, 0
+        yield "x", self.x
+        yield "y", self.y
+        yield "pointer_x", self.pointer_x
+        yield "pointer_y", self.pointer_y
+        yield "delta_x", self.delta_x, 0
+        yield "delta_y", self.delta_y, 0
         if self.screen_x != self.x:
             yield "screen_x", self._screen_x
         if self.screen_y != self.y:

tests/test_content.py

@@ -223,3 +223,9 @@ def test_escape():
     content = Content.from_markup("\\[bold]Not really bold")
     assert content.plain == "[bold]Not really bold"
     assert content.spans == []
+
+
+def test_strip_control_codes():
+    """Test that control codes are removed from content."""
+    assert Content("foo\r\nbar").plain == "foo\nbar"
+    assert Content.from_markup("foo\r\nbar").plain == "foo\nbar"