commit 0f5c0294db63e24b9ee65a99b334eec59b01461b
author rginda <rginda@chromium.org> Fri Jan 13 11:00:13 2012 -0800
committer Gerrit <chrome-bot@google.com> Wed Jan 18 10:49:22 2012 -0800
tree 968e4dfafa5db5c2a93e2b98c2a9cd6959df034f
parent 23461fbb00028ea3de4a5f52edc3a8ebe79d4a91

Rewrite VT escape sequence interpreter.

The new version is faster, more correct, and easier to maintain.

BUG=chromium-os:25071
TEST=test_harness.html, 53/53 tests passed.

Change-Id: I8be1865ba92cfb2b0fd6cae76a8cd8fe447f6909
Reviewed-on: https://gerrit.chromium.org/gerrit/14157
Commit-Ready: Robert Ginda <rginda@chromium.org>
Reviewed-by: Robert Ginda <rginda@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Tested-by: Robert Ginda <rginda@chromium.org>

hterm/js/terminal.js

diff --git a/hterm/js/terminal.js b/hterm/js/terminal.js
index 73c97e5..2aec839 100644
--- a/hterm/js/terminal.js
+++ b/hterm/js/terminal.js
@@ -68,6 +68,9 @@
   // If true, scroll to the bottom on any keystroke.
   this.scrollOnKeystroke = true;
 
+  // If true, scroll to the bottom on terminal output.
+  this.scrollOnOutput = false;
+
   // The current mode bits for the terminal.
   this.options_ = new hterm.Options();
 
@@ -75,7 +78,7 @@
   this.timeouts_ = {};
 
   // The VT escape sequence interpreter.
-  this.vt = new hterm.VT100(this);
+  this.vt = new hterm.VT(this);
 
   // General IO interface that can be given to third parties without exposing
   // the entire terminal object.
@@ -168,13 +171,14 @@
   this.scrollPort_.scrollRowToTop(i + this.screenSize.height - 1);
 };
 
-/**
- * Methods called by Cory's vt100 interpreter which we haven't implemented yet.
- */
 hterm.Terminal.prototype.reset = function() {
   console.log('reset');
 };
 
+hterm.Terminal.prototype.softReset = function() {
+  console.log('softReset');
+};
+
 hterm.Terminal.prototype.clearColorAndAttributes = function() {
   //console.log('clearColorAndAttributes');
 };
@@ -207,6 +211,14 @@
   //console.log('setSpecialCharactersEnabled');
 };
 
+hterm.Terminal.prototype.forwardTabStop = function(count) {
+  this.cursorRight(4);
+};
+
+hterm.Terminal.prototype.backwardTabStop = function(count) {
+  console.error('Not implemented: backwardTabStop');
+};
+
 hterm.Terminal.prototype.setTabStopAtCursor = function() {
   console.log('setTabStopAtCursor');
 };
@@ -231,7 +243,7 @@
  * @param {string} str Sequence of characters to interpret or pass through.
  */
 hterm.Terminal.prototype.interpret = function(str) {
-  this.vt.interpretString(str);
+  this.vt.interpret(str);
   this.scheduleSyncCursorPosition_();
 };
 
@@ -468,6 +480,9 @@
   } while (this.options_.wraparound && str);
 
   this.scheduleSyncCursorPosition_();
+
+  if (this.scrollOnOutput)
+    this.scrollPort_.scrollRowToBottom(this.getRowCount());
 };
 
 /**
@@ -783,7 +798,7 @@
 hterm.Terminal.prototype.insertSpace = function(count) {
   var cursor = this.saveCursor();
 
-  var ws = hterm.getWhitespace(count);
+  var ws = hterm.getWhitespace(count || 1);
   this.screen_.insertString(ws);
 
   this.restoreCursor(cursor);
@@ -956,7 +971,7 @@
  * @param {integer} count The number of rows to move the cursor.
  */
 hterm.Terminal.prototype.cursorUp = function(count) {
-  return this.cursorDown(-count);
+  return this.cursorDown(-(count || 1));
 };
 
 /**
@@ -965,6 +980,7 @@
  * @param {integer} count The number of rows to move the cursor.
  */
 hterm.Terminal.prototype.cursorDown = function(count) {
+  count = count || 1;
   var minHeight = (this.options_.originMode ? this.getVTScrollTop() : 0);
   var maxHeight = (this.options_.originMode ? this.getVTScrollBottom() :
                    this.screenSize.height - 1);
@@ -980,7 +996,7 @@
  * @param {integer} count The number of columns to move the cursor.
  */
 hterm.Terminal.prototype.cursorLeft = function(count) {
-  return this.cursorRight(-count);
+  return this.cursorRight(-(count || 1));
 };
 
 /**
@@ -989,6 +1005,7 @@
  * @param {integer} count The number of columns to move the cursor.
  */
 hterm.Terminal.prototype.cursorRight = function(count) {
+  count = count || 1;
   var column = hterm.clamp(this.screen_.cursorPosition.column + count,
                            0, this.screenSize.width - 1);
   this.setCursorColumn(column);