From a36a17928dc3ccf027c81832b3cadff0d3818d3e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 6 Jan 2018 07:18:07 -0600 Subject: [PATCH 1/4] Ship the declaration files --- gulpfile.js | 11 ++++++++--- src/addons/attach/tsconfig.json | 3 ++- src/addons/fit/tsconfig.json | 3 ++- src/addons/fullscreen/tsconfig.json | 3 ++- src/addons/search/tsconfig.json | 3 ++- src/addons/terminado/tsconfig.json | 3 ++- src/addons/winptyCompat/tsconfig.json | 3 ++- src/addons/zmodem/tsconfig.json | 3 ++- tsconfig.json | 3 ++- 9 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 49d67ed6..804cad35 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -51,9 +51,14 @@ gulp.task('tsc', function () { let tsProjectAddon = ts.createProject(`./src/addons/${addon}/tsconfig.json`); let tsResultAddon = tsProjectAddon.src().pipe(sourcemaps.init()).pipe(tsProjectAddon()); - let tscAddon = tsResultAddon.js - .pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})) - .pipe(gulp.dest(`${outDir}/addons/${addon}`)); + let tscAddon = merge( + tsResultAddon.js + .pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})) + .pipe(gulp.dest(`${outDir}/addons/${addon}`)), + tsResultAddon.dts + .pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})) + .pipe(gulp.dest(`${outDir}/addons/${addon}`)) + ) return tscAddon; }); diff --git a/src/addons/attach/tsconfig.json b/src/addons/attach/tsconfig.json index 97722324..a4e8e78b 100644 --- a/src/addons/attach/tsconfig.json +++ b/src/addons/attach/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/attach/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/fit/tsconfig.json b/src/addons/fit/tsconfig.json index 949f8b60..78b3c410 100644 --- a/src/addons/fit/tsconfig.json +++ b/src/addons/fit/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/fit/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/fullscreen/tsconfig.json b/src/addons/fullscreen/tsconfig.json index b04144c1..35ecb7ce 100644 --- a/src/addons/fullscreen/tsconfig.json +++ b/src/addons/fullscreen/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/fullscreen/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/search/tsconfig.json b/src/addons/search/tsconfig.json index 7f72e47f..d1c3d7e0 100644 --- a/src/addons/search/tsconfig.json +++ b/src/addons/search/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/search/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/terminado/tsconfig.json b/src/addons/terminado/tsconfig.json index 775b20d5..84e3ac32 100644 --- a/src/addons/terminado/tsconfig.json +++ b/src/addons/terminado/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/terminado/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/winptyCompat/tsconfig.json b/src/addons/winptyCompat/tsconfig.json index e15a09a8..a51f7332 100644 --- a/src/addons/winptyCompat/tsconfig.json +++ b/src/addons/winptyCompat/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/winptyCompat/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/src/addons/zmodem/tsconfig.json b/src/addons/zmodem/tsconfig.json index 9ded72e5..abae1238 100644 --- a/src/addons/zmodem/tsconfig.json +++ b/src/addons/zmodem/tsconfig.json @@ -5,6 +5,7 @@ "rootDir": ".", "outDir": "../../../lib/addons/zmodem/", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true } } diff --git a/tsconfig.json b/tsconfig.json index 38bfd2fa..a3aa790c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,8 @@ "rootDir": "src", "outDir": "lib", "sourceMap": true, - "removeComments": true + "removeComments": true, + "declaration": true }, "include": [ "src/**/*" From 83921c0b26874216ee9c28ebab8d523acf5ff63e Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 Jan 2018 09:23:05 +0100 Subject: [PATCH 2/4] Add support for modifiers for PageUp / PageDown keys. This allows using Ctrl-PageUp/Down and Alt-PageUp/Down. --- src/Terminal.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Terminal.ts b/src/Terminal.ts index f95cc0ea..6e4d1aa0 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -1573,6 +1573,8 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT // page up if (ev.shiftKey) { result.scrollLines = -(this.rows - 1); + } else if (modifiers) { + result.key = C0.ESC + '[5;' + (modifiers + 1) + '~'; } else { result.key = C0.ESC + '[5~'; } @@ -1581,6 +1583,8 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT // page down if (ev.shiftKey) { result.scrollLines = this.rows - 1; + } else if (modifiers) { + result.key = C0.ESC + '[6;' + (modifiers + 1) + '~'; } else { result.key = C0.ESC + '[6~'; } From b1beee3595067600d9cacc462fa85286f57c9978 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 18 Jan 2018 07:54:45 -0800 Subject: [PATCH 3/4] Fix cursor lagging behind when blink is on Fixes #1216 --- src/renderer/CursorRenderLayer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/renderer/CursorRenderLayer.ts b/src/renderer/CursorRenderLayer.ts index 689d6914..f4e3c54f 100644 --- a/src/renderer/CursorRenderLayer.ts +++ b/src/renderer/CursorRenderLayer.ts @@ -108,9 +108,10 @@ export class CursorRenderLayer extends BaseRenderLayer { } public onGridChanged(terminal: ITerminal, startRow: number, endRow: number): void { - // Only render if the animation frame is not active if (!this._cursorBlinkStateManager || this._cursorBlinkStateManager.isPaused) { this._render(terminal, false); + } else { + this._cursorBlinkStateManager.restartBlinkAnimation(terminal); } } From 2253e666e72770275fd1cb6c79fff42bdf92323f Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 18 Jan 2018 09:39:32 -0800 Subject: [PATCH 4/4] Remove OSX from travis Builds take too long on free tier --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1878c3a4..7a37af1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: node_js os: - linux - - osx node_js: - 6 before_install: