fix: 方向键菜单重绘差一行导致提示行不断累积
根因:重绘帧末尾缺换行,光标停在提示行行尾,而下一帧上移行数按 "已换行"语义计算,多退一行 → 每按一次方向键整体上移一行、旧行残留。 修复:统一光标语义为"块下一行行首"(帧尾补 \n),确认/取消清除行数同步校正; 顺带支持 j/k 移动与 raw 模式下 Ctrl+C 取消。 字节流不变量测试 + 真实终端连按 7 次方向键验证无残留。
This commit is contained in:
@@ -183,29 +183,29 @@ def _select_keys(title: str, options: list, default: int, cancel: bool):
|
||||
if k is _OTHER or k is None:
|
||||
sys.stdout.write(f"\x1b[{drawn}A\r" if _use_color() else "")
|
||||
return _select_numbered(" (此终端不支持方向键,请输入编号)", options, cur)
|
||||
if k == _UP:
|
||||
if k == _UP or k == "k":
|
||||
cur = (cur - 1) % len(options)
|
||||
elif k == _DOWN:
|
||||
elif k == _DOWN or k == "j":
|
||||
cur = (cur + 1) % len(options)
|
||||
elif k == _ENTER:
|
||||
# 定格所选,清掉菜单只留一行
|
||||
sys.stdout.write(f"\x1b[{drawn + 1}A\r\x1b[J")
|
||||
# 定格所选,清掉整个菜单块(选项+提示),只留一行
|
||||
sys.stdout.write(f"\x1b[{drawn}A\r\x1b[J")
|
||||
print(f" {ok('❯')} {bold(options[cur])}")
|
||||
return cur
|
||||
elif k in (_ESC, "q", "Q"):
|
||||
sys.stdout.write(f"\x1b[{drawn + 1}A\r\x1b[J")
|
||||
elif k in (_ESC, "q", "Q", "\x03"):
|
||||
sys.stdout.write(f"\x1b[{drawn}A\r\x1b[J")
|
||||
print(f" {faint('已取消')}")
|
||||
return None
|
||||
elif isinstance(k, str) and k.isdigit() and 1 <= int(k) <= len(options):
|
||||
cur = int(k) - 1
|
||||
sys.stdout.write(f"\x1b[{drawn + 1}A\r\x1b[J")
|
||||
sys.stdout.write(f"\x1b[{drawn}A\r\x1b[J")
|
||||
print(f" {ok('❯')} {bold(options[cur])}")
|
||||
return cur
|
||||
# 重绘选项+提示
|
||||
# 重绘选项+提示;帧尾补换行,保证下一帧的上移行数与之一致
|
||||
out = [f"\x1b[{drawn}A\r"]
|
||||
for ln in _paint(cur):
|
||||
out.append(ln + "\x1b[K\n")
|
||||
out.append(hint + "\x1b[K")
|
||||
out.append(hint + "\x1b[K\n")
|
||||
sys.stdout.write("".join(out))
|
||||
sys.stdout.flush()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user