Bump version to 1.6.10 in pyproject.toml

Refactor paint_frame and refresh_node_selection functions to include optional refresh parameter; add stage_node_details_background function for improved window management in F5 key handling tests.

contact/__main__.py

@@ -121,7 +121,7 @@ def interface_is_ready(interface: object) -> bool:
 
 def initialize_runtime_interface_with_retry(stdscr: curses.window, args: object):
     while True:
-        interface = initialize_runtime_interface(args)
+        interface = initialize_runtime_interface(args, stdscr)
         if getattr(args, "demo_screenshot", False) or interface_is_ready(interface):
             return interface
 
@@ -162,10 +162,12 @@ def initialize_globals(seed_demo: bool = False) -> None:
     load_messages_from_db()
 
 
-def initialize_runtime_interface(args: object):
+def initialize_runtime_interface(args: object, stdscr=None):
     if getattr(args, "demo_screenshot", False):
         configure_demo_database()
         return build_demo_interface()
+    if stdscr is not None:
+        return initialize_interface(args, status_callback=lambda status: draw_splash(stdscr, status))
     return initialize_interface(args)
 
 

contact/settings.py

@@ -36,7 +36,7 @@ def main(stdscr: curses.window) -> None:
 
             parser = setup_parser()
             args = parser.parse_args()
