From 8dcb4698d364557e9333d2f4d410d5c2b6e0e877 Mon Sep 17 00:00:00 2001 From: Benjamin Raymond Date: Wed, 20 Jun 2018 13:57:42 +0200 Subject: [PATCH 1/6] #1521: now saving and restoring characters attributes when using ANSI escape sequences 'ESC 7' (DECSC) and 'ESC 8' (DECRC) --- src/InputHandler.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/InputHandler.ts b/src/InputHandler.ts index dbf6dfb2..f35ab522 100644 --- a/src/InputHandler.ts +++ b/src/InputHandler.ts @@ -1822,6 +1822,7 @@ export class InputHandler implements IInputHandler { public saveCursor(params: number[]): void { this._terminal.buffer.savedX = this._terminal.buffer.x; this._terminal.buffer.savedY = this._terminal.buffer.y; + this._terminal.savedCurAttr = this._terminal.curAttr; } @@ -1833,6 +1834,7 @@ export class InputHandler implements IInputHandler { public restoreCursor(params: number[]): void { this._terminal.buffer.x = this._terminal.buffer.savedX || 0; this._terminal.buffer.y = this._terminal.buffer.savedY || 0; + this._terminal.curAttr = this._terminal.savedCurAttr; } From c345dba591956ce10bc9f1b6661b6cf91c6ce1b8 Mon Sep 17 00:00:00 2001 From: Benjamin Raymond Date: Wed, 20 Jun 2018 13:58:53 +0200 Subject: [PATCH 2/6] #1521: added 'savedCurAttr' property in 'Terminal' class which holds the saved state of the character attributes ('ESC 7' escape sequence code) --- src/Terminal.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Terminal.ts b/src/Terminal.ts index 8a71df96..970423fe 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -198,6 +198,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II public savedCols: number; public curAttr: number; + public savedCurAttr: number; public params: (string | number)[]; public currentParam: string | number; From a1b8f96d50d7dcccc2cbe4c0392dc263f7e9ecd5 Mon Sep 17 00:00:00 2001 From: Benjamin Raymond Date: Wed, 20 Jun 2018 14:04:13 +0200 Subject: [PATCH 3/6] #1521: added default behavior of 'ESC 8' escape sequence (DECRC) when cursor state was never saved before using 'ESC 7' (DECSC) --- src/InputHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InputHandler.ts b/src/InputHandler.ts index f35ab522..72b3614c 100644 --- a/src/InputHandler.ts +++ b/src/InputHandler.ts @@ -1834,7 +1834,7 @@ export class InputHandler implements IInputHandler { public restoreCursor(params: number[]): void { this._terminal.buffer.x = this._terminal.buffer.savedX || 0; this._terminal.buffer.y = this._terminal.buffer.savedY || 0; - this._terminal.curAttr = this._terminal.savedCurAttr; + this._terminal.curAttr = this._terminal.savedCurAttr || 0; } From 285b0b6702f1b9164c18708d897514ccb4585d16 Mon Sep 17 00:00:00 2001 From: 7PH Date: Wed, 20 Jun 2018 14:23:05 +0200 Subject: [PATCH 4/6] #1521: added 'savedCurAttr' attribute to 'MockInputHandlingTerminal' class --- src/utils/TestUtils.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts index f4bad717..763eb3e6 100644 --- a/src/utils/TestUtils.test.ts +++ b/src/utils/TestUtils.test.ts @@ -182,6 +182,7 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal { wraparoundMode: boolean; bracketedPasteMode: boolean; curAttr: number; + savedCurAttr: number; savedCols: number; x10Mouse: boolean; vt200Mouse: boolean; From 4fecf05dabcfeb99f02c5b86c352b12f899ad194 Mon Sep 17 00:00:00 2001 From: 7PH Date: Wed, 20 Jun 2018 14:31:12 +0200 Subject: [PATCH 5/6] #1521: added unit tests for saving & restoring cursor attributes --- src/InputHandler.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/InputHandler.test.ts b/src/InputHandler.test.ts index 6dc043db..e8099914 100644 --- a/src/InputHandler.test.ts +++ b/src/InputHandler.test.ts @@ -12,18 +12,22 @@ describe('InputHandler', () => { const terminal = new MockInputHandlingTerminal(); terminal.buffer.x = 1; terminal.buffer.y = 2; + terminal.curAttr = 3; const inputHandler = new InputHandler(terminal); // Save cursor position inputHandler.saveCursor([]); assert.equal(terminal.buffer.x, 1); assert.equal(terminal.buffer.y, 2); + assert.equal(terminal.curAttr, 3); // Change cursor position terminal.buffer.x = 10; terminal.buffer.y = 20; + terminal.curAttr = 30; // Restore cursor position inputHandler.restoreCursor([]); assert.equal(terminal.buffer.x, 1); assert.equal(terminal.buffer.y, 2); + assert.equal(terminal.curAttr, 3); }); describe('setCursorStyle', () => { it('should call Terminal.setOption with correct params', () => { From 43ffa957ab32f156863fae0abea9573ff0aee70b Mon Sep 17 00:00:00 2001 From: 7PH Date: Thu, 21 Jun 2018 09:22:17 +0200 Subject: [PATCH 6/6] #1521: fixed default value of 'Terminal.curAttr' when restoring a not previously saved cursor state --- src/InputHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InputHandler.ts b/src/InputHandler.ts index 72b3614c..e83cff40 100644 --- a/src/InputHandler.ts +++ b/src/InputHandler.ts @@ -1834,7 +1834,7 @@ export class InputHandler implements IInputHandler { public restoreCursor(params: number[]): void { this._terminal.buffer.x = this._terminal.buffer.savedX || 0; this._terminal.buffer.y = this._terminal.buffer.savedY || 0; - this._terminal.curAttr = this._terminal.savedCurAttr || 0; + this._terminal.curAttr = this._terminal.savedCurAttr || DEFAULT_ATTR; }