shutdown procedure, better scrollbars when window is small

Author: willmcgugan

src/textual/_linux_driver.py

@@ -140,20 +140,23 @@ def _patch_iflag(cls, attrs: int) -> int:
         )
 
     def stop_application_mode(self) -> None:
-        signal.signal(signal.SIGWINCH, signal.SIG_DFL)
+        log.debug("stop_application_mode()")
 
-        self.console.set_alt_screen(False)
-        self.console.show_cursor(True)
+        signal.signal(signal.SIGWINCH, signal.SIG_DFL)
 
+        self._disable_mouse_support()
         self.exit_event.set()
-        # if self._key_thread is not None:
-        #     self._key_thread.join()
+        if self._key_thread is not None:
+            self._key_thread.join()
+
         if self.attrs_before is not None:
             try:
                 termios.tcsetattr(self.fileno, termios.TCSANOW, self.attrs_before)
             except termios.error:
                 pass
-        self._disable_mouse_support()
+
+        self.console.set_alt_screen(False)
+        self.console.show_cursor(True)
 
     def run_input_thread(self, loop) -> None:
         try:

src/textual/_xterm_parser.py

@@ -69,6 +69,7 @@ def parse(self, on_token: TokenCallback) -> Generator[Awaitable, str, None]:
                 sequence: str = character
                 while True:
                     sequence += yield read1()
+                    log.debug(f"sequence={sequence!r}")
                     keys = get_ansi_sequence(sequence, None)
                     if keys is not None:
                         for key in keys:

src/textual/app.py

@@ -42,6 +42,10 @@
     uvloop.install()
 
 
+class ShutdownError(Exception):
+    pass
+
+
 @rich_repr
 class App(MessagePump):
     view: View
@@ -108,7 +112,6 @@ async def _process_messages(self) -> None:
             log.exception("error starting application mode")
             raise
         try:
-            # self.refresh()
             await super().process_messages()
         finally:
             try:
@@ -125,8 +128,8 @@ async def close_all() -> None:
 
             try:
                 await asyncio.wait_for(close_all(), timeout=5)
-            except asyncio.TimeoutError:
-                raise
+            except asyncio.TimeoutError as error:
+                raise ShutdownError("Timeout closing messages pump(s)") from None
 
             self.children.clear()
 

src/textual/scrollbar.py

@@ -81,7 +81,7 @@ def render_bar(
     if ascii_only:
         bars = ["|", "|", "|", "|", "|", "|", "|", "|", "|"]
     else:
-        bars = [" ", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
+        bars = ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
 
     back = Color.parse(back_color)
     bar = Color.parse(bar_color)
@@ -94,27 +94,23 @@ def render_bar(
     step_size = virtual_size / size
 
     start = int(position / step_size * 8)
-    end = start + int(window_size / step_size * 8)
+    end = start + max(8, int(window_size / step_size * 8))
 
     start_index, start_bar = divmod(start, 8)
     end_index, end_bar = divmod(end, 8)
 
-    if window_size / step_size <= 1:
-        if start_index < len(segments):
-            segments[start_index] = _Segment(blank, _Style(bgcolor=bar))
-    else:
-        segments[start_index:end_index] = [_Segment(blank, _Style(bgcolor=bar))] * (
-            end_index - start_index
-        )
+    segments[start_index:end_index] = [_Segment(blank, _Style(bgcolor=bar))] * (
+        end_index - start_index
+    )
 
-        if start_index < len(segments):
-            segments[start_index] = _Segment(
-                bars[7 - start_bar] * depth, _Style(bgcolor=back, color=bar)
-            )
-        if end_index < len(segments):
-            segments[end_index] = _Segment(
-                bars[7 - end_bar] * depth, _Style(color=back, bgcolor=bar)
-            )
+    if start_index < len(segments):
+        segments[start_index] = _Segment(
+            bars[7 - start_bar] * depth, _Style(bgcolor=back, color=bar)
+        )
+    if end_index < len(segments):
+        segments[end_index] = _Segment(
+            bars[7 - end_bar] * depth, _Style(color=back, bgcolor=bar)
+        )
 
     return segments