Merge pull request #1522 from 7PH/master
#1521: VT100 escape codes DECSC and DECRC now handle character attributes
This commit is contained in:
@@ -12,18 +12,22 @@ describe('InputHandler', () => {
|
|||||||
const terminal = new MockInputHandlingTerminal();
|
const terminal = new MockInputHandlingTerminal();
|
||||||
terminal.buffer.x = 1;
|
terminal.buffer.x = 1;
|
||||||
terminal.buffer.y = 2;
|
terminal.buffer.y = 2;
|
||||||
|
terminal.curAttr = 3;
|
||||||
const inputHandler = new InputHandler(terminal);
|
const inputHandler = new InputHandler(terminal);
|
||||||
// Save cursor position
|
// Save cursor position
|
||||||
inputHandler.saveCursor([]);
|
inputHandler.saveCursor([]);
|
||||||
assert.equal(terminal.buffer.x, 1);
|
assert.equal(terminal.buffer.x, 1);
|
||||||
assert.equal(terminal.buffer.y, 2);
|
assert.equal(terminal.buffer.y, 2);
|
||||||
|
assert.equal(terminal.curAttr, 3);
|
||||||
// Change cursor position
|
// Change cursor position
|
||||||
terminal.buffer.x = 10;
|
terminal.buffer.x = 10;
|
||||||
terminal.buffer.y = 20;
|
terminal.buffer.y = 20;
|
||||||
|
terminal.curAttr = 30;
|
||||||
// Restore cursor position
|
// Restore cursor position
|
||||||
inputHandler.restoreCursor([]);
|
inputHandler.restoreCursor([]);
|
||||||
assert.equal(terminal.buffer.x, 1);
|
assert.equal(terminal.buffer.x, 1);
|
||||||
assert.equal(terminal.buffer.y, 2);
|
assert.equal(terminal.buffer.y, 2);
|
||||||
|
assert.equal(terminal.curAttr, 3);
|
||||||
});
|
});
|
||||||
describe('setCursorStyle', () => {
|
describe('setCursorStyle', () => {
|
||||||
it('should call Terminal.setOption with correct params', () => {
|
it('should call Terminal.setOption with correct params', () => {
|
||||||
|
|||||||
@@ -1823,6 +1823,7 @@ export class InputHandler implements IInputHandler {
|
|||||||
public saveCursor(params: number[]): void {
|
public saveCursor(params: number[]): void {
|
||||||
this._terminal.buffer.savedX = this._terminal.buffer.x;
|
this._terminal.buffer.savedX = this._terminal.buffer.x;
|
||||||
this._terminal.buffer.savedY = this._terminal.buffer.y;
|
this._terminal.buffer.savedY = this._terminal.buffer.y;
|
||||||
|
this._terminal.savedCurAttr = this._terminal.curAttr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1834,6 +1835,7 @@ export class InputHandler implements IInputHandler {
|
|||||||
public restoreCursor(params: number[]): void {
|
public restoreCursor(params: number[]): void {
|
||||||
this._terminal.buffer.x = this._terminal.buffer.savedX || 0;
|
this._terminal.buffer.x = this._terminal.buffer.savedX || 0;
|
||||||
this._terminal.buffer.y = this._terminal.buffer.savedY || 0;
|
this._terminal.buffer.y = this._terminal.buffer.savedY || 0;
|
||||||
|
this._terminal.curAttr = this._terminal.savedCurAttr || DEFAULT_ATTR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -173,6 +173,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
|
|||||||
public savedCols: number;
|
public savedCols: number;
|
||||||
|
|
||||||
public curAttr: number;
|
public curAttr: number;
|
||||||
|
public savedCurAttr: number;
|
||||||
|
|
||||||
public params: (string | number)[];
|
public params: (string | number)[];
|
||||||
public currentParam: string | number;
|
public currentParam: string | number;
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
|
|||||||
wraparoundMode: boolean;
|
wraparoundMode: boolean;
|
||||||
bracketedPasteMode: boolean;
|
bracketedPasteMode: boolean;
|
||||||
curAttr: number;
|
curAttr: number;
|
||||||
|
savedCurAttr: number;
|
||||||
savedCols: number;
|
savedCols: number;
|
||||||
x10Mouse: boolean;
|
x10Mouse: boolean;
|
||||||
vt200Mouse: boolean;
|
vt200Mouse: boolean;
|
||||||
|
|||||||
Reference in New Issue
Block a user