Compare commits

..
4 Commits
Author SHA1 Message Date
Paris Kasidiaris 01c20807c2 Bump version to 1.1.2
Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>
2016-08-22 14:26:27 +00:00
Paris Kasidiaris 243ce59806 Merge pull request #240 from sourcelair/issue/239
Fix alt + arrow key movement
2016-08-22 17:28:23 +03:00
Paris Kasidiaris 5d6e0356b3 Add tests for arrow key movements 2016-08-22 17:21:58 +03:00
Paris Kasidiaris 8324b43cc2 Fix Alt + Arrow movement
Fix #239
2016-08-22 17:17:58 +03:00
4 changed files with 59 additions and 15 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "xterm.js", "name": "xterm.js",
"version": "1.1.1", "version": "1.1.2",
"ignore": ["demo", "test", ".gitignore"] "ignore": ["demo", "test", ".gitignore"]
} }
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "xterm", "name": "xterm",
"version": "1.1.1", "version": "1.1.2",
"ignore": [ "ignore": [
"demo", "demo",
"test", "test",
+36 -12
View File
@@ -2907,39 +2907,63 @@
break; break;
// left-arrow // left-arrow
case 37: case 37:
if (modifiers) if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'D'; result.key = '\x1b[1;' + (modifiers + 1) + 'D';
else if (this.applicationCursor) // HACK: Make Alt + left-arrow behave like Ctrl + left-arrow: move one word backwards
// http://unix.stackexchange.com/a/108106
if (result.key == '\x1b[1;3D') {
result.key = '\x1b[1;5D';
}
} else if (this.applicationCursor) {
result.key = '\x1bOD'; result.key = '\x1bOD';
else } else {
result.key = '\x1b[D'; result.key = '\x1b[D';
}
break; break;
// right-arrow // right-arrow
case 39: case 39:
if (modifiers) if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'C'; result.key = '\x1b[1;' + (modifiers + 1) + 'C';
else if (this.applicationCursor) // HACK: Make Alt + right-arrow behave like Ctrl + right-arrow: move one word forward
// http://unix.stackexchange.com/a/108106
if (result.key == '\x1b[1;3C') {
result.key = '\x1b[1;5C';
}
} else if (this.applicationCursor) {
result.key = '\x1bOC'; result.key = '\x1bOC';
else } else {
result.key = '\x1b[C'; result.key = '\x1b[C';
}
break; break;
// up-arrow // up-arrow
case 38: case 38:
if (modifiers) if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'A'; result.key = '\x1b[1;' + (modifiers + 1) + 'A';
else if (this.applicationCursor) // HACK: Make Alt + up-arrow behave like Ctrl + up-arrow
// http://unix.stackexchange.com/a/108106
if (result.key == '\x1b[1;3A') {
result.key = '\x1b[1;5A';
}
} else if (this.applicationCursor) {
result.key = '\x1bOA'; result.key = '\x1bOA';
else } else {
result.key = '\x1b[A'; result.key = '\x1b[A';
}
break; break;
// down-arrow // down-arrow
case 40: case 40:
if (modifiers) if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'B'; result.key = '\x1b[1;' + (modifiers + 1) + 'B';
else if (this.applicationCursor) // HACK: Make Alt + down-arrow behave like Ctrl + down-arrow
// http://unix.stackexchange.com/a/108106
if (result.key == '\x1b[1;3B') {
result.key = '\x1b[1;5B';
}
} else if (this.applicationCursor) {
result.key = '\x1bOB'; result.key = '\x1bOB';
else } else {
result.key = '\x1b[B'; result.key = '\x1b[B';
}
break; break;
// insert // insert
case 45: case 45:
+20
View File
@@ -55,6 +55,26 @@ describe('xterm.js', function() {
it('should return \\x1b[5C for ctrl+right', function() { it('should return \\x1b[5C for ctrl+right', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 39 }).key, '\x1b[1;5C'); // CSI 5 C assert.equal(xterm.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 39 }).key, '\x1b[1;5C'); // CSI 5 C
}); });
it('should return \\x1b[5A for ctrl+up', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 38 }).key, '\x1b[1;5A'); // CSI 5 A
});
it('should return \\x1b[5B for ctrl+down', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 40 }).key, '\x1b[1;5B'); // CSI 5 B
});
// Evalueate alt + arrow key movement, which is a feature of terminal emulators but not VT100
// http://unix.stackexchange.com/a/108106
it('should return \\x1b[5D for alt+left', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ altKey: true, keyCode: 37 }).key, '\x1b[1;5D'); // CSI 5 D
});
it('should return \\x1b[5C for alt+right', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ altKey: true, keyCode: 39 }).key, '\x1b[1;5C'); // CSI 5 C
});
it('should return \\x1b[5A for alt+up', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ altKey: true, keyCode: 38 }).key, '\x1b[1;5A'); // CSI 5 A
});
it('should return \\x1b[5B for alt+down', function() {
assert.equal(xterm.evaluateKeyEscapeSequence({ altKey: true, keyCode: 40 }).key, '\x1b[1;5B'); // CSI 5 B
});
}); });
describe('attachCustomEventHandler', function () { describe('attachCustomEventHandler', function () {