Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
467eb5a227 | ||
|
|
a8632435a6 | ||
|
|
a0919b9004 | ||
|
|
b5e0cdb20c |
@@ -431,8 +431,8 @@ export class ImageStorage implements IDisposable {
|
|||||||
// because text writes clear the BG flag but leave image tile data intact.
|
// because text writes clear the BG flag but leave image tile data intact.
|
||||||
// This lets top-layer images survive text overwrites (kitty C=1 behavior).
|
// This lets top-layer images survive text overwrites (kitty C=1 behavior).
|
||||||
for (let row = start; row <= end; ++row) {
|
for (let row = start; row <= end; ++row) {
|
||||||
const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt;
|
const line = buffer.lines.get(row + buffer.ydisp) as IBufferLineExt | undefined;
|
||||||
if (!line) return;
|
if (!line) continue;
|
||||||
for (let col = 0; col < cols; ++col) {
|
for (let col = 0; col < cols; ++col) {
|
||||||
let e: IExtendedAttrsImage;
|
let e: IExtendedAttrsImage;
|
||||||
if (line.getBg(col) & BgFlags.HAS_EXTENDED) {
|
if (line.getBg(col) & BgFlags.HAS_EXTENDED) {
|
||||||
@@ -513,7 +513,10 @@ export class ImageStorage implements IDisposable {
|
|||||||
const rows = buffer.lines.length;
|
const rows = buffer.lines.length;
|
||||||
const oldCol = this._viewportMetrics.cols - 1;
|
const oldCol = this._viewportMetrics.cols - 1;
|
||||||
for (let row = 0; row < rows; ++row) {
|
for (let row = 0; row < rows; ++row) {
|
||||||
const line = buffer.lines.get(row) as IBufferLineExt;
|
const line = buffer.lines.get(row) as IBufferLineExt | undefined;
|
||||||
|
if (!line) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {
|
if (line.getBg(oldCol) & BgFlags.HAS_EXTENDED) {
|
||||||
const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;
|
const e: IExtendedAttrsImage = line._extendedAttrs[oldCol] ?? EMPTY_ATTRS;
|
||||||
const imageId = e.imageId;
|
const imageId = e.imageId;
|
||||||
@@ -531,7 +534,7 @@ export class ImageStorage implements IDisposable {
|
|||||||
}
|
}
|
||||||
// expand only if right side is empty (nothing got wrapped from below)
|
// expand only if right side is empty (nothing got wrapped from below)
|
||||||
let hasData = false;
|
let hasData = false;
|
||||||
for (let rightCol = oldCol + 1; rightCol > metrics.cols; ++rightCol) {
|
for (let rightCol = oldCol + 1; rightCol < metrics.cols; ++rightCol) {
|
||||||
if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {
|
if (line._data[rightCol * Cell.SIZE + Cell.CONTENT] & Content.HAS_CONTENT_MASK) {
|
||||||
hasData = true;
|
hasData = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -475,13 +475,6 @@ describe('InputHandler', () => {
|
|||||||
inputHandler.eraseInLine(Params.fromArray([1]));
|
inputHandler.eraseInLine(Params.fromArray([1]));
|
||||||
assert.equal(bufferService.buffer.lines.get(2)!.isWrapped, true);
|
assert.equal(bufferService.buffer.lines.get(2)!.isWrapped, true);
|
||||||
|
|
||||||
// params[1] - full line erase at last column clears wrap on next line
|
|
||||||
await resetToBaseState();
|
|
||||||
bufferService.buffer.y = 1;
|
|
||||||
bufferService.buffer.x = bufferService.cols - 1;
|
|
||||||
inputHandler.eraseInLine(Params.fromArray([1]));
|
|
||||||
assert.equal(bufferService.buffer.lines.get(2)!.isWrapped, false);
|
|
||||||
|
|
||||||
// params[2] - erase complete line
|
// params[2] - erase complete line
|
||||||
await resetToBaseState();
|
await resetToBaseState();
|
||||||
bufferService.buffer.y = 2;
|
bufferService.buffer.y = 2;
|
||||||
|
|||||||
@@ -1202,21 +1202,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Scroll-margin column operations clear isWrapped on lines inside the margins.
|
|
||||||
* Also clear the line below the bottom margin when it still continues a wrap chain.
|
|
||||||
*/
|
|
||||||
private _clearWrapBelowScrollMargins(): void {
|
|
||||||
const rowBelowMargin = this._activeBuffer.scrollBottom + 1;
|
|
||||||
if (rowBelowMargin >= this._bufferService.rows) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const lineBelow = this._activeBuffer.lines.get(this._activeBuffer.ybase + rowBelowMargin);
|
|
||||||
if (lineBelow) {
|
|
||||||
lineBelow.isWrapped = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CSI Ps J Erase in Display (ED).
|
* CSI Ps J Erase in Display (ED).
|
||||||
* Ps = 0 -> Erase Below (default).
|
* Ps = 0 -> Erase Below (default).
|
||||||
@@ -1261,7 +1246,7 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
this._eraseInBufferLine(j, 0, this._activeBuffer.x + 1, true, respectProtect);
|
this._eraseInBufferLine(j, 0, this._activeBuffer.x + 1, true, respectProtect);
|
||||||
if (this._activeBuffer.x + 1 >= this._bufferService.cols) {
|
if (this._activeBuffer.x + 1 >= this._bufferService.cols) {
|
||||||
// Deleted entire previous line. This next line can no longer be wrapped.
|
// Deleted entire previous line. This next line can no longer be wrapped.
|
||||||
const nextLine = this._activeBuffer.lines.get(this._activeBuffer.ybase + j + 1);
|
const nextLine = this._activeBuffer.lines.get(j + 1);
|
||||||
if (nextLine) {
|
if (nextLine) {
|
||||||
nextLine.isWrapped = false;
|
nextLine.isWrapped = false;
|
||||||
}
|
}
|
||||||
@@ -1339,12 +1324,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
this._eraseInBufferLine(this._activeBuffer.y, 0, this._activeBuffer.x + 1, false, respectProtect);
|
this._eraseInBufferLine(this._activeBuffer.y, 0, this._activeBuffer.x + 1, false, respectProtect);
|
||||||
if (this._activeBuffer.x + 1 >= this._bufferService.cols) {
|
|
||||||
const nextLine = this._activeBuffer.lines.get(this._activeBuffer.ybase + this._activeBuffer.y + 1);
|
|
||||||
if (nextLine) {
|
|
||||||
nextLine.isWrapped = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
this._eraseInBufferLine(this._activeBuffer.y, 0, this._bufferService.cols, true, respectProtect);
|
this._eraseInBufferLine(this._activeBuffer.y, 0, this._bufferService.cols, true, respectProtect);
|
||||||
@@ -1536,7 +1515,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
line.deleteCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
line.deleteCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
||||||
line.isWrapped = false;
|
line.isWrapped = false;
|
||||||
}
|
}
|
||||||
this._clearWrapBelowScrollMargins();
|
|
||||||
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1570,7 +1548,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
line.insertCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
line.insertCells(0, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
||||||
line.isWrapped = false;
|
line.isWrapped = false;
|
||||||
}
|
}
|
||||||
this._clearWrapBelowScrollMargins();
|
|
||||||
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1594,7 +1571,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
line.insertCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
line.insertCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
||||||
line.isWrapped = false;
|
line.isWrapped = false;
|
||||||
}
|
}
|
||||||
this._clearWrapBelowScrollMargins();
|
|
||||||
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1618,7 +1594,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
line.deleteCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
line.deleteCells(this._activeBuffer.x, param, this._activeBuffer.getNullCell(this._eraseAttrData()));
|
||||||
line.isWrapped = false;
|
line.isWrapped = false;
|
||||||
}
|
}
|
||||||
this._clearWrapBelowScrollMargins();
|
|
||||||
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
this._dirtyRowTracker.markRangeDirty(this._activeBuffer.scrollTop, this._activeBuffer.scrollBottom);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user