Merge branch 'main' into batch-async-context-manager

Author: rodrigogiraoserrao

CHANGELOG.md

@@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Changed
+
+- Textual now writes to stderr rather than stdout
+
 ### Added
 
+- Added an `asyncio` lock attribute `Widget.lock` to be used to synchronize widget state https://github.com/Textualize/textual/issues/4134
 - Added support for environment variable `TEXTUAL_ANIMATIONS` to control what animations Textual displays https://github.com/Textualize/textual/pull/4062
 - Add attribute `App.animation_level` to control whether animations on that app run or not https://github.com/Textualize/textual/pull/4062
+- Added support for a `TEXTUAL_SCREENSHOT_LOCATION` environment variable to specify the location of an automated screenshot https://github.com/Textualize/textual/pull/4181/
+- Added support for a `TEXTUAL_SCREENSHOT_FILENAME` environment variable to specify the filename of an automated screenshot https://github.com/Textualize/textual/pull/4181/
 - Added an `asyncio` lock attribute `Widget.lock` to be used to synchronize widget state https://github.com/Textualize/textual/issues/4134
 - `Widget.remove_children` now accepts a CSS selector to specify which children to remove https://github.com/Textualize/textual/pull/4183
 - `Widget.batch` combines widget locking and app update batching https://github.com/Textualize/textual/pull/4183

src/textual/app.py

@@ -1153,7 +1153,7 @@ def export_screenshot(self, *, title: str | None = None) -> str:
     def save_screenshot(
         self,
         filename: str | None = None,
-        path: str = "./",
+        path: str | None = None,
         time_format: str | None = None,
     ) -> str:
         """Save an SVG screenshot of the current screen.
@@ -1168,7 +1168,8 @@ def save_screenshot(
         Returns:
             Filename of screenshot.
         """
-        if filename is None:
+        path = path or "./"
+        if not filename:
             if time_format is None:
                 dt = datetime.now().isoformat()
             else:
@@ -2397,7 +2398,10 @@ async def _ready(self) -> None:
 
         async def take_screenshot() -> None:
             """Take a screenshot and exit."""
-            self.save_screenshot()
+            self.save_screenshot(
+                path=constants.SCREENSHOT_LOCATION,
+                filename=constants.SCREENSHOT_FILENAME,
+            )
             self.exit()
 
         if constants.SCREENSHOT_DELAY >= 0:

src/textual/constants.py

@@ -95,6 +95,12 @@ def _get_textual_animations() -> AnimationLevel:
 SCREENSHOT_DELAY: Final[int] = _get_environ_int("TEXTUAL_SCREENSHOT", -1)
 """Seconds delay before taking screenshot."""
 
+SCREENSHOT_LOCATION: Final[str | None] = get_environ("TEXTUAL_SCREENSHOT_LOCATION")
+"""The location where screenshots should be written."""
+
+SCREENSHOT_FILENAME: Final[str | None] = get_environ("TEXTUAL_SCREENSHOT_FILENAME")
+"""The filename to use for the screenshot."""
+
 PRESS: Final[str] = get_environ("TEXTUAL_PRESS", "")
 """Keys to automatically press."""
 

src/textual/drivers/linux_driver.py

@@ -42,8 +42,8 @@ def __init__(
             size: Initial size of the terminal or `None` to detect.
         """
         super().__init__(app, debug=debug, size=size)
-        self._file = sys.__stdout__
-        self.fileno = sys.stdin.fileno()
+        self._file = sys.__stderr__
+        self.fileno = sys.__stdin__.fileno()
         self.attrs_before: list[Any] | None = None
         self.exit_event = Event()
         self._key_thread: Thread | None = None
@@ -259,7 +259,19 @@ def _request_terminal_sync_mode_support(self) -> None:
 
     @classmethod
     def _patch_lflag(cls, attrs: int) -> int:
-        return attrs & ~(termios.ECHO | termios.ICANON | termios.IEXTEN | termios.ISIG)
+        """Patch termios lflag.
+
+        Args:
+            attributes: New set attributes.
+
+        Returns:
+            New lflag.
+
+        """
+        # if TEXTUAL_ALLOW_SIGNALS env var is set, then allow Ctrl+C to send signals
+        ISIG = 0 if os.environ.get("TEXTUAL_ALLOW_SIGNALS") else termios.ISIG
+
+        return attrs & ~(termios.ECHO | termios.ICANON | termios.IEXTEN | ISIG)
 
     @classmethod
     def _patch_iflag(cls, attrs: int) -> int:
@@ -328,15 +340,16 @@ def _run_input_thread(self) -> None:
 
     def run_input_thread(self) -> None:
         """Wait for input and dispatch events."""
-        selector = selectors.DefaultSelector()
+        selector = selectors.SelectSelector()
         selector.register(self.fileno, selectors.EVENT_READ)
 
         fileno = self.fileno
+        EVENT_READ = selectors.EVENT_READ
 
         def more_data() -> bool:
             """Check if there is more data to parse."""
-            EVENT_READ = selectors.EVENT_READ
-            for key, events in selector.select(0.01):
+
+            for _key, events in selector.select(0.01):
                 if events & EVENT_READ:
                     return True
             return False
@@ -347,14 +360,15 @@ def more_data() -> bool:
         utf8_decoder = getincrementaldecoder("utf-8")().decode
         decode = utf8_decoder
         read = os.read
-        EVENT_READ = selectors.EVENT_READ
 
         try:
             while not self.exit_event.is_set():
                 selector_events = selector.select(0.1)
                 for _selector_key, mask in selector_events:
                     if mask & EVENT_READ:
-                        unicode_data = decode(read(fileno, 1024))
+                        unicode_data = decode(
+                            read(fileno, 1024), final=self.exit_event.is_set()
+                        )
                         for event in feed(unicode_data):
                             self.process_event(event)
         finally:

src/textual/widgets/_tabs.py

@@ -658,7 +658,6 @@ def _activate_tab(self, tab: Tab) -> None:
         self.query("#tabs-list Tab.-active").remove_class("-active")
         tab.add_class("-active")
         self.active = tab.id or ""
-        self.query_one("#tabs-scroll").scroll_to_center(tab, force=True)
 
     def _on_underline_clicked(self, event: Underline.Clicked) -> None:
         """The underline was clicked.
@@ -714,7 +713,6 @@ def _move_tab(self, direction: int) -> None:
         tab_count = len(tabs)
         new_tab_index = (tabs.index(active_tab) + direction) % tab_count
         self.active = tabs[new_tab_index].id or ""
-        self._scroll_active_tab()
 
     def _on_tab_disabled(self, event: Tab.Disabled) -> None:
         """Re-post the disabled message."""