From a19d93851c191187e5f601ecb6944649800c2fb2 Mon Sep 17 00:00:00 2001
From: Jeff Smith <whydoubt@gmail.com>
Date: Sat, 29 Sep 2018 22:36:28 -0500
Subject: [PATCH] Each buffer needs its own saved cursor attributes

---
 src/Buffer.ts               |  1 +
 src/InputHandler.test.ts    | 10 ++++++++++
 src/InputHandler.ts         |  4 ++--
 src/Terminal.ts             |  1 -
 src/Types.ts                |  2 +-
 src/utils/TestUtils.test.ts |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index e54f752b..5eaf880b 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -38,6 +38,7 @@ export class Buffer implements IBuffer {
   public tabs: any;
   public savedY: number;
   public savedX: number;
+  public savedCurAttr: number;
   public markers: Marker[] = [];
   private _bufferLineConstructor: IBufferLineConstructor;
 
diff --git a/src/InputHandler.test.ts b/src/InputHandler.test.ts
index cd9d7d0b..5fa3b47a 100644
--- a/src/InputHandler.test.ts
+++ b/src/InputHandler.test.ts
@@ -551,5 +551,15 @@ describe('InputHandler', () => {
       // Text color of 'TEST' should be default
       expect(term.buffer.lines.get(0).get(0)[CHAR_DATA_ATTR_INDEX]).to.equal(DEFAULT_ATTR);
     });
+    it('should handle DECSET/DECRST 1049 - maintains saved cursor for alt buffer', () => {
+      handler.parse('\x1b[?1049h\r\n\x1b[31m\x1b[s\x1b[?1049lTEST');
+      expect(lineContent(term.buffer.lines.get(0))).to.equal('TEST' + Array(term.cols - 3).join(' '));
+      // Text color of 'TEST' should be default
+      expect(term.buffer.lines.get(0).get(0)[CHAR_DATA_ATTR_INDEX]).to.equal(DEFAULT_ATTR);
+      handler.parse('\x1b[?1049h\x1b[uTEST');
+      expect(lineContent(term.buffer.lines.get(1))).to.equal('TEST' + Array(term.cols - 3).join(' '));
+      // Text color of 'TEST' should be red
+      expect((term.buffer.lines.get(1).get(0)[CHAR_DATA_ATTR_INDEX] >> 9) & 0x1ff).to.equal(1);
+    });
   });
 });
diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 3fa9b705..47e1875b 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1869,7 +1869,7 @@ export class InputHandler extends Disposable 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;
+    this._terminal.buffer.savedCurAttr = this._terminal.curAttr;
   }
 
 
@@ -1881,7 +1881,7 @@ export class InputHandler extends Disposable 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 || DEFAULT_ATTR;
+    this._terminal.curAttr = this._terminal.buffer.savedCurAttr || DEFAULT_ATTR;
   }
 
 
diff --git a/src/Terminal.ts b/src/Terminal.ts
index c9bc98ff..6675e444 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -170,7 +170,6 @@ 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;
diff --git a/src/Types.ts b/src/Types.ts
index e8578426..6a6b8369 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -49,7 +49,6 @@ export interface IInputHandlingTerminal extends IEventEmitter {
   wraparoundMode: boolean;
   bracketedPasteMode: boolean;
   curAttr: number;
-  savedCurAttr: number;
   savedCols: number;
   x10Mouse: boolean;
   vt200Mouse: boolean;
@@ -290,6 +289,7 @@ export interface IBuffer {
   hasScrollback: boolean;
   savedY: number;
   savedX: number;
+  savedCurAttr: number;
   isCursorInViewport: boolean;
   translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string;
   getWrappedRangeForLine(y: number): { first: number, last: number };
diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts
index 353e615f..a5ef4b9f 100644
--- a/src/utils/TestUtils.test.ts
+++ b/src/utils/TestUtils.test.ts
@@ -182,7 +182,6 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
   wraparoundMode: boolean;
   bracketedPasteMode: boolean;
   curAttr: number;
-  savedCurAttr: number;
   savedCols: number;
   x10Mouse: boolean;
   vt200Mouse: boolean;
@@ -304,6 +303,7 @@ export class MockBuffer implements IBuffer {
   scrollTop: number;
   savedY: number;
   savedX: number;
+  savedCurAttr: number;
   translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string {
     return Buffer.prototype.translateBufferLineToString.apply(this, arguments);
   }