waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix resize edge cases: always report cleanup state

Browse Source
This commit is contained in:
Jörg Breitbart
2022-09-28 12:14:09 +02:00
parent e87f70d6d6
commit 20c1f1a5f7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Types.d.ts
Vendored
+1 -1
View File
@@ -205,7 +205,7 @@ export interface IBufferLine {
insertCells(pos: number, n: number, ch: ICellData, eraseAttr?: IAttributeData): void;
deleteCells(pos: number, n: number, fill: ICellData, eraseAttr?: IAttributeData): void;
replaceCells(start: number, end: number, fill: ICellData, eraseAttr?: IAttributeData, respectProtect?: boolean): void;
resize(cols: number, fill: ICellData): void;
resize(cols: number, fill: ICellData): boolean;
fill(fillCellData: ICellData, respectProtect?: boolean): void;
copyFrom(line: IBufferLine): void;
clone(): IBufferLine;
src/common/buffer/BufferLine.ts
+9 -4
View File
@@ -338,10 +338,16 @@ export class BufferLine implements IBufferLine {
}
}
/**
* Resize BufferLine to `cols` filling excess cells with `fillCellData`.
* The underlying array buffer will not change if there is still enough space
* to hold the new buffer line data.
* Returns a boolean indicating, whether a `cleanBuffer` call would free
* excess memory (after shrinking > CLEANUP_THRESHOLD).
*/
public resize(cols: number, fillCellData: ICellData): boolean {
let needsCleanup = false;
if (cols === this.length) {
return needsCleanup;
return this._data.length * 4 < this._data.buffer.byteLength * CLEANUP_THRESHOLD;
}
const fourByteCells = cols * CELL_SIZE;
if (cols > this.length) {
@@ -362,7 +368,6 @@ export class BufferLine implements IBufferLine {
} else {
// optimization: just shrink the view on existing buffer
this._data = this._data.subarray(0, fourByteCells);
needsCleanup = fourByteCells * 4 < this._data.buffer.byteLength * CLEANUP_THRESHOLD;
// Remove any cut off combined data
const keys = Object.keys(this._combined);
for (let i = 0; i < keys.length; i++) {
@@ -381,7 +386,7 @@ export class BufferLine implements IBufferLine {
}
}
this.length = cols;
return needsCleanup;
return fourByteCells * 4 < this._data.buffer.byteLength * CLEANUP_THRESHOLD;
}
/**