eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixing #147 and #162

Browse Source
This commit is contained in:
Jörg Breitbart
2016-07-05 23:54:15 +02:00
parent 39c4356ef6
commit 4afa08da8d
2 changed files with 340 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test.js
+291 -244
View File
@@ -1,5 +1,5 @@
var assert = require('chai').assert;
var chai = require('chai');
var expect = require('chai').expect;
var Terminal = require('../src/xterm');
describe('xterm.js', function() {
@@ -192,260 +192,307 @@ describe('xterm.js', function() {
});
});
describe('unicode - surrogates', function() {
describe('unicode - surrogates', function() {
it('2 characters per cell', function () {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.write(high + String.fromCharCode(i));
var tchar = xterm.lines[0][0];
chai.expect(tchar[1]).eql(high + String.fromCharCode(i));
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(1);
chai.expect(xterm.lines[0][1][1]).eql(' ');
xterm.reset();
}
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.write(high + String.fromCharCode(i));
var tchar = xterm.lines[0][0];
expect(tchar[1]).eql(high + String.fromCharCode(i));
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(1);
expect(xterm.lines[0][1][1]).eql(' ');
xterm.reset();
}
});
it('2 characters at last cell', function () {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.write(high + String.fromCharCode(i));
chai.expect(xterm.lines[0][xterm.x-1][1]).eql(high + String.fromCharCode(i));
chai.expect(xterm.lines[0][xterm.x-1][1].length).eql(2);
chai.expect(xterm.lines[1][0][1]).eql(' ');
xterm.reset();
}
it('2 characters at last cell', function() {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.write(high + String.fromCharCode(i));
expect(xterm.lines[0][xterm.x-1][1]).eql(high + String.fromCharCode(i));
expect(xterm.lines[0][xterm.x-1][1].length).eql(2);
expect(xterm.lines[1][0][1]).eql(' ');
xterm.reset();
}
});
it('2 characters per cell over line end with autowrap', function () {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.wraparoundMode = true;
xterm.write('a' + high + String.fromCharCode(i));
chai.expect(xterm.lines[0][xterm.cols-1][1]).eql('a');
chai.expect(xterm.lines[1][0][1]).eql(high + String.fromCharCode(i));
chai.expect(xterm.lines[1][0][1].length).eql(2);
chai.expect(xterm.lines[1][1][1]).eql(' ');
xterm.reset();
}
it('2 characters per cell over line end with autowrap', function() {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.wraparoundMode = true;
xterm.write('a' + high + String.fromCharCode(i));
expect(xterm.lines[0][xterm.cols-1][1]).eql('a');
expect(xterm.lines[1][0][1]).eql(high + String.fromCharCode(i));
expect(xterm.lines[1][0][1].length).eql(2);
expect(xterm.lines[1][1][1]).eql(' ');
xterm.reset();
}
});
/** FIXME - wrap is not respected in default state */
/*
it('2 characters per cell over line end without autowrap', function () {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.wraparoundMode = false;
xterm.write('a' + high + String.fromCharCode(i));
chai.expect(xterm.lines[0][xterm.cols-1][1]).eql(high + String.fromCharCode(i));
chai.expect(xterm.lines[0][xterm.cols-1][1].length).eql(2);
chai.expect(xterm.lines[1][1][1]).eql(' ');
xterm.reset();
}
it('2 characters per cell over line end without autowrap', function() {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.x = xterm.cols - 1;
xterm.wraparoundMode = false;
xterm.write('a' + high + String.fromCharCode(i));
expect(xterm.lines[0][xterm.cols-1][1]).eql(high + String.fromCharCode(i));
expect(xterm.lines[0][xterm.cols-1][1].length).eql(2);
expect(xterm.lines[1][1][1]).eql(' ');
xterm.reset();
}
});
*/
it('splitted surrogates', function () {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.write(high);
xterm.write(String.fromCharCode(i));
var tchar = xterm.lines[0][0];
chai.expect(tchar[1]).eql(high + String.fromCharCode(i));
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(1);
chai.expect(xterm.lines[0][1][1]).eql(' ');
xterm.reset();
}
it('splitted surrogates', function() {
var high = '\uD800';
for (var i=0xDC00; i<=0xDCFF; ++i) {
xterm.write(high);
xterm.write(String.fromCharCode(i));
var tchar = xterm.lines[0][0];
expect(tchar[1]).eql(high + String.fromCharCode(i));
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(1);
expect(xterm.lines[0][1][1]).eql(' ');
xterm.reset();
}
});
});
describe('unicode - combining characters', function() {
});
describe('unicode - combining characters', function() {
it('café', function () {
xterm.write('cafe\u0301');
chai.expect(xterm.lines[0][3][1]).eql('e\u0301');
chai.expect(xterm.lines[0][3][1].length).eql(2);
chai.expect(xterm.lines[0][3][2]).eql(1);
xterm.write('cafe\u0301');
expect(xterm.lines[0][3][1]).eql('e\u0301');
expect(xterm.lines[0][3][1].length).eql(2);
expect(xterm.lines[0][3][2]).eql(1);
});
it('café - end of line', function () {
xterm.x = xterm.cols - 1 - 3;
xterm.write('cafe\u0301');
chai.expect(xterm.lines[0][xterm.cols-1][1]).eql('e\u0301');
chai.expect(xterm.lines[0][xterm.cols-1][1].length).eql(2);
chai.expect(xterm.lines[0][xterm.cols-1][2]).eql(1);
chai.expect(xterm.lines[0][1][1]).eql(' ');
chai.expect(xterm.lines[0][1][1].length).eql(1);
chai.expect(xterm.lines[0][1][2]).eql(1);
it('café - end of line', function() {
xterm.x = xterm.cols - 1 - 3;
xterm.write('cafe\u0301');
expect(xterm.lines[0][xterm.cols-1][1]).eql('e\u0301');
expect(xterm.lines[0][xterm.cols-1][1].length).eql(2);
expect(xterm.lines[0][xterm.cols-1][2]).eql(1);
expect(xterm.lines[0][1][1]).eql(' ');
expect(xterm.lines[0][1][1].length).eql(1);
expect(xterm.lines[0][1][2]).eql(1);
});
it('multiple combined é', function () {
xterm.write(Array(100).join('e\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
chai.expect(tchar[1]).eql('e\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(1);
it('multiple combined é', function() {
xterm.wraparoundMode = true;
xterm.write(Array(100).join('e\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
expect(tchar[1]).eql('e\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(1);
}
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('e\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(1);
});
it('multiple surrogate with combined', function() {
xterm.wraparoundMode = true;
xterm.write(Array(100).join('\uD800\uDC00\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
expect(tchar[1]).eql('\uD800\uDC00\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(1);
}
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('\uD800\uDC00\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(1);
});
});
describe('unicode - fullwidth characters', function() {
it('cursor movement even', function() {
expect(xterm.x).eql(0);
xterm.write('￥');
expect(xterm.x).eql(2);
});
it('cursor movement odd', function() {
xterm.x = 1;
expect(xterm.x).eql(1);
xterm.write('￥');
expect(xterm.x).eql(3);
});
it('line of ￥ even', function() {
xterm.wraparoundMode = true;
xterm.write(Array(50).join('￥'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('￥');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(2);
}
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('e\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(1);
}
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('￥');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(2);
});
it('multiple surrogate with combined', function () {
xterm.write(Array(100).join('\uD800\uDC00\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
chai.expect(tchar[1]).eql('\uD800\uDC00\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(1);
it('line of ￥ odd', function() {
xterm.wraparoundMode = true;
xterm.x = 1;
xterm.write(Array(50).join('￥'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('￥');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(2);
}
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('\uD800\uDC00\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(1);
}
tchar = xterm.lines[0][xterm.cols-1];
expect(tchar[1]).eql(' ');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('￥');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(2);
});
});
describe('unicode - fullwidth characters', function() {
it('cursor movement even', function () {
chai.expect(xterm.x).eql(0);
xterm.write('￥');
chai.expect(xterm.x).eql(2);
});
it('cursor movement odd', function () {
xterm.x = 1;
chai.expect(xterm.x).eql(1);
xterm.write('￥');
chai.expect(xterm.x).eql(3);
});
it('line of ￥ even', function () {
xterm.write(Array(50).join('￥'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('￥');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('￥');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(2);
});
it('line of ￥ odd', function () {
xterm.x = 1;
xterm.write(Array(50).join('￥'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('￥');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[0][xterm.cols-1];
chai.expect(tchar[1]).eql(' ');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('￥');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(2);
});
it('line of ￥ with combining odd', function () {
xterm.x = 1;
xterm.write(Array(50).join('￥\u0301'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('￥\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[0][xterm.cols-1];
chai.expect(tchar[1]).eql(' ');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('￥\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(2);
});
it('line of ￥ with combining even', function () {
xterm.write(Array(50).join('￥\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('￥\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('￥\u0301');
chai.expect(tchar[1].length).eql(2);
chai.expect(tchar[2]).eql(2);
});
it('line of surrogate fullwidth with combining odd', function () {
xterm.x = 1;
xterm.write(Array(50).join('\ud843\ude6d\u0301'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('\ud843\ude6d\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[0][xterm.cols-1];
chai.expect(tchar[1]).eql(' ');
chai.expect(tchar[1].length).eql(1);
chai.expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('\ud843\ude6d\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(2);
});
it('line of surrogate fullwidth with combining even', function () {
xterm.write(Array(50).join('\ud843\ude6d\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
chai.expect(tchar[1]).eql('');
chai.expect(tchar[1].length).eql(0);
chai.expect(tchar[2]).eql(0);
} else {
chai.expect(tchar[1]).eql('\ud843\ude6d\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[1][0];
chai.expect(tchar[1]).eql('\ud843\ude6d\u0301');
chai.expect(tchar[1].length).eql(3);
chai.expect(tchar[2]).eql(2);
});
});
it('line of ￥ with combining odd', function() {
xterm.wraparoundMode = true;
xterm.x = 1;
xterm.write(Array(50).join('￥\u0301'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('￥\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[0][xterm.cols-1];
expect(tchar[1]).eql(' ');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('￥\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(2);
});
it('line of ￥ with combining even', function() {
xterm.wraparoundMode = true;
xterm.write(Array(50).join('￥\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('￥\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('￥\u0301');
expect(tchar[1].length).eql(2);
expect(tchar[2]).eql(2);
});
it('line of surrogate fullwidth with combining odd', function() {
xterm.wraparoundMode = true;
xterm.x = 1;
xterm.write(Array(50).join('\ud843\ude6d\u0301'));
for (var i=1; i<xterm.cols-1; ++i) {
var tchar = xterm.lines[0][i];
if (!(i % 2)) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('\ud843\ude6d\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[0][xterm.cols-1];
expect(tchar[1]).eql(' ');
expect(tchar[1].length).eql(1);
expect(tchar[2]).eql(1);
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('\ud843\ude6d\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(2);
});
it('line of surrogate fullwidth with combining even', function() {
xterm.wraparoundMode = true;
xterm.write(Array(50).join('\ud843\ude6d\u0301'));
for (var i=0; i<xterm.cols; ++i) {
var tchar = xterm.lines[0][i];
if (i % 2) {
expect(tchar[1]).eql('');
expect(tchar[1].length).eql(0);
expect(tchar[2]).eql(0);
} else {
expect(tchar[1]).eql('\ud843\ude6d\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(2);
}
}
tchar = xterm.lines[1][0];
expect(tchar[1]).eql('\ud843\ude6d\u0301');
expect(tchar[1].length).eql(3);
expect(tchar[2]).eql(2);
});
});
describe('insert mode', function() {
it('halfwidth - all', function () {
xterm.write(Array(9).join('0123456789').slice(-80));
xterm.x = 10;
xterm.y = 0;
xterm.insertMode = true;
xterm.write('abcde');
expect(xterm.lines[0].length).eql(xterm.cols);
expect(xterm.lines[0][10][1]).eql('a');
expect(xterm.lines[0][14][1]).eql('e');
expect(xterm.lines[0][15][1]).eql('0');
expect(xterm.lines[0][79][1]).eql('4');
});
it('fullwidth - insert', function() {
xterm.write(Array(9).join('0123456789').slice(-80));
xterm.x = 10;
xterm.y = 0;
xterm.insertMode = true;
xterm.write('￥￥￥');
expect(xterm.lines[0].length).eql(xterm.cols);
expect(xterm.lines[0][10][1]).eql('￥');
expect(xterm.lines[0][11][1]).eql('');
expect(xterm.lines[0][14][1]).eql('￥');
expect(xterm.lines[0][15][1]).eql('');
expect(xterm.lines[0][79][1]).eql('3');
});
it('fullwidth - right border', function() {
xterm.write(Array(41).join('￥'));
xterm.x = 10;
xterm.y = 0;
xterm.insertMode = true;
xterm.write('a');
expect(xterm.lines[0].length).eql(xterm.cols);
expect(xterm.lines[0][10][1]).eql('a');
expect(xterm.lines[0][11][1]).eql('￥');
expect(xterm.lines[0][79][1]).eql(' '); // fullwidth char got replaced
xterm.write('b');
expect(xterm.lines[0].length).eql(xterm.cols);
expect(xterm.lines[0][11][1]).eql('b');
expect(xterm.lines[0][12][1]).eql('￥');
expect(xterm.lines[0][79][1]).eql(''); // empty cell after fullwidth
});
});
});