Enhance UI color handling for channel and node rows, and refactor refresh logic

Add emoji normalization utility and integrate into message rendering

contact/ui/contact_ui.py

@@ -12,6 +12,7 @@ from contact.ui.colors import get_color
 from contact.utilities.db_handler import get_name_from_database, update_node_info_in_db, is_chat_archived
 from contact.utilities.input_handlers import get_list_input
 from contact.utilities.i18n import t
+from contact.utilities.emoji_utils import normalize_message_text
 import contact.ui.default_config as config
 import contact.ui.dialog
 from contact.ui.nav_utils import move_main_highlight, draw_main_arrows, get_msg_window_lines, wrap_text
@@ -21,6 +22,7 @@ from contact.utilities.singleton import ui_state, interface_state, menu_state
 MIN_COL = 1  # "effectively zero" without breaking curses
 RESIZE_DEBOUNCE_MS = 250
 root_win = None
+nodes_pad = None
 
 
 # Draw arrows for a specific window id (0=channel,1=messages,2=nodes).
@@ -63,6 +65,48 @@ def paint_frame(win, selected: bool) -> None:
     win.refresh()
 
 
+def get_channel_row_color(index: int) -> int:
+    if index == ui_state.selected_channel:
+        if ui_state.current_window == 0:
+            return get_color("channel_list", reverse=True)
+        return get_color("channel_selected")
+    return get_color("channel_list")
+
+
+def get_node_row_color(index: int) -> int:
+    node_num = ui_state.node_list[index]
+    node = interface_state.interface.nodesByNum.get(node_num, {})
+    color = "node_list"
+    if node.get("isFavorite"):
+        color = "node_favorite"
+    if node.get("isIgnored"):
+        color = "node_ignored"
+    return get_color(color, reverse=index == ui_state.selected_node and ui_state.current_window == 2)
+
+
+def refresh_main_window(window_id: int, selected: bool) -> None:
+    if window_id == 0:
+        paint_frame(channel_win, selected=selected)
+        if ui_state.channel_list:
+            width = max(0, channel_pad.getmaxyx()[1] - 4)
+            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)
+        refresh_pad(1)
+    elif window_id == 2:
+        paint_frame(nodes_win, selected=selected)
+        if ui_state.node_list and nodes_pad is not None:
+            width = max(0, nodes_pad.getmaxyx()[1] - 4)
+            nodes_pad.chgat(ui_state.selected_node, 1, width, get_node_row_color(ui_state.selected_node))
+        refresh_pad(2)
+
+
+def get_node_display_name(node_num: int, node: dict) -> str:
+    user = node.get("user") or {}
+    return user.get("longName") or get_name_from_database(node_num, "long")
+
+
 def handle_resize(stdscr: curses.window, firstrun: bool) -> None:
     """Handle terminal resize events and redraw the UI accordingly."""
     global messages_pad, messages_win, nodes_pad, nodes_win, channel_pad, channel_win, packetlog_win, entry_win
@@ -359,31 +403,16 @@ def handle_leftright(char: int) -> None:
     delta = -1 if char == curses.KEY_LEFT else 1
     old_window = ui_state.current_window
     ui_state.current_window = (ui_state.current_window + delta) % 3
-    handle_resize(root_win, False)
+    if ui_state.single_pane_mode:
+        handle_resize(root_win, False)
+        return
 
-    if old_window == 0:
-        paint_frame(channel_win, selected=False)
-        refresh_pad(0)
-    if old_window == 1:
-        paint_frame(messages_win, selected=False)
-        refresh_pad(1)
-    elif old_window == 2:
-        paint_frame(nodes_win, selected=False)
-        refresh_pad(2)
+    refresh_main_window(old_window, selected=False)
 
     if not ui_state.single_pane_mode:
         draw_window_arrows(old_window)
 
-    if ui_state.current_window == 0:
-        paint_frame(channel_win, selected=True)
-        refresh_pad(0)
-    elif ui_state.current_window == 1:
-        paint_frame(messages_win, selected=True)
-        refresh_pad(1)
-    elif ui_state.current_window == 2:
-        paint_frame(nodes_win, selected=True)
-        refresh_pad(2)
-
+    refresh_main_window(ui_state.current_window, selected=True)
     draw_window_arrows(ui_state.current_window)
 
 
@@ -404,31 +433,16 @@ def handle_function_keys(char: int) -> None:
         return
 
     ui_state.current_window = target
-    handle_resize(root_win, False)
+    if ui_state.single_pane_mode:
+        handle_resize(root_win, False)
+        return
 
-    if old_window == 0:
-        paint_frame(channel_win, selected=False)
-        refresh_pad(0)
-    elif old_window == 1:
-        paint_frame(messages_win, selected=False)
-        refresh_pad(1)
-    elif old_window == 2:
-        paint_frame(nodes_win, selected=False)
-        refresh_pad(2)
+    refresh_main_window(old_window, selected=False)
 
     if not ui_state.single_pane_mode:
         draw_window_arrows(old_window)
 
-    if ui_state.current_window == 0:
-        paint_frame(channel_win, selected=True)
-        refresh_pad(0)
-    elif ui_state.current_window == 1:
-        paint_frame(messages_win, selected=True)
-        refresh_pad(1)
-    elif ui_state.current_window == 2:
-        paint_frame(nodes_win, selected=True)
-        refresh_pad(2)
-
+    refresh_main_window(ui_state.current_window, selected=True)
     draw_window_arrows(ui_state.current_window)
 
 