-            interface = initialize_interface(args)
+            interface = initialize_interface(args, status_callback=lambda status: draw_splash(stdscr, status))
 
             if interface.localNode.localConfig.lora.region == 0:
                 confirmation = get_list_input(

contact/ui/contact_ui.py

@@ -246,13 +246,14 @@ def compute_widths(total_w: int, focus: int):
     return MIN_COL, MIN_COL, total_w - 2 * MIN_COL
 
 
-def paint_frame(win, selected: bool) -> None:
+def paint_frame(win, selected: bool, refresh: bool = True) -> None:
     if win is not entry_win and ui_state.input_focused:
         selected = False
     win.attrset(get_color("window_frame_selected") if selected else get_color("window_frame"))
     win.box()
     win.attrset(get_color("window_frame"))
-    win.refresh()
+    if refresh:
+        win.refresh()
 
 
 def get_channel_row_color(index: int) -> int:
@@ -275,7 +276,7 @@ def get_node_row_color(index: int, highlight: bool = False) -> int:
     return get_color(color, reverse=reverse)
 
 
-def refresh_node_selection(old_index: int = -1, highlight: bool = False) -> None:
+def refresh_node_selection(old_index: int = -1, highlight: bool = False, refresh: bool = True) -> None:
     if nodes_pad is None or not ui_state.node_list:
         return
 
@@ -294,8 +295,9 @@ def refresh_node_selection(old_index: int = -1, highlight: bool = False) -> None
             pass
 
     ui_state.start_index[2] = max(0, ui_state.selected_node - (nodes_win.getmaxyx()[0] - 3))
-    refresh_pad(2)
-    draw_window_arrows(2)
+    if refresh:
+        refresh_pad(2)
+        draw_window_arrows(2)
 
 
 def refresh_main_window(window_id: int, selected: bool) -> None:
@@ -306,7 +308,7 @@ def refresh_main_window(window_id: int, selected: bool) -> None:
             channel_pad.chgat(ui_state.selected_channel, 1, width, get_channel_row_color(ui_state.selected_channel))
         refresh_pad(0)
     elif window_id == 1:
-        paint_frame(messages_win, selected=selected)
+        paint_frame(messages_win, selected=selected, refresh=False)
         refresh_pad(1)
     elif window_id == 2:
         paint_frame(nodes_win, selected=selected)
@@ -700,7 +702,7 @@ def draw_message_input(draft: str) -> None:
         used += text_width(content[start])
     visible = slice_to_width(content[start:], available)
     draw_text_field(entry_win, prompt + visible, get_color("input"))
-    paint_frame(entry_win, selected=ui_state.input_focused)
+    paint_frame(entry_win, selected=ui_state.input_focused, refresh=False)
     try:
         hint = " Ctrl+K Help "
         if width >= len(hint) + 4:
@@ -935,6 +937,28 @@ def handle_enter(input_text: str) -> str:
     return input_text
 
 
+def stage_node_details_background(stdscr, previous_window):
+    """Restore the panes behind a moved dialog without displaying an intermediate frame."""
+    current_window = ui_state.current_window
+    try:
+        ui_state.current_window = previous_window
+        stdscr.touchwin()
+        stdscr.noutrefresh()
+        windows = (channel_win, messages_win, nodes_win)
+        for index, win in enumerate(windows):
+            if ui_state.single_pane_mode and index != previous_window:
+                continue
+            win.touchwin()
+            refresh_pad(index, commit=False)
+        if ui_state.display_log and (not ui_state.single_pane_mode or previous_window == 1):
+            packetlog_win.touchwin()
+            packetlog_win.noutrefresh()
+        entry_win.touchwin()
+        entry_win.noutrefresh()
+    finally:
+        ui_state.current_window = current_window
+
+
 def handle_f5_key(stdscr: curses.window) -> None:
     if not ui_state.node_list:
         return
@@ -1032,6 +1056,7 @@ def handle_f5_key(stdscr: curses.window) -> None:
     ui_state.current_window = 4
     scroll_offset = 0
     dialog_win = None
+    previous_layout = None
 
     curses.curs_set(0)
     refresh_node_selection(highlight=True)
@@ -1051,11 +1076,15 @@ def handle_f5_key(stdscr: curses.window) -> None:
             max_scroll = max(0, len(message_lines) - viewport_h)
             scroll_offset = max(0, min(scroll_offset, max_scroll))
 
+            layout = (dialog_height, dialog_width, y, x, ui_state.selected_node, height, width)
+            if previous_layout is not None and layout != previous_layout:
+                stage_node_details_background(stdscr, previous_window)
+            previous_layout = layout
+
             if dialog_win is None:
                 dialog_win = curses.newwin(dialog_height, dialog_width, y, x)
             else:
                 dialog_win.erase()
-                dialog_win.refresh()
                 dialog_win.resize(dialog_height, dialog_width)
                 dialog_win.mvwin(y, x)
 
@@ -1100,7 +1129,7 @@ def handle_f5_key(stdscr: curses.window) -> None:
             except curses.error:
                 pass
 
-            dialog_win.refresh()
+            dialog_win.noutrefresh()
             msg_win.noutrefresh()
             curses.doupdate()
 
@@ -1120,12 +1149,12 @@ def handle_f5_key(stdscr: curses.window) -> None:
                 old_selected_node = ui_state.selected_node
                 ui_state.selected_node = (ui_state.selected_node - 1) % len(ui_state.node_list)
                 scroll_offset = 0
-                refresh_node_selection(old_selected_node, highlight=True)
+                refresh_node_selection(old_selected_node, highlight=True, refresh=False)
             elif char == curses.KEY_DOWN:
                 old_selected_node = ui_state.selected_node
                 ui_state.selected_node = (ui_state.selected_node + 1) % len(ui_state.node_list)
                 scroll_offset = 0
-                refresh_node_selection(old_selected_node, highlight=True)
+                refresh_node_selection(old_selected_node, highlight=True, refresh=False)
             elif char == curses.KEY_PPAGE:
                 scroll_offset = max(0, scroll_offset - viewport_h)
             elif char == curses.KEY_NPAGE:
@@ -1642,7 +1671,7 @@ def draw_messages_window(scroll_to_bottom: bool = False, preserve_selection: boo
             messages_pad.addstr(row, 1, line, color)
         ui_state.message_line_ranges[channel] = message_ranges
 
-    paint_frame(messages_win, selected=(ui_state.current_window == 1))
+    paint_frame(messages_win, selected=(ui_state.current_window == 1), refresh=False)
 
     visible_lines = get_msg_window_lines(messages_win, packetlog_win)
 
@@ -1657,7 +1686,6 @@ def draw_messages_window(scroll_to_bottom: bool = False, preserve_selection: boo
 
     refresh_message_highlight()
 
-    messages_win.refresh()
     refresh_pad(1)
     draw_packetlog_win()
     draw_window_arrows(1)
@@ -1987,7 +2015,7 @@ def search(win: int) -> None:
     entry_win.erase()
 
 
-def refresh_pad(window: int) -> None:
+def refresh_pad(window: int, commit: bool = True) -> None:
 
     # If in single-pane mode and this isn't the focused window, skip refreshing its (collapsed) pad
     if ui_state.single_pane_mode and window != ui_state.current_window:
@@ -2004,7 +2032,7 @@ def refresh_pad(window: int) -> None:
 
         if ui_state.display_log:
             packetlog_win.box()
-            packetlog_win.refresh()
+            packetlog_win.noutrefresh()
 
     elif window == 2:
         pad = nodes_pad
@@ -2047,9 +2075,12 @@ def refresh_pad(window: int) -> None:
         return
 
     draw_frame_title(box, get_window_title(window))
-    box.refresh()
+    box.noutrefresh()
 
-    pad.refresh(
+    # The frame overlaps the pad's viewport. Recompose even unchanged pad
+    # rows before committing, so its text cannot flash blank between draws.
+    pad.touchwin()
+    pad.noutrefresh(
         start_index,
         0,
         top,
@@ -2057,6 +2088,8 @@ def refresh_pad(window: int) -> None:
         bottom,
         right,
     )
+    if commit:
+        curses.doupdate()
 
 
 def add_notification(channel_number: int) -> None:

contact/ui/splash.py

@@ -1,8 +1,9 @@
 import curses
+import textwrap
 from contact.ui.colors import get_color
 
 
-def draw_splash(stdscr: object) -> None:
+def draw_splash(stdscr: object, status: str = "connecting...") -> None:
     """Draw the splash screen with a logo and connecting message."""
     curses.curs_set(0)
 
@@ -13,16 +14,20 @@ def draw_splash(stdscr: object) -> None:
     message_1 = "/ Λ"
     message_2 = "/ / \\"
     message_3 = "P W R D"
-    message_4 = "connecting..."
 
     start_x = width // 2 - len(message_1) // 2
-    start_x2 = width // 2 - len(message_4) // 2
     start_y = height // 2 - 1
     stdscr.addstr(start_y, start_x, message_1, get_color("splash_logo", bold=True))
     stdscr.addstr(start_y + 1, start_x - 1, message_2, get_color("splash_logo", bold=True))
     stdscr.addstr(start_y + 2, start_x - 2, message_3, get_color("splash_logo", bold=True))
-    stdscr.addstr(start_y + 4, start_x2, message_4, get_color("splash_text"))
-    stdscr.move(start_y + 5, start_x2)
+    status_lines = []
+    for line in status.splitlines():
+        status_lines.extend(textwrap.wrap(line, max(1, width - 4)) or [""])
+    for offset, line in enumerate(status_lines):
+        row = start_y + 4 + offset
+        if row >= height - 1:
+            break
+        stdscr.addstr(row, max(1, (width - len(line)) // 2), line, get_color("splash_text"))
 
     stdscr.attrset(get_color("window_frame"))
     stdscr.box()

contact/utilities/interfaces.py

@@ -1,4 +1,6 @@
 import logging
+import contextlib
+import io
 import time
 import meshtastic.serial_interface, meshtastic.tcp_interface, meshtastic.ble_interface
 
@@ -25,7 +27,7 @@ def interface_is_connected(interface) -> bool:
     return getattr(interface, "localNode", None) is not None
 
 
-def initialize_interface(args):
+def initialize_interface(args, status_callback=None):
     try:
 
         if args.ble:
@@ -43,7 +45,10 @@ def initialize_interface(args):
                 logging.error(f"Error connecting to {args.host}. {ex}")
         else:
             try:
-                client = meshtastic.serial_interface.SerialInterface(args.port)
+                # The library prints its fallback notice directly to stdout,
+                # which would overwrite the curses splash screen.
+                with contextlib.redirect_stdout(io.StringIO()):
+                    client = meshtastic.serial_interface.SerialInterface(args.port)
             except FileNotFoundError as ex:
                 logging.error(f"The serial device at '{args.port}' was not found. {ex}")
             except PermissionError as ex:
@@ -56,6 +61,8 @@ def initialize_interface(args):
                 logging.error(f"The serial device couldn't be opened, it might be in use by another process. {ex}")
             if client.devPath is None:
                 try:
+                    if status_callback:
+                        status_callback("No serial device found.\nConnecting via TCP to localhost…")
                     client = meshtastic.tcp_interface.TCPInterface("localhost")
                 except Exception as ex:
                     logging.error(f"Error connecting to localhost:{ex}")

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.6.7"
+version = "1.6.10"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}

tests/test_contact_ui.py

@@ -1,4 +1,5 @@
 import unittest
+from contextlib import ExitStack
 from types import SimpleNamespace
 from unittest import mock
 
@@ -11,6 +12,52 @@ from tests.test_support import reset_singletons, restore_config, snapshot_config
 
 
 class ContactUiTests(unittest.TestCase):
+    def test_f5_restores_background_when_switching_between_different_size_nodes(self):
+        ui_state.node_list = [101, 102]
+        ui_state.current_window = 2
+        interface = SimpleNamespace(nodesByNum={
+            101: {"user": {"shortName": "BIG", "longName": "A" * 60}, "position": {"altitude": 100}},
+            102: {"user": {"shortName": "SMALL", "longName": "B"}},
+        })
+        win = mock.Mock()
+        win.getch.side_effect = [contact_ui.curses.KEY_DOWN, contact_ui.curses.KEY_UP, 27]
+        events = mock.Mock()
+        events.attach_mock(win.noutrefresh, "dialog")
+        stdscr = mock.Mock()
+        with ExitStack() as stack:
+            stack.enter_context(mock.patch.object(contact_ui.interface_state, "interface", interface))
+            for name, value in (("LINES", 40), ("COLS", 100)):
+                stack.enter_context(mock.patch.object(contact_ui.curses, name, value, create=True))
+            for name in ("curs_set", "update_lines_cols", "doupdate"):
+                stack.enter_context(mock.patch.object(contact_ui.curses, name))
+            stack.enter_context(mock.patch.object(contact_ui.curses, "newwin", return_value=win))
+            for name in ("get_color", "refresh_node_selection", "handle_resize"):
+                stack.enter_context(mock.patch.object(contact_ui, name, return_value=0))
+            restore = stack.enter_context(mock.patch.object(contact_ui, "stage_node_details_background"))
+            events.attach_mock(restore, "restore")
+            contact_ui.handle_f5_key(stdscr)
+        self.assertEqual(events.mock_calls, [
+            mock.call.dialog(), mock.call.restore(stdscr, 2), mock.call.dialog(),
+            mock.call.restore(stdscr, 2), mock.call.dialog(),
+        ])
+        self.assertNotEqual(win.resize.call_args_list[0], win.resize.call_args_list[1])
+        self.assertEqual(win.refresh.call_count, 1)  # Only on close.
+
+    def test_background_restore_stages_panes_without_flushing(self):
+        ui_state.current_window = 4
+        ui_state.single_pane_mode = True
+        stdscr = mock.Mock()
+        with ExitStack() as stack:
+            for name in ("channel_win", "messages_win", "nodes_win", "entry_win"):
+                stack.enter_context(mock.patch.object(contact_ui, name, mock.Mock(), create=True))
+            refresh = stack.enter_context(mock.patch.object(contact_ui, "refresh_pad"))
+            update = stack.enter_context(mock.patch.object(contact_ui.curses, "doupdate"))
+            contact_ui.stage_node_details_background(stdscr, 2)
+        refresh.assert_called_once_with(2, commit=False)
+        update.assert_not_called()
+        stdscr.noutrefresh.assert_called_once()
+        self.assertEqual(ui_state.current_window, 4)
+
     def setUp(self) -> None:
         reset_singletons()
         self.saved_config = snapshot_config("single_pane_mode")
@@ -437,6 +484,8 @@ class ContactUiTests(unittest.TestCase):
         self.assertEqual(contact_ui.get_window_title(1), "Primary")
 
     def test_refresh_pad_draws_selected_channel_title_on_message_frame(self) -> None:
+        self.addCleanup(mock.patch.stopall)
+        mock.patch.object(contact_ui, "packetlog_win", mock.Mock(), create=True).start()
         ui_state.single_pane_mode = True
         ui_state.current_window = 1
         ui_state.channel_list = ["Primary"]
@@ -453,9 +502,16 @@ class ContactUiTests(unittest.TestCase):
         contact_ui.messages_win.getmaxyx.return_value = (10, 20)
 
         with mock.patch.object(contact_ui, "get_msg_window_lines", return_value=4):
-            contact_ui.refresh_pad(1)
+            with mock.patch.object(contact_ui.curses, "doupdate") as update:
+                contact_ui.refresh_pad(1)
 
         contact_ui.messages_win.addstr.assert_called_once_with(0, 2, " Primary ", contact_ui.curses.A_BOLD)
+        contact_ui.messages_win.refresh.assert_not_called()
+        contact_ui.messages_pad.refresh.assert_not_called()
+        contact_ui.messages_win.noutrefresh.assert_called_once()
+        contact_ui.messages_pad.touchwin.assert_called_once()
+        contact_ui.messages_pad.noutrefresh.assert_called_once()
+        update.assert_called_once()
 
     def test_search_ignores_no_input_from_curses(self) -> None:
         ui_state.node_list = [101]
@@ -508,6 +564,9 @@ class ContactUiTests(unittest.TestCase):
                                                 contact_ui.handle_f5_key(stdscr)
 
         self.assertEqual(dialog_win.getch.call_count, 2)
+        # Idle polling must never present an erased dialog before its text.
+        self.assertEqual(dialog_win.noutrefresh.call_count, 2)
+        self.assertEqual(dialog_win.refresh.call_count, 1)  # Closing the dialog only.
         handle_resize.assert_called_once_with(stdscr, False)
 
     def test_f5_node_details_tolerates_none_metrics(self) -> None: