Additional alt and control sequences
* Add punctuation alt sequences * Add support for ctrl+alt sequences
This commit is contained in:
@@ -578,6 +578,50 @@ describe('term.js addons', () => {
|
|||||||
assert.equal(term.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 122 }).key, '\x1b[23;5~');
|
assert.equal(term.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 122 }).key, '\x1b[23;5~');
|
||||||
assert.equal(term.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 123 }).key, '\x1b[24;5~');
|
assert.equal(term.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 123 }).key, '\x1b[24;5~');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Characters using ctrl+alt sequences
|
||||||
|
it('should return proper sequence for ctrl+alt+a', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, ctrlKey: true, keyCode: 65 }).key, '\x1b\x01');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Characters using alt sequences
|
||||||
|
it('should return proper sequences for alt+;', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 186 }).key, '\x1b;');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 186 }).key, '\x1b:');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+=', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 187 }).key, '\x1b=');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 187 }).key, '\x1b+');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+,', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 188 }).key, '\x1b,');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 188 }).key, '\x1b<');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+-', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 189 }).key, '\x1b-');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 189 }).key, '\x1b_');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+.', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 190 }).key, '\x1b.');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 190 }).key, '\x1b>');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+~', () => {
|
||||||
|
// tilde is a DEAD key
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 192 }).key, '\x1b`');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 192 }).key, '\x1b`');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+[', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 219 }).key, '\x1b[');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 219 }).key, '\x1b{');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+]', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 221 }).key, '\x1b]');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 221 }).key, '\x1b}');
|
||||||
|
});
|
||||||
|
it('should return proper sequences for alt+\\', () => {
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: false, keyCode: 222 }).key, '\x1b\'');
|
||||||
|
assert.equal(term.evaluateKeyEscapeSequence({ altKey: true, shiftKey: true, keyCode: 222 }).key, '\x1b|');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Third level shift', () => {
|
describe('Third level shift', () => {
|
||||||
|
|||||||
+36
-4
@@ -1713,14 +1713,46 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
|
|||||||
// ^] - Operating System Command (OSC)
|
// ^] - Operating System Command (OSC)
|
||||||
result.key = String.fromCharCode(29);
|
result.key = String.fromCharCode(29);
|
||||||
}
|
}
|
||||||
} else if ((!this.browser.isMac || this.options.macOptionIsMeta) && ev.altKey && !ev.ctrlKey && !ev.metaKey) {
|
} else if ((!this.browser.isMac || this.options.macOptionIsMeta) && ev.altKey && !ev.metaKey) {
|
||||||
// On macOS this is a third level shift when !macOptionIsMeta. Use <Esc> instead.
|
// On macOS this is a third level shift when !macOptionIsMeta. Use <Esc> instead.
|
||||||
if (ev.keyCode >= 65 && ev.keyCode <= 90) {
|
if (ev.keyCode >= 65 && ev.keyCode <= 90) {
|
||||||
result.key = C0.ESC + String.fromCharCode(ev.keyCode + 32);
|
const keyCode = ev.ctrlKey ? ev.keyCode - 64 : ev.keyCode + 32;
|
||||||
} else if (ev.keyCode === 192) {
|
result.key = C0.ESC + String.fromCharCode(keyCode);
|
||||||
result.key = C0.ESC + '`';
|
|
||||||
} else if (ev.keyCode >= 48 && ev.keyCode <= 57) {
|
} else if (ev.keyCode >= 48 && ev.keyCode <= 57) {
|
||||||
result.key = C0.ESC + (ev.keyCode - 48);
|
result.key = C0.ESC + (ev.keyCode - 48);
|
||||||
|
} else {
|
||||||
|
const t = (p,s) => !ev.shiftKey ? p : s;
|
||||||
|
switch (ev.keyCode) {
|
||||||
|
case 186:
|
||||||
|
result.key = C0.ESC + t(';', ':');
|
||||||
|
break;
|
||||||
|
case 187:
|
||||||
|
result.key = C0.ESC + t('=', '+');
|
||||||
|
break;
|
||||||
|
case 188:
|
||||||
|
result.key = C0.ESC + t(',', '<');
|
||||||
|
break;
|
||||||
|
case 189:
|
||||||
|
result.key = C0.ESC + t('-', '_');
|
||||||
|
break;
|
||||||
|
case 190:
|
||||||
|
result.key = C0.ESC + t('.', '>');
|
||||||
|
break;
|
||||||
|
case 192:
|
||||||
|
// the tilde is a DEAD key
|
||||||
|
result.key = C0.ESC + '`';
|
||||||
|
break;
|
||||||
|
case 219:
|
||||||
|
result.key = C0.ESC + t('[', '{');
|
||||||
|
break;
|
||||||
|
case 221:
|
||||||
|
result.key = C0.ESC + t(']', '}');
|
||||||
|
break;
|
||||||
|
case 222:
|
||||||
|
result.key = C0.ESC + t('\'', '|');
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (this.browser.isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {
|
} else if (this.browser.isMac && !ev.altKey && !ev.ctrlKey && ev.metaKey) {
|
||||||
if (ev.keyCode === 65) { // cmd + a
|
if (ev.keyCode === 65) { // cmd + a
|
||||||
|
|||||||
Reference in New Issue
Block a user