Merge pull request #275 from Tyriar/move_comments_inside_case

Move key handler comments inside case blocks
This commit is contained in:
Daniel Imms
2016-09-18 13:49:52 -07:00
committed by GitHub
+15 -15
View File
@@ -2470,16 +2470,16 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
}; };
var modifiers = ev.shiftKey << 0 | ev.altKey << 1 | ev.ctrlKey << 2 | ev.metaKey << 3; var modifiers = ev.shiftKey << 0 | ev.altKey << 1 | ev.ctrlKey << 2 | ev.metaKey << 3;
switch (ev.keyCode) { switch (ev.keyCode) {
// backspace
case 8: case 8:
// backspace
if (ev.shiftKey) { if (ev.shiftKey) {
result.key = '\x08'; // ^H result.key = '\x08'; // ^H
break; break;
} }
result.key = '\x7f'; // ^? result.key = '\x7f'; // ^?
break; break;
// tab
case 9: case 9:
// tab
if (ev.shiftKey) { if (ev.shiftKey) {
result.key = '\x1b[Z'; result.key = '\x1b[Z';
break; break;
@@ -2487,18 +2487,18 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
result.key = '\t'; result.key = '\t';
result.cancel = true; result.cancel = true;
break; break;
// return/enter
case 13: case 13:
// return/enter
result.key = '\r'; result.key = '\r';
result.cancel = true; result.cancel = true;
break; break;
// escape
case 27: case 27:
// escape
result.key = '\x1b'; result.key = '\x1b';
result.cancel = true; result.cancel = true;
break; break;
// left-arrow
case 37: case 37:
// left-arrow
if (modifiers) { if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'D'; result.key = '\x1b[1;' + (modifiers + 1) + 'D';
// HACK: Make Alt + left-arrow behave like Ctrl + left-arrow: move one word backwards // HACK: Make Alt + left-arrow behave like Ctrl + left-arrow: move one word backwards
@@ -2512,8 +2512,8 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
result.key = '\x1b[D'; result.key = '\x1b[D';
} }
break; break;
// right-arrow
case 39: case 39:
// right-arrow
if (modifiers) { if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'C'; result.key = '\x1b[1;' + (modifiers + 1) + 'C';
// HACK: Make Alt + right-arrow behave like Ctrl + right-arrow: move one word forward // HACK: Make Alt + right-arrow behave like Ctrl + right-arrow: move one word forward
@@ -2527,8 +2527,8 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
result.key = '\x1b[C'; result.key = '\x1b[C';
} }
break; break;
// up-arrow
case 38: case 38:
// up-arrow
if (modifiers) { if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'A'; result.key = '\x1b[1;' + (modifiers + 1) + 'A';
// HACK: Make Alt + up-arrow behave like Ctrl + up-arrow // HACK: Make Alt + up-arrow behave like Ctrl + up-arrow
@@ -2542,8 +2542,8 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
result.key = '\x1b[A'; result.key = '\x1b[A';
} }
break; break;
// down-arrow
case 40: case 40:
// down-arrow
if (modifiers) { if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'B'; result.key = '\x1b[1;' + (modifiers + 1) + 'B';
// HACK: Make Alt + down-arrow behave like Ctrl + down-arrow // HACK: Make Alt + down-arrow behave like Ctrl + down-arrow
@@ -2557,24 +2557,24 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
result.key = '\x1b[B'; result.key = '\x1b[B';
} }
break; break;
// insert
case 45: case 45:
// insert
if (!ev.shiftKey && !ev.ctrlKey) { if (!ev.shiftKey && !ev.ctrlKey) {
// <Ctrl> or <Shift> + <Insert> are used to // <Ctrl> or <Shift> + <Insert> are used to
// copy-paste on some systems. // copy-paste on some systems.
result.key = '\x1b[2~'; result.key = '\x1b[2~';
} }
break; break;
// delete
case 46: case 46:
// delete
if (modifiers) { if (modifiers) {
result.key = '\x1b[3;' + (modifiers + 1) + '~'; result.key = '\x1b[3;' + (modifiers + 1) + '~';
} else { } else {
result.key = '\x1b[3~'; result.key = '\x1b[3~';
} }
break; break;
// home
case 36: case 36:
// home
if (modifiers) if (modifiers)
result.key = '\x1b[1;' + (modifiers + 1) + 'H'; result.key = '\x1b[1;' + (modifiers + 1) + 'H';
else if (this.applicationCursor) else if (this.applicationCursor)
@@ -2582,8 +2582,8 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
else else
result.key = '\x1b[H'; result.key = '\x1b[H';
break; break;
// end
case 35: case 35:
// end
if (modifiers) if (modifiers)
result.key = '\x1b[1;' + (modifiers + 1) + 'F'; result.key = '\x1b[1;' + (modifiers + 1) + 'F';
else if (this.applicationCursor) else if (this.applicationCursor)
@@ -2591,24 +2591,24 @@ Terminal.prototype.evaluateKeyEscapeSequence = function(ev) {
else else
result.key = '\x1b[F'; result.key = '\x1b[F';
break; break;
// page up
case 33: case 33:
// page up
if (ev.shiftKey) { if (ev.shiftKey) {
result.scrollDisp = -(this.rows - 1); result.scrollDisp = -(this.rows - 1);
} else { } else {
result.key = '\x1b[5~'; result.key = '\x1b[5~';
} }
break; break;
// page down
case 34: case 34:
// page down
if (ev.shiftKey) { if (ev.shiftKey) {
result.scrollDisp = this.rows - 1; result.scrollDisp = this.rows - 1;
} else { } else {
result.key = '\x1b[6~'; result.key = '\x1b[6~';
} }
break; break;
// F1-F12
case 112: case 112:
// F1-F12
if (modifiers) { if (modifiers) {
result.key = '\x1b[1;' + (modifiers + 1) + 'P'; result.key = '\x1b[1;' + (modifiers + 1) + 'P';
} else { } else {