Merge branch 'master' into 760_erase_in_display_scroll_bar

.travis.yml

@@ -1,18 +1,18 @@
 language: node_js
+os:
+  - linux
+  - osx
 node_js:
   - 6
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq install g++-4.8 ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-4.8 ; fi
 env:
-  global:
-    - CXX=g++-4.8
   matrix:
     - NPM_COMMAND=lint
     - NPM_COMMAND=test
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
 notifications:
   email: false
 script: npm run $NPM_COMMAND

README.md

@@ -38,6 +38,8 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Eclipse Orion**](https://orionhub.org): A modern, open source software development environment that runs in the cloud. Code, deploy and run in the cloud.
 - [**Gravitational Teleport**](https://github.com/gravitational/teleport): Gravitational Teleport is a modern SSH server for remotely accessing clusters of Linux servers via SSH or HTTPS.
 - [**Hexlet**](https://en.hexlet.io): Practical programming courses (JavaScript, PHP, Unix, databases, functional programming). A steady path from the first line of code to the first job. 
+- [**Selenoid UI**](https://github.com/aerokube/selenoid-ui): Simple UI for the scallable golang implementation of Selenium Hub named Selenoid. We use XTerm for streaming logs over websockets from docker containers.
+
 
 Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it in our list.
 
@@ -135,6 +137,6 @@ To contribute either code, documentation or issues to xterm.js please read the [
 
 If you contribute code to this project, you are implicitly allowing your code to be distributed under the MIT license. You are also implicitly verifying that all code is your original work.
 
-Copyright (c) 2014-2016, SourceLair, Private Company ([www.sourcelair.com](https://www.sourcelair.com/home)) (MIT License)
+Copyright (c) 2014-2017, SourceLair, Private Company ([www.sourcelair.com](https://www.sourcelair.com/home)) (MIT License)
 
 Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "xterm.js",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "ignore": ["demo", "test", ".gitignore"],
   "main": [
     "dist/xterm.js",

dist/xterm.js

@@ -430,6 +430,9 @@ var InputHandler = (function () {
                         this._terminal.y--;
                         this._terminal.scroll(true);
                     }
+                    else {
+                        this._terminal.lines.get(this._terminal.y).isWrapped = true;
+                    }
                 }
                 else {
                     if (ch_width === 2)

gulpfile.js

@@ -50,7 +50,7 @@ gulp.task('browserify', ['tsc'], function() {
   let browserifyOptions = {
     basedir: buildDir,
     debug: true,
-    entries: [`../${outDir}/xterm.js`],
+    entries: [`${outDir}/xterm.js`],
     standalone: 'Terminal',
     cache: {},
     packageCache: {}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "ignore": [
     "demo",
     "test",
@@ -36,7 +36,7 @@
   ],
   "devDependencies": {
     "@types/chai": "^3.4.34",
-    "@types/jsdom": "^2.0.30",
+    "@types/jsdom": "^11.0.1",
     "@types/mocha": "^2.2.33",
     "@types/node": "^6.0.41",
     "browserify": "^13.1.0",
@@ -54,11 +54,10 @@
     "gulp-sourcemaps": "1.9.1",
     "gulp-typescript": "^3.1.3",
     "jsdoc": "3.4.3",
-    "jsdom": "^9.11.0",
+    "jsdom": "^11.1.0",
     "merge-stream": "^1.0.1",
     "node-pty": "^0.4.1",
     "nodemon": "1.10.2",
-    "sleep": "^3.0.1",
     "sorcery": "^0.10.0",
     "tslint": "^4.0.2",
     "typescript": "~2.2.0",

src/InputHandler.ts

@@ -56,8 +56,13 @@ export class InputHandler implements IInputHandler {
           this._terminal.x = 0;
           this._terminal.y++;
           if (this._terminal.y > this._terminal.scrollBottom) {
+            // Insert a new line, scroll and mark as a wrapped line
             this._terminal.y--;
             this._terminal.scroll(true);
+          } else {
+            // The line already exists (eg. the initial viewport), mark it as a
+            // wrapped line
+            this._terminal.lines.get(this._terminal.y).isWrapped = true;
           }
         } else {
           if (ch_width === 2)  // FIXME: check for xterm behavior

src/Linkifier.test.ts

@@ -17,6 +17,7 @@ class TestLinkifier extends Linkifier {
 }
 
 describe('Linkifier', () => {
+  let dom: jsdom.JSDOM;
   let window: Window;
   let document: Document;
 
@@ -24,13 +25,11 @@ describe('Linkifier', () => {
   let rows: HTMLElement[];
   let linkifier: TestLinkifier;
 
-  beforeEach(done => {
-    jsdom.env('', (err, w) => {
-      window = w;
-      document = window.document;
-      linkifier = new TestLinkifier();
-      done();
-    });
+  beforeEach(() => {
+    dom = new jsdom.JSDOM('');
+    window = dom.window;
+    document = window.document;
+    linkifier = new TestLinkifier();
   });
 
   function addRow(html: string) {

src/SelectionManager.test.ts

@@ -31,6 +31,7 @@ class TestSelectionManager extends SelectionManager {
 }
 
 describe('SelectionManager', () => {
+  let dom: jsdom.JSDOM;
   let window: Window;
   let document: Document;
 
@@ -39,15 +40,13 @@ describe('SelectionManager', () => {
   let rowContainer: HTMLElement;
   let selectionManager: TestSelectionManager;
 
-  beforeEach(done => {
-    jsdom.env('', (err, w) => {
-      window = w;
-      document = window.document;
-      buffer = new CircularList<any>(100);
-      terminal = <any>{ cols: 80, rows: 2 };
-      selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
-      done();
-    });
+  beforeEach(() => {
+    dom = new jsdom.JSDOM('');
+    window = dom.window;
+    document = window.document;
+    buffer = new CircularList<any>(100);
+    terminal = <any>{ cols: 80, rows: 2 };
+    selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
   });
 
   function stringToRow(text: string): [number, string, number][] {

src/test/escape-sequences-test.js

@@ -2,7 +2,6 @@ var glob = require('glob');
 var fs = require('fs');
 var os = require('os');
 var pty = require('node-pty');
-var sleep = require('sleep');
 var Terminal = require('../xterm');
 
 if (os.platform() === 'win32') {
@@ -25,17 +24,18 @@ var primitive_pty = pty.native.open(COLS, ROWS);
 // we just pipe the data from slave to master as a child program would do
 // pty.js opens pipe fds with O_NONBLOCK
 // just wait 10ms instead of setting fds to blocking mode
-function pty_write_read(s) {
+function ptyWriteRead(s, cb) {
   fs.writeSync(primitive_pty.slave, s);
-  sleep.usleep(10000);
-  var b = Buffer(64000);
-  var bytes = fs.readSync(primitive_pty.master, b, 0, 64000);
-  return b.toString('utf8', 0, bytes);
+  setTimeout(() => {
+    var b = Buffer(64000);
+    var bytes = fs.readSync(primitive_pty.master, b, 0, 64000);
+    cb(b.toString('utf8', 0, bytes));
+  });
 }
 
 // make sure raw pty is at x=0 and has no pending data
-function pty_reset() {
-    pty_write_read('\r\n');
+function ptyReset(cb) {
+    ptyWriteRead('\r\n', cb);
 }
 
 /* debug helpers */
@@ -97,35 +97,42 @@ describe('xterm output comparison', function() {
     51, 52, 54, 55, 56, 57, 58, 59, 60, 61,
     63, 68
   ];
+  if (os.platform() === 'darwin') {
+    // These are failing on macOS only
+    skip.push(3, 7, 11, 67);
+  }
   for (var i = 0; i < files.length; i++) {
     if (skip.indexOf(i) >= 0) {
       continue;
     }
     (function(filename) {
-      it(filename.split('/').slice(-1)[0], function () {
-        pty_reset();
-        var in_file = fs.readFileSync(filename, 'utf8');
-        var from_pty = pty_write_read(in_file);
-        // uncomment this to get log from terminal
-        //console.log = function(){};
+      it(filename.split('/').slice(-1)[0], done => {
+        ptyReset(() => {
+          var in_file = fs.readFileSync(filename, 'utf8');
+          ptyWriteRead(in_file, from_pty => {
+            // uncomment this to get log from terminal
+            //console.log = function(){};
 
-        // Perform a synchronous .write(data)
-        xterm.writeBuffer.push(from_pty);
-        xterm.innerWrite();
+            // Perform a synchronous .write(data)
+            xterm.writeBuffer.push(from_pty);
+            xterm.innerWrite();
 
-        var from_emulator = terminalToString(xterm);
-        console.log = CONSOLE_LOG;
-        var expected = fs.readFileSync(filename.split('.')[0] + '.text', 'utf8');
-        // Some of the tests have whitespace on the right of lines, we trim all the linex
-        // from xterm.js so ignore this for now at least.
-        var expectedRightTrimmed = expected.split('\n').map(function (l) {
-          return l.replace(/\s+$/, '');
-        }).join('\n');
-        if (from_emulator != expectedRightTrimmed) {
-          // uncomment to get noisy output
-          throw new Error(formatError(in_file, from_emulator, expected));
-        //   throw new Error('mismatch');
-        }
+            var from_emulator = terminalToString(xterm);
+            console.log = CONSOLE_LOG;
+            var expected = fs.readFileSync(filename.split('.')[0] + '.text', 'utf8');
+            // Some of the tests have whitespace on the right of lines, we trim all the linex
+            // from xterm.js so ignore this for now at least.
+            var expectedRightTrimmed = expected.split('\n').map(function (l) {
+              return l.replace(/\s+$/, '');
+            }).join('\n');
+            if (from_emulator != expectedRightTrimmed) {
+              // uncomment to get noisy output
+              throw new Error(formatError(in_file, from_emulator, expected));
+            //   throw new Error('mismatch');
+            }
+            done();
+          });
+        });
       });
     })(files[i]);
   }

src/utils/CharMeasure.test.ts

@@ -7,21 +7,19 @@ import { ICharMeasure, ITerminal } from '../Interfaces';
 import { CharMeasure } from './CharMeasure';
 
 describe('CharMeasure', () => {
+  let dom: jsdom.JSDOM;
   let window: Window;
   let document: Document;
-
   let container: HTMLElement;
   let charMeasure: ICharMeasure;
 
-  beforeEach(done => {
-    jsdom.env('', (err, w) => {
-      window = w;
-      document = window.document;
-      container = document.createElement('div');
-      document.body.appendChild(container);
-      charMeasure = new CharMeasure(document, container);
-      done();
-    });
+  beforeEach(() => {
+    dom = new jsdom.JSDOM('');
+    window = dom.window;
+    document = window.document;
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    charMeasure = new CharMeasure(document, container);
   });
 
   describe('measure', () => {