Move all parser state handling into the parser

diff --git a/src/Parser.ts b/src/Parser.ts
index ef10abc5e6f604f9d25aefb2282d815421ee1218..42d429a3e220f9b35ba3cceb299ce863bbdaa332 100644 (file)
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -206,11 +206,13 @@ export class Parser {
               ;
             case 'D':
               this._terminal.index();
+              this.state = ParserState.NORMAL;
               break;
 
             // ESC M Reverse Index ( RI is 0x8d).
             case 'M':
               this._terminal.reverseIndex();
+              this.state = ParserState.NORMAL;
               break;
 
             // ESC % Select default/utf-8 character set.
@@ -319,6 +321,7 @@ export class Parser {
             // ESC H Tab Set (HTS is 0x88).
             case 'H':
               this._terminal.tabSet();
+              this.state = ParserState.NORMAL;
               break;
 
             // ESC = Application Keypad (DECKPAM).

diff --git a/src/xterm.js b/src/xterm.js
index a100f8022a2c0baa0db55a0a4a1d585dd3d75ade..bf9f9853862c54a8369fe52fdc539ed6971b0c32 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -148,7 +148,6 @@ function Terminal(options) {
   this.cursorState = 0;
   this.cursorHidden = false;
   this.convertEol;
-  this.state = 0;
   this.queue = '';
   this.scrollTop = 0;
   this.scrollBottom = this.rows - 1;
@@ -2173,7 +2172,6 @@ Terminal.prototype.index = function() {
     this.y--;
     this.scroll();
   }
-  this.state = normal;
 };
 
 
@@ -2195,7 +2193,6 @@ Terminal.prototype.reverseIndex = function() {
   } else {
     this.y--;
   }
-  this.state = normal;
 };
 
 
@@ -2218,7 +2215,6 @@ Terminal.prototype.reset = function() {
  */
 Terminal.prototype.tabSet = function() {
   this.tabs[this.x] = true;
-  this.state = normal;
 };