@@ -865,7 +879,7 @@ def draw_messages_window(scroll_to_bottom: bool = False) -> None:
 
         row = 0
         for prefix, message in messages:
-            full_message = f"{prefix}{message}"
+            full_message = normalize_message_text(f"{prefix}{message}")
             wrapped_lines = wrap_text(full_message, messages_win.getmaxyx()[1] - 2)
             msg_line_count += len(wrapped_lines)
             messages_pad.resize(msg_line_count, messages_win.getmaxyx()[1])
@@ -907,10 +921,8 @@ def draw_node_list() -> None:
     if ui_state.current_window != 2 and ui_state.single_pane_mode:
         return
 
-    # This didn't work, for some reason an error is thown on startup, so we just create the pad every time
-    # if nodes_pad is None:
-    # nodes_pad = curses.newpad(1, 1)
-    nodes_pad = curses.newpad(1, 1)
+    if nodes_pad is None:
+        nodes_pad = curses.newpad(1, 1)
 
     try:
         nodes_pad.erase()
@@ -924,28 +936,12 @@ def draw_node_list() -> None:
         node = interface_state.interface.nodesByNum[node_num]
         secure = "user" in node and "publicKey" in node["user"] and node["user"]["publicKey"]
         status_icon = "🔐" if secure else "🔓"
-        node_name = get_name_from_database(node_num, "long")
-        user_name = node["user"]["shortName"]
-
-        uptime_str = ""
-        if "deviceMetrics" in node and "uptimeSeconds" in node["deviceMetrics"]:
-            uptime_str = f" / Up: {get_readable_duration(node['deviceMetrics']['uptimeSeconds'])}"
-
-        last_heard_str = f"  ■  {get_time_ago(node['lastHeard'])}" if node.get("lastHeard") else ""
-        hops_str = f"  ■  Hops: {node['hopsAway']}" if "hopsAway" in node else ""
-        snr_str = f"  ■  SNR: {node['snr']}dB" if node.get("hopsAway") == 0 and "snr" in node else ""
+        node_name = get_node_display_name(node_num, node)
 
         # Future node name custom formatting possible
         node_str = f"{status_icon} {node_name}"
         node_str = node_str.ljust(box_width - 4)[: box_width - 2]
-        color = "node_list"
-        if "isFavorite" in node and node["isFavorite"]:
-            color = "node_favorite"
-        if "isIgnored" in node and node["isIgnored"]:
-            color = "node_ignored"
-        nodes_pad.addstr(
-            i, 1, node_str, get_color(color, reverse=ui_state.selected_node == i and ui_state.current_window == 2)
-        )
+        nodes_pad.addstr(i, 1, node_str, get_node_row_color(i))
 
     paint_frame(nodes_win, selected=(ui_state.current_window == 2))
     nodes_win.refresh()

contact/utilities/emoji_utils.py

@@ -0,0 +1,54 @@
+"""Helpers for normalizing emoji sequences in width-sensitive message rendering."""
+
+# Strip zero-width and presentation modifiers that make terminal cell width inconsistent.
+EMOJI_MODIFIER_REPLACEMENTS = {
+    "\u200d": "",
+    "\u20e3": "",
+    "\ufe0e": "",
+    "\ufe0f": "",
+    "\U0001F3FB": "",
+    "\U0001F3FC": "",
+    "\U0001F3FD": "",
+    "\U0001F3FE": "",
+    "\U0001F3FF": "",
+}
+
+_EMOJI_MODIFIER_TRANSLATION = str.maketrans(EMOJI_MODIFIER_REPLACEMENTS)
+_REGIONAL_INDICATOR_START = ord("\U0001F1E6")
+_REGIONAL_INDICATOR_END = ord("\U0001F1FF")
+
+
+def _regional_indicator_to_letter(char: str) -> str:
+    return chr(ord("A") + ord(char) - _REGIONAL_INDICATOR_START)
+
+
+def _normalize_flag_emoji(text: str) -> str:
+    """Convert flag emoji built from regional indicators into ASCII country codes."""
+    normalized = []
+    index = 0
+
+    while index < len(text):
+        current = text[index]
+        current_ord = ord(current)
+
+        if _REGIONAL_INDICATOR_START <= current_ord <= _REGIONAL_INDICATOR_END and index + 1 < len(text):
+            next_char = text[index + 1]
+            next_ord = ord(next_char)
+            if _REGIONAL_INDICATOR_START <= next_ord <= _REGIONAL_INDICATOR_END:
+                normalized.append(_regional_indicator_to_letter(current))
+                normalized.append(_regional_indicator_to_letter(next_char))
+                index += 2
+                continue
+
+        normalized.append(current)
+        index += 1
+
+    return "".join(normalized)
+
+
+def normalize_message_text(text: str) -> str:
+    """Strip modifiers and rewrite flag emoji into stable terminal-friendly text."""
+    if not text:
+        return text
+
+    return _normalize_flag_emoji(text.translate(_EMOJI_MODIFIER_TRANSLATION))

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.4.18"
+version = "1.4.22"
 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"}