xterm test cases

package.json

@@ -1,18 +1,24 @@
 {
   "name": "xterm",
   "version": "0.33.0",
-  "ignore": ["demo", "test", ".gitignore"],
+  "ignore": [
+    "demo",
+    "test",
+    ".gitignore"
+  ],
   "main": "src/xterm.js",
   "repository": "https://github.com/sourcelair/xterm.js",
   "license": "MIT",
   "devDependencies": {
+    "chai": "3.5.0",
+    "docdash": "0.4.0",
     "express": "4.13.4",
     "express-ws": "2.0.0-rc.1",
-    "pty.js": "0.3.0",
-    "mocha": "2.5.3",
-    "chai": "3.5.0",
+    "glob": "^7.0.5",
     "jsdoc": "3.4.0",
-    "docdash": "0.4.0"
+    "mocha": "2.5.3",
+    "pty.js": "0.3.0",
+    "sleep": "^3.0.1"
   },
   "scripts": {
     "start": "node demo/app",

src/xterm.js

@@ -253,7 +253,7 @@
       this.applicationCursor = false;
       this.originMode = false;
       this.insertMode = false;
-      this.wraparoundMode = false;
+      this.wraparoundMode = true; // defaults: xterm - true, vt100 - false
       this.normal = null;
 
       // charset
@@ -1467,7 +1467,7 @@
      * @public
      */
     Terminal.prototype.write = function(data) {
-      var l = data.length, i = 0, j, cs, ch, code, low, ch_width;
+      var l = data.length, i = 0, j, cs, ch, code, low, ch_width, row;
 
       this.refreshStart = this.y;
       this.refreshEnd = this.y;
@@ -1569,20 +1569,22 @@
                     ch = this.charset[ch];
                   }
 
+                  row = this.y + this.ybase;
+
                   // insert combining char in last cell
                   // FIXME: needs handling after cursor jumps
                   if (!ch_width && this.x) {
 
                     // dont overflow left
-                    if (this.lines[this.y + this.ybase][this.x-1]) {
-                      if (!this.lines[this.y + this.ybase][this.x-1][2]) {
+                    if (this.lines[row][this.x-1]) {
+                      if (!this.lines[row][this.x-1][2]) {
 
                         // found empty cell after fullwidth, need to go 2 cells back
-                        if (this.lines[this.y + this.ybase][this.x-2])
-                          this.lines[this.y + this.ybase][this.x-2][1] += ch;
+                        if (this.lines[row][this.x-2])
+                          this.lines[row][this.x-2][1] += ch;
 
                       } else {
-                        this.lines[this.y + this.ybase][this.x-1][1] += ch;
+                        this.lines[row][this.x-1][1] += ch;
                       }
                       this.updateRange(this.y);
                     }
@@ -1592,21 +1594,46 @@
                   // goto next line if ch would overflow
                   // TODO: needs a global min terminal width of 2
                   if (this.x+ch_width-1 >= this.cols) {
-                    this.x = 0;
-                    this.y++;
-                    if (this.y > this.scrollBottom) {
-                      this.y--;
-                      this.scroll();
+                    // autowrap - DECAWM
+                    if (this.wraparoundMode) {
+                      this.x = 0;
+                      this.y++;
+                      if (this.y > this.scrollBottom) {
+                        this.y--;
+                        this.scroll();
+                      }
+                    } else {
+                      this.x = this.cols-1;
+                      if(ch_width===2)  // FIXME: check for xterm behavior
+                        continue;
+                    }
+                  }
+                  row = this.y + this.ybase;
+
+                  // insert mode: move characters to right
+                  if (this.insertMode) {
+                    // do this twice for a fullwidth char
+                    for (var moves=0; moves<ch_width; ++moves) {
+                      // remove last cell, if it's width is 0
+                      // we have to adjust the second last cell as well
+                      var removed = this.lines[this.y + this.ybase].pop();
+                      if (removed[2]===0
+                          && this.lines[row][this.cols-2]
+                          && this.lines[row][this.cols-2][2]===2)
+                        this.lines[row][this.cols-2] = [this.curAttr, ' ', 1];
+
+                      // insert empty cell at cursor
+                      this.lines[row].splice(this.x, 0, [this.curAttr, ' ', 1]);
                     }
                   }
 
-                  this.lines[this.y + this.ybase][this.x] = [this.curAttr, ch, ch_width];
+                  this.lines[row][this.x] = [this.curAttr, ch, ch_width];
                   this.x++;
                   this.updateRange(this.y);
 
                   // fullwidth char - set next cell width to zero and advance cursor
-                  if (ch_width==2) {
-                    this.lines[this.y + this.ybase][this.x] = [this.curAttr, '', 0];
+                  if (ch_width===2) {
+                    this.lines[row][this.x] = [this.curAttr, '', 0];
                     this.x++;
                   }
                 }
@@ -3469,7 +3496,7 @@
 
       row = this.y + this.ybase;
       j = this.x;
-      ch = [this.eraseAttr(), ' ']; // xterm
+      ch = [this.eraseAttr(), ' ', 1]; // xterm
 
       while (param-- && j < this.cols) {
         this.lines[row].splice(j++, 0, ch);
@@ -3566,7 +3593,7 @@
       if (param < 1) param = 1;
 
       row = this.y + this.ybase;
-      ch = [this.eraseAttr(), ' ']; // xterm
+      ch = [this.eraseAttr(), ' ', 1]; // xterm
 
       while (param--) {
         this.lines[row].splice(this.x, 1);
@@ -3584,7 +3611,7 @@
 
       row = this.y + this.ybase;
       j = this.x;
-      ch = [this.eraseAttr(), ' ']; // xterm
+      ch = [this.eraseAttr(), ' ', 1]; // xterm
 
       while (param-- && j < this.cols) {
         this.lines[row][j++] = ch;
@@ -4198,7 +4225,7 @@
     Terminal.prototype.repeatPrecedingCharacter = function(params) {
       var param = params[0] || 1
         , line = this.lines[this.ybase + this.y]
-        , ch = line[this.x - 1] || [this.defAttr, ' '];
+        , ch = line[this.x - 1] || [this.defAttr, ' ', 1];
 
       while (param--) line[this.x++] = ch;
     };
@@ -4460,7 +4487,7 @@
         , i
         , ch;
 
-      ch = [this.eraseAttr(), ' ']; // xterm?
+      ch = [this.eraseAttr(), ' ', 1]; // xterm?
 
       for (; t < b + 1; t++) {
         line = this.lines[this.ybase + t];
@@ -4481,7 +4508,7 @@
     Terminal.prototype.insertColumns = function() {
       var param = params[0]
         , l = this.ybase + this.rows
-        , ch = [this.eraseAttr(), ' '] // xterm?
+        , ch = [this.eraseAttr(), ' ', 1] // xterm?
         , i;
 
       while (param--) {
@@ -4501,7 +4528,7 @@
     Terminal.prototype.deleteColumns = function() {
       var param = params[0]
         , l = this.ybase + this.rows
-        , ch = [this.eraseAttr(), ' '] // xterm?
+        , ch = [this.eraseAttr(), ' ', 1] // xterm?
         , i;
 
       while (param--) {

test/escape_sequence_files/NOTES

@@ -0,0 +1,21 @@
+All tests are made for 80x25 terminal. Make sure to run tests with 80x25.
+
+Create .text files from xterm (expected output)
+- open xterm
+- resize xterm to 80x25
+- run `python run_tests.py`
+- copy & paste whole window output into editor
+- add 26th empty line (due to line handling in toString) - not a bug, a feature ;)
+- advance to next test with ^D
+
+
+Known problems
+##############
+
+
+t0031-HBP:
+    - no documentation at all about CSIj found - skipping
+
+t0050-ICH:
+    - bug in xterm? (cant ICH last real char, always sticks to last col)
+    - text used from https://github.com/MarkLodato/vt100-parser/blob/master/test/t0050-ICH.text

test/escape_sequence_files/t0001-all_printable.in

@@ -0,0 +1,6 @@
+ !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~

test/escape_sequence_files/t0001-all_printable.text

@@ -0,0 +1,25 @@
+ !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

test/escape_sequence_files/t0002-history.in

@@ -0,0 +1,95 @@
+
+!
+"
+#
+$
+%
+&
+'
+(
+)
+*
++
+,
+-
+.
+/
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+:
+;
+<
+=
+>
+?
+@
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+[
+\
+]
+^
+_
+`
+a
+b
+c
+d
+e
+f
+g
+h
+i
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+t
+u
+v
+w
+x
+y
+z
+{
+|
+}
+~

test/escape_sequence_files/t0002-history.text

@@ -0,0 +1,25 @@
+g
+h
+i
+j
+k
+l
+m
+n
+o
+p
+q
+r
+s
+t
+u
+v
+w
+x
+y
+z
+{
+|
+}
+~
+

test/escape_sequence_files/t0002j-simple_string.in

@@ -0,0 +1 @@
+abcdefghijklmnopqrstuvwxyz0123456789

test/escape_sequence_files/t0002j-simple_string.text

@@ -0,0 +1,25 @@
+abcdefghijklmnopqrstuvwxyz0123456789
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+