mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 20:11:08 +00:00
* fixd:issure #622 * fix: use baseY instead of viewportY for active screen row count When the user scrolls up to browse history, viewportY differs from baseY (the active screen origin). _core.scroll always operates on the active screen, so counting rows from viewportY preserves the wrong number of lines and may evict older scrollback unexpectedly. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use term.clear() for local clear to preserve prompt line The escape sequence \x1b[H\x1b[2J erases the entire display including the current prompt/input line, which is a regression from term.clear() that keeps the prompt as the first visible line. Remote CSI 2 J is already handled separately by the CSI parser handler. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve both scrollback and prompt in local clear term.clear() destroys scrollback (truncates buffer lines). The escape sequence approach erases the prompt. This commit uses _core.scroll to push lines above cursor into scrollback, then clears below the prompt with CSI 0 J and repositions the cursor — preserving both history and the current prompt line. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: panwk <panwk@88.com> Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
86 lines
2.3 KiB
TypeScript
86 lines
2.3 KiB
TypeScript
import type { Terminal as XTerm } from "@xterm/xterm";
|
|
|
|
type CsiParam = number | number[];
|
|
type InternalTerminal = XTerm & {
|
|
_core?: {
|
|
scroll?: (eraseAttr: unknown, isWrapped?: boolean) => void;
|
|
_inputHandler?: {
|
|
_eraseAttrData?: () => unknown;
|
|
};
|
|
};
|
|
};
|
|
|
|
const getVisibleContentRowCount = (term: XTerm): number => {
|
|
const buffer = term.buffer.active;
|
|
if (buffer.type !== "normal") {
|
|
return 0;
|
|
}
|
|
|
|
const baseY = buffer.baseY;
|
|
for (let row = term.rows - 1; row >= 0; row--) {
|
|
const line = buffer.getLine(baseY + row);
|
|
if (!line) {
|
|
continue;
|
|
}
|
|
if (line.translateToString(true).length > 0) {
|
|
return row + 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
};
|
|
|
|
export const preserveTerminalViewportInScrollback = (term: XTerm): void => {
|
|
const rowsToPreserve = getVisibleContentRowCount(term);
|
|
if (rowsToPreserve <= 0) {
|
|
return;
|
|
}
|
|
|
|
const internal = term as InternalTerminal;
|
|
const scroll = internal._core?.scroll;
|
|
const eraseAttr = internal._core?._inputHandler?._eraseAttrData?.();
|
|
|
|
if (typeof scroll !== "function" || eraseAttr === undefined) {
|
|
return;
|
|
}
|
|
|
|
for (let row = 0; row < rowsToPreserve; row++) {
|
|
scroll.call(internal._core, eraseAttr, false);
|
|
}
|
|
};
|
|
|
|
export const clearTerminalViewport = (term: XTerm): void => {
|
|
const buffer = term.buffer.active;
|
|
if (buffer.type !== "normal") return;
|
|
|
|
const cursorY = buffer.cursorY;
|
|
const cursorX = buffer.cursorX;
|
|
|
|
if (cursorY === 0 && buffer.baseY === 0) return;
|
|
|
|
const internal = term as InternalTerminal;
|
|
const scroll = internal._core?.scroll;
|
|
const eraseAttr = internal._core?._inputHandler?._eraseAttrData?.();
|
|
|
|
if (typeof scroll !== "function" || eraseAttr === undefined) return;
|
|
|
|
// Push lines above cursor into scrollback so they are preserved.
|
|
// After cursorY scrolls the prompt line shifts to active-screen row 0.
|
|
for (let i = 0; i < cursorY; i++) {
|
|
scroll.call(internal._core, eraseAttr, false);
|
|
}
|
|
|
|
// Clear everything below the prompt and reposition the cursor on it.
|
|
// CSI coordinates are 1-indexed.
|
|
const col = cursorX + 1;
|
|
term.write(`\x1b[2;1H\x1b[J\x1b[1;${col}H`, () => {
|
|
term.scrollToBottom();
|
|
});
|
|
};
|
|
|
|
export const isEraseScrollbackSequence = (params: CsiParam[]): boolean =>
|
|
params.length > 0 && params[0] === 3;
|
|
|
|
export const isEraseViewportSequence = (params: CsiParam[]): boolean =>
|
|
params.length > 0 && params[0] === 2;
|