sermo 0.3.0__tar.gz → 0.3.2__tar.gz

{sermo-0.3.0 → sermo-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sermo
-Version: 0.3.0
+Version: 0.3.2
 Summary: Command-line Sermo client
 Author: Sermo
 Project-URL: Homepage, https://sermo.jyonn.space
@@ -104,7 +104,7 @@ sermo tui
 - 直接输入文字，按 `Enter` 发送。
 - `F5` 手动刷新。
 - `Ctrl+U` 清空输入。
-- `Ctrl+Q` 退出。
+- `Esc` 或 `F10` 退出；输入框为空时也可以按 `q` 退出。
 
 打开聊天：
 

{sermo-0.3.0 → sermo-0.3.2}/README.md

@@ -84,7 +84,7 @@ sermo tui
 - 直接输入文字，按 `Enter` 发送。
 - `F5` 手动刷新。
 - `Ctrl+U` 清空输入。
-- `Ctrl+Q` 退出。
+- `Esc` 或 `F10` 退出；输入框为空时也可以按 `q` 退出。
 
 打开聊天：
 

{sermo-0.3.0 → sermo-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sermo"
-version = "0.3.0"
+version = "0.3.2"
 description = "Command-line Sermo client"
 readme = "README.md"
 requires-python = ">=3.10"

{sermo-0.3.0 → sermo-0.3.2}/sermo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sermo
-Version: 0.3.0
+Version: 0.3.2
 Summary: Command-line Sermo client
 Author: Sermo
 Project-URL: Homepage, https://sermo.jyonn.space
@@ -104,7 +104,7 @@ sermo tui
 - 直接输入文字，按 `Enter` 发送。
 - `F5` 手动刷新。
 - `Ctrl+U` 清空输入。
-- `Ctrl+Q` 退出。
+- `Esc` 或 `F10` 退出；输入框为空时也可以按 `q` 退出。
 
 打开聊天：
 

{sermo-0.3.0 → sermo-0.3.2}/sermo_cli/tui.py

@@ -1,14 +1,65 @@
 from __future__ import annotations
 
 import curses
-import textwrap
 import time
+import unicodedata
 from typing import Any
 
 from .api import ApiClient, SermoApiError
 from .formatting import chat_title, format_time, message_text, user_name
 
 
+def cell_width(char: str) -> int:
+    if not char:
+        return 0
+    if unicodedata.combining(char):
+        return 0
+    if unicodedata.east_asian_width(char) in {"F", "W"}:
+        return 2
+    return 1
+
+
+def display_width(text: str) -> int:
+    return sum(cell_width(char) for char in str(text))
+
+
+def clip_display(text: str, max_width: int) -> str:
+    if max_width <= 0:
+        return ""
+    used = 0
+    result: list[str] = []
+    for char in str(text).replace("\n", " "):
+        width = cell_width(char)
+        if used + width > max_width:
+            break
+        result.append(char)
+        used += width
+    return "".join(result)
+
+
+def pad_display(text: str, width: int) -> str:
+    clipped = clip_display(text, width)
+    return clipped + " " * max(0, width - display_width(clipped))
+
+
+def wrap_display(text: str, width: int) -> list[str]:
+    if width <= 0:
+        return [""]
+    lines: list[str] = []
+    current: list[str] = []
+    used = 0
+    for char in str(text).replace("\n", " "):
+        char_width = cell_width(char)
+        if used + char_width > width and current:
+            lines.append("".join(current))
+            current = []
+            used = 0
+        current.append(char)
+        used += char_width
+    lines.append("".join(current))
+    return lines or [""]
+
+
 class SermoTui:
     def __init__(self, client: ApiClient, *, refresh_interval: float = 5.0, limit: int = 40):
         self.client = client
@@ -170,7 +221,10 @@ class SermoTui:
         except curses.error:
             return
 
-        if key in ("\x11", "\x03"):
+        if key in ("\x03", "\x1b", curses.KEY_F10):
+            self.running = False
+            return
+        if key in ("q", "Q") and not self.input_line:
             self.running = False
             return
         if key == curses.KEY_F5:
@@ -210,15 +264,15 @@ class SermoTui:
 
         title = f"Sermo TUI · {self.space.get('name') or 'Sermo'} @{self.space.get('slug') or '-'}"
         self._add(stdscr, 0, 0, title, curses.A_BOLD | curses.color_pair(1), width)
-        self._add(stdscr, 0, max(0, width - len(self.status) - 1), self.status, curses.color_pair(5), width)
+        self._add(stdscr, 0, max(0, width - display_width(self.status) - 1), self.status, curses.color_pair(5), width)
         self._draw_separator(stdscr, 1, width)
         self._draw_chats(stdscr, 2, left_width, content_height)
         self._draw_vertical_separator(stdscr, 2, left_width, height - 3)
         self._draw_messages(stdscr, 2, main_x, width - main_x, content_height)
         self._draw_input(stdscr, input_y, main_x, width - main_x)
-        help_text = "↑/↓ 切换会话 · Enter 发送 · F5 刷新 · Ctrl+U 清空输入 · Ctrl+Q 退出"
+        help_text = "↑/↓ 切换会话 · Enter 发送 · F5 刷新 · Ctrl+U 清空 · Esc/F10 退出 · 空输入 q 退出"
         self._add(stdscr, help_y, 0, help_text, curses.A_DIM, width)
-        stdscr.move(input_y, min(width - 1, main_x + 2 + len(self.input_line)))
+        stdscr.move(input_y, min(width - 1, main_x + 2 + display_width(self.input_line)))
         stdscr.refresh()
 
     def _draw_chats(self, stdscr: Any, top: int, width: int, height: int) -> None:
@@ -271,10 +325,11 @@ class SermoTui:
             text = message_text(message)
             prefix = f"{format_time(message.get('created_at'))} {author}: "
             attrs = curses.color_pair(2) if is_self else curses.A_NORMAL
-            wrapped = textwrap.wrap(text, width=max(8, wrap_width - len(prefix))) or [""]
+            prefix_width = display_width(prefix)
+            wrapped = wrap_display(text, width=max(8, wrap_width - prefix_width))
             lines.append((prefix + wrapped[0], attrs))
             for extra in wrapped[1:]:
-                lines.append((" " * min(len(prefix), wrap_width - 1) + extra, attrs))
+                lines.append((" " * min(prefix_width, wrap_width - 1) + extra, attrs))
         return lines
 
     def _draw_input(self, stdscr: Any, y: int, x: int, width: int) -> None:
@@ -299,9 +354,9 @@ class SermoTui:
         max_width = max(0, min(width or max_x - x, max_x - x))
         if max_width <= 0:
             return
-        safe = str(text).replace("\n", " ")[:max_width]
+        safe = pad_display(str(text), max_width)
         try:
-            stdscr.addstr(y, x, safe.ljust(max_width), attrs)
+            stdscr.addstr(y, x, safe, attrs)
         except curses.error:
             pass