Bump version to 2.5.0

Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>
Merge pull request #627 from Tyriar/591_element_on_validation
2017-04-05 18:48:57 +00:00 · 2017-04-05 11:34:34 -07:00 · 2017-04-04 09:50:04 -07:00 · 2017-04-04 09:41:19 -07:00 · 2017-04-04 09:35:52 -07:00 · 2017-04-04 09:33:53 -07:00
31 changed files with 1324 additions and 472 deletions
@@ -13,3 +13,6 @@ npm-debug.log
 .env
 build/
 .vscode/
+
+# Directories needed for code coverage
+/coverage/
@@ -16,3 +16,4 @@ addons:
 notifications:
  email: false
 script: npm run $NPM_COMMAND
+after_success: npm run coveralls
@@ -13,22 +13,29 @@ Benjamin Fischer <benjamin.fischer@rwth-aachen.de>
 Bill Church <billchurch@users.noreply.github.com>
 Bob Reid <bobreid@Bobs-MacBook-Pro.local>
 bottleofwater <nison.mael+bottleofwater@gmail.com>
+Brian Mock <brian@mockbrian.com>
 Carson Anderson <carson@betterservers.com>
 Christian Budde Christensen <budde377@gmail.com>
 Christopher Jeffrey <chjjeffrey@gmail.com>
+coderaiser <mnemonic.enemy@gmail.com>
 Daniel Imms <daimms@microsoft.com>
 Daniel Risacher <drisacher@gmail.com>
 Dan Kaplun <dbkaplun@twitch.tv>
 Darin Morrison <freebroccolo@users.noreply.github.com>
+Edgar Andrés Margffoy Tuay <andfoy@gmail.com>
 Elliot Saba <staticfloat@gmail.com>
 hiro-su <h.sugipon@gmail.com>
 Ian Lewis <ianlewis@google.com>
 imoses <ido@twiggle.com>
+InDieTasten <indietasten@gmail.com>
 Jean Bruenn <himself@jeanbruenn.info>
 Jörg Breitbart <jerch@rockborn.de>
 Lucian Buzzo <lucian.buzzo@gmail.com>
 Maël Nison <nison.mael@gmail.com>
+Martin Wang <jiahaow@ca.ibm.com>
+Michael Irwin <mikesir87@gmail.com>
 Mikko Karvonen <mikko.karvonen@arm.com>
+Nicolas Ramz <nicolas.ramz@gmail.com>
 Paris Kasidiaris <pariskasidiaris@gmail.com>
 Paris Kasidiaris <paris@sourcelair.com>
 runarberg <runar@greenqloud.com>
@@ -39,4 +46,5 @@ Thanasis Daglis <thanasis@sourcelair.com>
 Tine Jozelj <tine.jozelj@outlook.com>
 Tyler Jewell <tjewell@codenvy.com>
 Vincent Woo <me@vincentwoo.com>
+yutaka <shigure@refy.net>
 YuviPanda <yuvipanda@gmail.com>
@@ -1,6 +1,6 @@
-# xterm.js
+# [![xterm.js logo](logo.png)](https://xtermjs.org)

-[![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg)](https://travis-ci.org/sourcelair/xterm.js) [![Gitter](https://badges.gitter.im/sourcelair/xterm.js.svg)](https://gitter.im/sourcelair/xterm.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg)](https://travis-ci.org/sourcelair/xterm.js) [![Coverage Status](https://coveralls.io/repos/github/sourcelair/xterm.js/badge.svg)](https://coveralls.io/github/sourcelair/xterm.js) [![Gitter](https://badges.gitter.im/sourcelair/xterm.js.svg)](https://gitter.im/sourcelair/xterm.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

 Xterm.js is a terminal front-end component written in JavaScript that works in the browser.

@@ -30,6 +30,8 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Codenvy**](http://www.codenvy.com): Cloud workspaces for development teams.
 - [**CoderPad**](https://coderpad.io): Online interviewing platform for programmers. Run code in many programming languages, with results displayed by `xterm.js`.
 - [**WebSSH2**](https://github.com/billchurch/WebSSH2): A web based SSH2 client using `xterm.js`, socket.io, and ssh2.
+- [**Spyder Terminal**](https://github.com/spyder-ide/spyder-terminal): A full fledged system terminal embedded on Spyder IDE. 
+- [**Cloud Commander**](https://cloudcmd.io "Cloud Commander"): Orthodox web file manager with console and editor.

 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.

@@ -48,14 +50,29 @@ Xterm.js works seamlessly in Electron apps and may even work on earlier versions

 ## Demo

-To launch the demo simply run:
+### Linux or macOS
+
+Run the following commands:

 ```
-npm install
-npm start
+$ npm install
+$ npm start
 ```

-Then open http://0.0.0.0:3000 in a web browser (use http://127.0.0.1:3000 if running under Windows).
+Then open http://0.0.0.0:3000 in a web browser.
+
+### Windows
+
+First, ensure [node-gyp](https://github.com/nodejs/node-gyp) is installed and configured correctly, then run these commands.
+
+Note: Do not use ConEmu, as it seems to break the demo for some reason.
+
+```
+> npm install
+> npm start
+```
+
+Then open http://127.0.0.1:3000 in a web browser.

 ## Getting Started

@@ -71,13 +88,13 @@ To start using xterm.js on your browser, add the `xterm.js` and `xterm.css` to t
      <div id="terminal"></div>
      <script>
      	var term = new Terminal();
-        term.open(document.getElementById('#terminal'));
+        term.open(document.getElementById('terminal'));
        term.write('Hello from \033[1;3;31mxterm.js\033[0m $ ')
      </script>
    </body>
  </html>
 ```
-Finally instantiate the `Terminal` object and then call the `open` function with the DOM object of the `div`.  
+Finally instantiate the `Terminal` object and then call the `open` function with the DOM object of the `div`.

 ## Addons

@@ -106,27 +123,7 @@ The existing releases are available at this GitHub repo's [Releases](https://git

 Xterm.js is maintained by [SourceLair](https://www.sourcelair.com/) and a few external contributors, but we would love to receive contributions from everyone!

-To contribute either code, documentation or issues to xterm.js please read the [Contributing document](CONTRIBUTING.md) before.
-
-The development of xterm.js does not require any special tool. All you need is an editor that supports JavaScript and a browser (if you would like to run the demo you will need Node.js to get all features).
-
-It is recommended though to use a development tool that uses xterm.js internally, to develop for xterm.js. [Eating our own dogfood](https://en.wikipedia.org/wiki/Eating_your_own_dog_food) has been proved extremely beneficial for this project. Known tools that use xterm.js internally are:
-
-#### [SourceLair](https://www.sourcelair.com)
-
-Visit https://lair.io/sourcelair/xterm and follow the instructions. All development will happen in your browser.
-
-#### [Visual Studio Code](http://code.visualstudio.com/)
-
-[Download Visual Studio Code](http://code.visualstudio.com/Download), clone xterm.js and you are all set.
-
-#### [Eclipse Che](http://www.eclipse.org/che)
-
-You can start Eclipse Che with `docker run eclipse/che start`.
-
-#### [Codenvy](http://www.codenvy.io)
-
-You can create a trial account or install an enterprise version with `docker run codenvy/cli start`.
+To contribute either code, documentation or issues to xterm.js please read the [Contributing document](CONTRIBUTING.md) beforehand. The development of xterm.js does not require any special tool. All you need is an editor that supports JavaScript/TypeScript and a browser. You will need Node.js installed locally to get all the features working in the demo.

 ## License Agreement

@@ -1,6 +1,6 @@
 {
  "name": "xterm.js",
-  "version": "2.3.2",
+  "version": "2.5.0",
  "ignore": ["demo", "test", ".gitignore"],
  "main": [
    "dist/xterm.js",
@@ -69,7 +69,7 @@ app.ws('/terminals/:pid', function (ws, req) {
    term.write(msg);
  });
  ws.on('close', function () {
-    process.kill(term.pid);
+    term.kill();
    console.log('Closed terminal ' + term.pid);
    // Clean things up
    delete terminals[term.pid];
@@ -32,6 +32,9 @@
  var exports = {};

  exports.proposeGeometry = function (term) {
+    if (!term.element.parentElement) {
+      return null;
+    }
    var parentElementStyle = window.getComputedStyle(term.element.parentElement),
        parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
        parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17),
@@ -53,7 +56,7 @@
    subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace
    characterWidth = subjectRow.getBoundingClientRect().width;
    subjectRow.style.display = ''; // Revert style before calculating height, since they differ.
-    characterHeight = parseInt(subjectRow.offsetHeight);
+    characterHeight = subjectRow.getBoundingClientRect().height;
    subjectRow.innerHTML = contentBuffer;

    rows = parseInt(availableHeight / characterHeight);
@@ -66,7 +69,9 @@
  exports.fit = function (term) {
    var geometry = exports.proposeGeometry(term);

-    term.resize(geometry.cols, geometry.rows);
+    if (geometry) {
+      term.resize(geometry.cols, geometry.rows);
+    }
  };

  Xterm.prototype.proposeGeometry = function () {
@@ -71,7 +71,22 @@
    resize: none;
 }

-.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
+.terminal a {
+    color: inherit;
+    text-decoration: none;
+}
+
+.terminal a:hover {
+    cursor: pointer;
+    text-decoration: underline;
+}
+
+.terminal a.xterm-invalid-link:hover {
+    cursor: text;
+    text-decoration: none;
+}
+
+.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
    background-color: #fff;
    color: #000;
 }
@@ -82,19 +97,9 @@
    background-color: transparent;
 }

-.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink .terminal-cursor {
-    animation: xterm-cursor-blink 1.2s infinite step-end;
-}
-
-@keyframes xterm-cursor-blink {
-    0% {
-        background-color: #fff;
-        color: #000;
-    }
-    50% {
-        background-color: transparent;
-        color: #FFF;
-    }
+.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on .terminal-cursor {
+    background-color: transparent;
+    color: inherit;
 }

 .terminal.xterm-cursor-style-bar .terminal-cursor,
@@ -120,13 +125,13 @@
    right: 0;
    height: 1px;
 }
+.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before,
+.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before {
+    background-color: transparent;
+}
 .terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
 .terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
-    animation: xterm-cursor-non-bar-blink 1.2s infinite step-end;
-}
-@keyframes xterm-cursor-non-bar-blink {
-    0% { background-color: #fff; }
-    50% { background-color: transparent; }
+    background-color: #fff;
 }

 .terminal .composition-view {
@@ -1,5 +1,6 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Terminal = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.CHARSETS = {};
 exports.DEFAULT_CHARSET = exports.CHARSETS['B'];
 exports.CHARSETS['0'] = {
@@ -162,6 +163,7 @@ exports.CHARSETS['='] = {

 },{}],2:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var CompositionHelper = (function () {
    function CompositionHelper(textarea, compositionView, terminal) {
        this.textarea = textarea;
@@ -288,6 +290,7 @@ exports.CompositionHelper = CompositionHelper;

 },{}],3:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C0;
 (function (C0) {
    C0.NUL = '\x00';
@@ -331,6 +334,7 @@ var C0;

 },{}],4:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 ;
 var EventEmitter = (function () {
    function EventEmitter() {
@@ -388,6 +392,7 @@ exports.EventEmitter = EventEmitter;

 },{}],5:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var EscapeSequences_1 = require("./EscapeSequences");
 var Charsets_1 = require("./Charsets");
 var InputHandler = (function () {
@@ -632,7 +637,12 @@ var InputHandler = (function () {
                    this._terminal.eraseLine(j);
                break;
            case 3:
-                ;
+                var scrollBackSize = this._terminal.lines.length - this._terminal.rows;
+                if (scrollBackSize > 0) {
+                    this._terminal.lines.trimStart(scrollBackSize);
+                    this._terminal.ybase = Math.max(this._terminal.ybase - scrollBackSize, 0);
+                    this._terminal.ydisp = Math.max(this._terminal.ydisp - scrollBackSize, 0);
+                }
                break;
        }
    };
@@ -1163,7 +1173,7 @@ var InputHandler = (function () {
        this._terminal.cursorHidden = false;
        this._terminal.insertMode = false;
        this._terminal.originMode = false;
-        this._terminal.wraparoundMode = false;
+        this._terminal.wraparoundMode = true;
        this._terminal.applicationKeypad = false;
        this._terminal.viewport.syncScrollArea();
        this._terminal.applicationCursor = false;
@@ -1314,6 +1324,234 @@ var wcwidth = (function (opts) {

 },{"./Charsets":1,"./EscapeSequences":3}],6:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var INVALID_LINK_CLASS = 'xterm-invalid-link';
+var protocolClause = '(https?:\\/\\/)';
+var domainCharacterSet = '[\\da-z\\.-]+';
+var negatedDomainCharacterSet = '[^\\da-z\\.-]+';
+var domainBodyClause = '(' + domainCharacterSet + ')';
+var tldClause = '([a-z\\.]{2,6})';
+var ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
+var localHostClause = '(localhost)';
+var portClause = '(:\\d{1,5})';
+var hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
+var pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
+var queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
+var queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
+var hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
+var negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
+var bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;
+var start = '(?:^|' + negatedDomainCharacterSet + ')(';
+var end = ')($|' + negatedPathCharacterSet + ')';
+var strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);
+var HYPERTEXT_LINK_MATCHER_ID = 0;
+var Linkifier = (function () {
+    function Linkifier() {
+        this._nextLinkMatcherId = HYPERTEXT_LINK_MATCHER_ID;
+        this._rowTimeoutIds = [];
+        this._linkMatchers = [];
+        this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });
+    }
+    Linkifier.prototype.attachToDom = function (document, rows) {
+        this._document = document;
+        this._rows = rows;
+    };
+    Linkifier.prototype.linkifyRow = function (rowIndex) {
+        if (!this._document) {
+            return;
+        }
+        var timeoutId = this._rowTimeoutIds[rowIndex];
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+        this._rowTimeoutIds[rowIndex] = setTimeout(this._linkifyRow.bind(this, rowIndex), Linkifier.TIME_BEFORE_LINKIFY);
+    };
+    Linkifier.prototype.setHypertextLinkHandler = function (handler) {
+        this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].handler = handler;
+    };
+    Linkifier.prototype.setHypertextValidationCallback = function (callback) {
+        this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].validationCallback = callback;
+    };
+    Linkifier.prototype.registerLinkMatcher = function (regex, handler, options) {
+        if (options === void 0) { options = {}; }
+        if (this._nextLinkMatcherId !== HYPERTEXT_LINK_MATCHER_ID && !handler) {
+            throw new Error('handler must be defined');
+        }
+        var matcher = {
+            id: this._nextLinkMatcherId++,
+            regex: regex,
+            handler: handler,
+            matchIndex: options.matchIndex,
+            validationCallback: options.validationCallback,
+            priority: options.priority || 0
+        };
+        this._addLinkMatcherToList(matcher);
+        return matcher.id;
+    };
+    Linkifier.prototype._addLinkMatcherToList = function (matcher) {
+        if (this._linkMatchers.length === 0) {
+            this._linkMatchers.push(matcher);
+            return;
+        }
+        for (var i = this._linkMatchers.length - 1; i >= 0; i--) {
+            if (matcher.priority <= this._linkMatchers[i].priority) {
+                this._linkMatchers.splice(i + 1, 0, matcher);
+                return;
+            }
+        }
+        this._linkMatchers.splice(0, 0, matcher);
+    };
+    Linkifier.prototype.deregisterLinkMatcher = function (matcherId) {
+        for (var i = 1; i < this._linkMatchers.length; i++) {
+            if (this._linkMatchers[i].id === matcherId) {
+                this._linkMatchers.splice(i, 1);
+                return true;
+            }
+        }
+        return false;
+    };
+    Linkifier.prototype._linkifyRow = function (rowIndex) {
+        var row = this._rows[rowIndex];
+        if (!row) {
+            return;
+        }
+        var text = row.textContent;
+        for (var i = 0; i < this._linkMatchers.length; i++) {
+            var matcher = this._linkMatchers[i];
+            var linkElements = this._doLinkifyRow(row, matcher);
+            if (linkElements.length > 0) {
+                if (matcher.validationCallback) {
+                    var _loop_1 = function (j) {
+                        var element = linkElements[j];
+                        matcher.validationCallback(element.textContent, element, function (isValid) {
+                            if (!isValid) {
+                                element.classList.add(INVALID_LINK_CLASS);
+                            }
+                        });
+                    };
+                    for (var j = 0; j < linkElements.length; j++) {
+                        _loop_1(j);
+                    }
+                }
+                return;
+            }
+        }
+    };
+    Linkifier.prototype._doLinkifyRow = function (row, matcher) {
+        var result = [];
+        var isHttpLinkMatcher = matcher.id === HYPERTEXT_LINK_MATCHER_ID;
+        var nodes = row.childNodes;
+        var match = row.textContent.match(matcher.regex);
+        if (!match || match.length === 0) {
+            return result;
+        }
+        var uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
+        var rowStartIndex = match.index + uri.length;
+        for (var i = 0; i < nodes.length; i++) {
+            var node = nodes[i];
+            var searchIndex = node.textContent.indexOf(uri);
+            if (searchIndex >= 0) {
+                var linkElement = this._createAnchorElement(uri, matcher.handler, isHttpLinkMatcher);
+                if (node.textContent.length === uri.length) {
+                    if (node.nodeType === 3) {
+                        this._replaceNode(node, linkElement);
+                    }
+                    else {
+                        var element = node;
+                        if (element.nodeName === 'A') {
+                            return result;
+                        }
+                        element.innerHTML = '';
+                        element.appendChild(linkElement);
+                    }
+                }
+                else {
+                    var nodesAdded = this._replaceNodeSubstringWithNode(node, linkElement, uri, searchIndex);
+                    i += nodesAdded;
+                }
+                result.push(linkElement);
+                match = row.textContent.substring(rowStartIndex).match(matcher.regex);
+                if (!match || match.length === 0) {
+                    return result;
+                }
+                uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
+                rowStartIndex += match.index + uri.length;
+            }
+        }
+        return result;
+    };
+    Linkifier.prototype._createAnchorElement = function (uri, handler, isHypertextLinkHandler) {
+        var element = this._document.createElement('a');
+        element.textContent = uri;
+        element.draggable = false;
+        if (isHypertextLinkHandler) {
+            element.href = uri;
+            element.target = '_blank';
+            element.addEventListener('click', function (event) {
+                if (handler) {
+                    return handler(event, uri);
+                }
+            });
+        }
+        else {
+            element.addEventListener('click', function (event) {
+                if (element.classList.contains(INVALID_LINK_CLASS)) {
+                    return;
+                }
+                return handler(event, uri);
+            });
+        }
+        return element;
+    };
+    Linkifier.prototype._replaceNode = function (oldNode) {
+        var newNodes = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            newNodes[_i - 1] = arguments[_i];
+        }
+        var parent = oldNode.parentNode;
+        for (var i = 0; i < newNodes.length; i++) {
+            parent.insertBefore(newNodes[i], oldNode);
+        }
+        parent.removeChild(oldNode);
+    };
+    Linkifier.prototype._replaceNodeSubstringWithNode = function (targetNode, newNode, substring, substringIndex) {
+        var node = targetNode;
+        if (node.nodeType !== 3) {
+            node = node.childNodes[0];
+        }
+        if (node.childNodes.length === 0 && node.nodeType !== 3) {
+            throw new Error('targetNode must be a text node or only contain a single text node');
+        }
+        var fullText = node.textContent;
+        if (substringIndex === 0) {
+            var rightText_1 = fullText.substring(substring.length);
+            var rightTextNode_1 = this._document.createTextNode(rightText_1);
+            this._replaceNode(node, newNode, rightTextNode_1);
+            return 0;
+        }
+        if (substringIndex === targetNode.textContent.length - substring.length) {
+            var leftText_1 = fullText.substring(0, substringIndex);
+            var leftTextNode_1 = this._document.createTextNode(leftText_1);
+            this._replaceNode(node, leftTextNode_1, newNode);
+            return 0;
+        }
+        var leftText = fullText.substring(0, substringIndex);
+        var leftTextNode = this._document.createTextNode(leftText);
+        var rightText = fullText.substring(substringIndex + substring.length);
+        var rightTextNode = this._document.createTextNode(rightText);
+        this._replaceNode(node, leftTextNode, newNode, rightTextNode);
+        return 1;
+    };
+    return Linkifier;
+}());
+Linkifier.TIME_BEFORE_LINKIFY = 200;
+exports.Linkifier = Linkifier;
+
+
+
+},{}],7:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var EscapeSequences_1 = require("./EscapeSequences");
 var Charsets_1 = require("./Charsets");
 var normalStateHandler = {};
@@ -1787,8 +2025,9 @@ exports.Parser = Parser;



-},{"./Charsets":1,"./EscapeSequences":3}],7:[function(require,module,exports){
+},{"./Charsets":1,"./EscapeSequences":3}],8:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var MAX_REFRESH_FRAME_SKIP = 5;
 var FLAGS;
 (function (FLAGS) {
@@ -1807,7 +2046,7 @@ var Renderer = (function () {
        this._refreshFramesSkipped = 0;
        this._refreshAnimationFrame = null;
        if (brokenBold === null) {
-            brokenBold = checkBoldBroken(this._terminal.document);
+            brokenBold = checkBoldBroken(this._terminal.element);
        }
    }
    Renderer.prototype.queueRefresh = function (start, end) {
@@ -1984,22 +2223,25 @@ var Renderer = (function () {
    return Renderer;
 }());
 exports.Renderer = Renderer;
-function checkBoldBroken(document) {
-    var body = document.getElementsByTagName('body')[0];
+function checkBoldBroken(terminal) {
+    var document = terminal.ownerDocument;
    var el = document.createElement('span');
    el.innerHTML = 'hello world';
-    body.appendChild(el);
-    var w1 = el.scrollWidth;
+    terminal.appendChild(el);
+    var w1 = el.offsetWidth;
+    var h1 = el.offsetHeight;
    el.style.fontWeight = 'bold';
-    var w2 = el.scrollWidth;
-    body.removeChild(el);
-    return w1 !== w2;
+    var w2 = el.offsetWidth;
+    var h2 = el.offsetHeight;
+    terminal.removeChild(el);
+    return w1 !== w2 || h1 !== h2;
 }



-},{}],8:[function(require,module,exports){
+},{}],9:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Viewport = (function () {
    function Viewport(terminal, viewportElement, scrollArea, charMeasure) {
        var _this = this;
@@ -2075,8 +2317,9 @@ exports.Viewport = Viewport;



-},{}],9:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function prepareTextForClipboard(text) {
    var space = String.fromCharCode(32), nonBreakingSpace = String.fromCharCode(160), allNonBreakingSpaces = new RegExp(nonBreakingSpace, 'g'), processedText = text.split('\n').map(function (line) {
        var processedLine = line.replace(/\s+$/g, '').replace(allNonBreakingSpaces, space);
@@ -2156,8 +2399,9 @@ exports.rightClickHandler = rightClickHandler;



-},{}],10:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Generic_1 = require("./Generic");
 var isNode = (typeof navigator === 'undefined') ? true : false;
 var userAgent = (isNode) ? 'node' : navigator.userAgent;
@@ -2171,18 +2415,25 @@ exports.isMSWindows = Generic_1.contains(['Windows', 'Win16', 'Win32', 'WinCE'],



-},{"./Generic":13}],11:[function(require,module,exports){
+},{"./Generic":14}],12:[function(require,module,exports){
 "use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
 var EventEmitter_js_1 = require("../EventEmitter.js");
 var CharMeasure = (function (_super) {
    __extends(CharMeasure, _super);
-    function CharMeasure(parentElement) {
+    function CharMeasure(document, parentElement) {
        var _this = _super.call(this) || this;
+        _this._document = document;
        _this._parentElement = parentElement;
        return _this;
    }
@@ -2203,11 +2454,12 @@ var CharMeasure = (function (_super) {
    CharMeasure.prototype.measure = function () {
        var _this = this;
        if (!this._measureElement) {
-            this._measureElement = document.createElement('span');
+            this._measureElement = this._document.createElement('span');
            this._measureElement.style.position = 'absolute';
            this._measureElement.style.top = '0';
            this._measureElement.style.left = '-9999em';
            this._measureElement.textContent = 'W';
+            this._measureElement.setAttribute('aria-hidden', 'true');
            this._parentElement.appendChild(this._measureElement);
            setTimeout(function () { return _this._doMeasure(); }, 0);
        }
@@ -2232,8 +2484,9 @@ exports.CharMeasure = CharMeasure;



-},{"../EventEmitter.js":4}],12:[function(require,module,exports){
+},{"../EventEmitter.js":4}],13:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var CircularList = (function () {
    function CircularList(maxLength) {
        this._array = new Array(maxLength);
@@ -2370,8 +2623,9 @@ exports.CircularList = CircularList;



-},{}],13:[function(require,module,exports){
+},{}],14:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function contains(arr, el) {
    return arr.indexOf(el) >= 0;
 }
@@ -2380,8 +2634,9 @@ exports.contains = contains;



-},{}],14:[function(require,module,exports){
+},{}],15:[function(require,module,exports){
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var CompositionHelper_1 = require("./CompositionHelper");
 var EventEmitter_1 = require("./EventEmitter");
 var Viewport_1 = require("./Viewport");
@@ -2391,11 +2646,13 @@ var EscapeSequences_1 = require("./EscapeSequences");
 var InputHandler_1 = require("./InputHandler");
 var Parser_1 = require("./Parser");
 var Renderer_1 = require("./Renderer");
+var Linkifier_1 = require("./Linkifier");
 var CharMeasure_1 = require("./utils/CharMeasure");
 var Browser = require("./utils/Browser");
 var document = (typeof window != 'undefined') ? window.document : null;
 var WRITE_BUFFER_PAUSE_THRESHOLD = 5;
 var WRITE_BATCH_SIZE = 300;
+var CURSOR_BLINK_INTERVAL = 600;
 function Terminal(options) {
    var self = this;
    if (!(this instanceof Terminal)) {
@@ -2453,6 +2710,7 @@ function Terminal(options) {
    this.scrollTop = 0;
    this.scrollBottom = this.rows - 1;
    this.customKeydownHandler = null;
+    this.cursorBlinkInterval = null;
    this.applicationKeypad = false;
    this.applicationCursor = false;
    this.originMode = false;
@@ -2491,6 +2749,7 @@ function Terminal(options) {
    this.inputHandler = new InputHandler_1.InputHandler(this);
    this.parser = new Parser_1.Parser(this.inputHandler, this);
    this.renderer = this.renderer || null;
+    this.linkifier = this.linkifier || new Linkifier_1.Linkifier();
    this.writeBuffer = [];
    this.writeInProgress = false;
    this.xoffSentToCatchUp = false;
@@ -2622,7 +2881,7 @@ Terminal.prototype.setOption = function (key, value) {
    this.options[key] = value;
    switch (key) {
        case 'cursorBlink':
-            this.element.classList.toggle('xterm-cursor-blink', value);
+            this.setCursorBlinking(value);
            break;
        case 'cursorStyle':
            this.element.classList.toggle("xterm-cursor-style-underline", value === 'underline');
@@ -2633,6 +2892,26 @@ Terminal.prototype.setOption = function (key, value) {
            break;
    }
 };
+Terminal.prototype.restartCursorBlinking = function () {
+    this.setCursorBlinking(this.options.cursorBlink);
+};
+Terminal.prototype.setCursorBlinking = function (enabled) {
+    this.element.classList.toggle('xterm-cursor-blink', enabled);
+    this.clearCursorBlinkingInterval();
+    if (enabled) {
+        var self = this;
+        this.cursorBlinkInterval = setInterval(function () {
+            self.element.classList.toggle('xterm-cursor-blink-on');
+        }, CURSOR_BLINK_INTERVAL);
+    }
+};
+Terminal.prototype.clearCursorBlinkingInterval = function () {
+    this.element.classList.remove('xterm-cursor-blink-on');
+    if (this.cursorBlinkInterval) {
+        clearInterval(this.cursorBlinkInterval);
+        this.cursorBlinkInterval = null;
+    }
+};
 Terminal.bindFocus = function (term) {
    on(term.textarea, 'focus', function (ev) {
        if (term.sendFocus) {
@@ -2640,6 +2919,7 @@ Terminal.bindFocus = function (term) {
        }
        term.element.classList.add('focus');
        term.showCursor();
+        term.restartCursorBlinking.apply(term);
        Terminal.focus = term;
        term.emit('focus', { terminal: term });
    });
@@ -2654,6 +2934,7 @@ Terminal.bindBlur = function (term) {
            term.send(EscapeSequences_1.C0.ESC + '[O');
        }
        term.element.classList.remove('focus');
+        term.clearCursorBlinkingInterval.apply(term);
        Terminal.focus = null;
        term.emit('blur', { terminal: term });
    });
@@ -2715,6 +2996,9 @@ Terminal.bindKeys = function (term) {
    on(term.textarea, 'compositionupdate', term.compositionHelper.compositionupdate.bind(term.compositionHelper));
    on(term.textarea, 'compositionend', term.compositionHelper.compositionend.bind(term.compositionHelper));
    term.on('refresh', term.compositionHelper.updateCompositionElements.bind(term.compositionHelper));
+    term.on('refresh', function (data) {
+        term.queueLinkification(data.start, data.end);
+    });
 };
 Terminal.prototype.insertRow = function (row) {
    if (typeof row != 'object') {
@@ -2737,7 +3021,7 @@ Terminal.prototype.open = function (parent) {
    this.element.classList.add('terminal');
    this.element.classList.add('xterm');
    this.element.classList.add('xterm-theme-' + this.theme);
-    this.element.classList.toggle('xterm-cursor-blink', this.options.cursorBlink);
+    this.setCursorBlinking(this.options.cursorBlink);
    this.element.style.height;
    this.element.setAttribute('tabindex', 0);
    this.viewportElement = document.createElement('div');
@@ -2750,6 +3034,7 @@ Terminal.prototype.open = function (parent) {
    this.rowContainer.classList.add('xterm-rows');
    this.element.appendChild(this.rowContainer);
    this.children = [];
+    this.linkifier.attachToDom(document, this.children);
    this.helperContainer = document.createElement('div');
    this.helperContainer.classList.add('xterm-helpers');
    this.element.appendChild(this.helperContainer);
@@ -2776,7 +3061,7 @@ Terminal.prototype.open = function (parent) {
        this.insertRow();
    }
    this.parent.appendChild(this.element);
-    this.charMeasure = new CharMeasure_1.CharMeasure(this.helperContainer);
+    this.charMeasure = new CharMeasure_1.CharMeasure(document, this.helperContainer);
    this.charMeasure.on('charsizechanged', function () {
        self.updateCharSizeCSS();
    });
@@ -2985,10 +3270,8 @@ Terminal.prototype.bindMouse = function () {
                ? el.offsetParent
                : el.parentNode;
        }
-        w = self.element.clientWidth;
-        h = self.element.clientHeight;
-        x = Math.ceil((x / w) * self.cols);
-        y = Math.ceil((y / h) * self.rows);
+        x = Math.ceil(x / self.charMeasure.width);
+        y = Math.ceil(y / self.charMeasure.height);
        if (x < 0)
            x = 0;
        if (x > self.cols)
@@ -3060,6 +3343,13 @@ Terminal.prototype.refresh = function (start, end) {
        this.renderer.queueRefresh(start, end);
    }
 };
+Terminal.prototype.queueLinkification = function (start, end) {
+    if (this.linkifier) {
+        for (var i = start; i <= end; i++) {
+            this.linkifier.linkifyRow(i);
+        }
+    }
+};
 Terminal.prototype.showCursor = function () {
    if (!this.cursorState) {
        this.cursorState = 1;
@@ -3173,10 +3463,39 @@ Terminal.prototype.writeln = function (data) {
 Terminal.prototype.attachCustomKeydownHandler = function (customKeydownHandler) {
    this.customKeydownHandler = customKeydownHandler;
 };
+Terminal.prototype.setHypertextLinkHandler = function (handler) {
+    if (!this.linkifier) {
+        throw new Error('Cannot attach a hypertext link handler before Terminal.open is called');
+    }
+    this.linkifier.setHypertextLinkHandler(handler);
+    this.refresh(0, this.rows - 1);
+};
+Terminal.prototype.setHypertextValidationCallback = function (handler) {
+    if (!this.linkifier) {
+        throw new Error('Cannot attach a hypertext validation callback before Terminal.open is called');
+    }
+    this.linkifier.setHypertextValidationCallback(handler);
+    this.refresh(0, this.rows - 1);
+};
+Terminal.prototype.registerLinkMatcher = function (regex, handler, options) {
+    if (this.linkifier) {
+        var matcherId = this.linkifier.registerLinkMatcher(regex, handler, options);
+        this.refresh(0, this.rows - 1);
+        return matcherId;
+    }
+};
+Terminal.prototype.deregisterLinkMatcher = function (matcherId) {
+    if (this.linkifier) {
+        if (this.linkifier.deregisterLinkMatcher(matcherId)) {
+            this.refresh(0, this.rows - 1);
+        }
+    }
+};
 Terminal.prototype.keyDown = function (ev) {
    if (this.customKeydownHandler && this.customKeydownHandler(ev) === false) {
        return false;
    }
+    this.restartCursorBlinking();
    if (!this.compositionHelper.keydown.bind(this.compositionHelper)(ev)) {
        if (this.ybase !== this.ydisp) {
            this.scrollToBottom();
@@ -3571,14 +3890,6 @@ Terminal.prototype.resize = function (x, y) {
            }
        }
    }
-    else {
-        i = this.lines.length;
-        while (i--) {
-            while (this.lines.get(i).length > x) {
-                this.lines.get(i).pop();
-            }
-        }
-    }
    this.cols = x;
    this.setupStops(this.cols);
    j = this.rows;
@@ -3892,6 +4203,6 @@ module.exports = Terminal;



-},{"./CompositionHelper":2,"./EscapeSequences":3,"./EventEmitter":4,"./InputHandler":5,"./Parser":6,"./Renderer":7,"./Viewport":8,"./handlers/Clipboard":9,"./utils/Browser":10,"./utils/CharMeasure":11,"./utils/CircularList":12}]},{},[14])(14)
+},{"./CompositionHelper":2,"./EscapeSequences":3,"./EventEmitter":4,"./InputHandler":5,"./Linkifier":6,"./Parser":7,"./Renderer":8,"./Viewport":9,"./handlers/Clipboard":10,"./utils/Browser":11,"./utils/CharMeasure":12,"./utils/CircularList":13}]},{},[15])(15)
 });
 //# sourceMappingURL=xterm.js.map
@@ -1,8 +1,11 @@
 const browserify = require('browserify');
 const buffer = require('vinyl-buffer');
+const coveralls = require('gulp-coveralls');
 const fs = require('fs-extra');
 const gulp = require('gulp');
+const istanbul = require('gulp-istanbul');
 const merge = require('merge-stream');
+const mocha = require('gulp-mocha');
 const sorcery = require('sorcery');
 const source = require('vinyl-source-stream');
 const sourcemaps = require('gulp-sourcemaps');
@@ -10,27 +13,28 @@ const ts = require('gulp-typescript');


 let buildDir = process.env.BUILD_DIR || 'build';
-
+let tsProject = ts.createProject('tsconfig.json');
+let srcDir = tsProject.config.compilerOptions.rootDir;
+let outDir = tsProject.config.compilerOptions.outDir;

 /**
 * Compile TypeScript sources to JavaScript files and create a source map file for each TypeScript
 * file compiled.
 */
 gulp.task('tsc', function () {
-  // Remove the lib/ directory to prevent confusion if files were deleted in src/
-  fs.emptyDirSync('lib');
+  // Remove the ${outDir}/ directory to prevent confusion if files were deleted in ${srcDir}/
+  fs.emptyDirSync(`${outDir}`);

-  // Build all TypeScript files (including tests) to lib/, based on the configuration defined in
+  // Build all TypeScript files (including tests) to ${outDir}/, based on the configuration defined in
  // `tsconfig.json`.
-  let tsProject = ts.createProject('tsconfig.json');
  let tsResult = tsProject.src().pipe(sourcemaps.init()).pipe(tsProject());
-  let tsc = tsResult.js.pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})).pipe(gulp.dest('lib'));
+  let tsc = tsResult.js.pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})).pipe(gulp.dest(outDir));

-  // Copy all addons from src/ to lib/
-  let copyAddons = gulp.src('src/addons/**/*').pipe(gulp.dest('lib/addons'));
+  // Copy all addons from ${srcDir}/ to ${outDir}/
+  let copyAddons = gulp.src(`${srcDir}/addons/**/*`).pipe(gulp.dest(`${outDir}/addons`));

-  // Copy stylesheets from src/ to lib/
-  let copyStylesheets = gulp.src('src/**/*.css').pipe(gulp.dest('lib'));
+  // Copy stylesheets from ${srcDir}/ to ${outDir}/
+  let copyStylesheets = gulp.src(`${srcDir}/**/*.css`).pipe(gulp.dest(outDir));

  return merge(tsc, copyAddons, copyStylesheets);
 });
@@ -46,7 +50,7 @@ gulp.task('browserify', ['tsc'], function() {
  let browserifyOptions = {
    basedir: buildDir,
    debug: true,
-    entries: ['../lib/xterm.js'],
+    entries: [`../${outDir}/xterm.js`],
    standalone: 'Terminal',
    cache: {},
    packageCache: {}
@@ -59,27 +63,48 @@ gulp.task('browserify', ['tsc'], function() {
        .pipe(sourcemaps.write('./'))
        .pipe(gulp.dest(buildDir));

-  // Copy all add-ons from lib/ to buildDir
-  let copyAddons = gulp.src('lib/addons/**/*').pipe(gulp.dest(`${buildDir}/addons`));
+  // Copy all add-ons from ${outDir}/ to buildDir
+  let copyAddons = gulp.src(`${outDir}/addons/**/*`).pipe(gulp.dest(`${buildDir}/addons`));

-  // Copy stylesheets from src/ to lib/
-  let copyStylesheets = gulp.src('lib/**/*.css').pipe(gulp.dest(buildDir));
+  // Copy stylesheets from ${outDir}/ to ${buildDir}/
+  let copyStylesheets = gulp.src(`${outDir}/**/*.css`).pipe(gulp.dest(buildDir));

  return merge(bundleStream, copyAddons, copyStylesheets);
 });

+gulp.task('instrument-test', function () {
+  return gulp.src([`${outDir}/**/*.js`])
+    // Covering files
+    .pipe(istanbul())
+    // Force `require` to return covered files
+    .pipe(istanbul.hookRequire());
+});
+
+gulp.task('mocha', ['instrument-test'], function () {
+  return gulp.src([`${outDir}/*test.js`, `${outDir}/**/*test.js`], {read: false})
+      .pipe(mocha())
+      .pipe(istanbul.writeReports());
+});

 /**
 * Use `sorcery` to resolve the source map chain and point back to the TypeScript files.
 * (Without this task the source maps produced for the JavaScript bundle points into the
- * compiled JavaScript files in lib/).
+ * compiled JavaScript files in ${outDir}/).
 */
 gulp.task('sorcery', ['browserify'], function () {
  var chain = sorcery.loadSync(`${buildDir}/xterm.js`);
-  var map = chain.apply();
+  chain.apply();
  chain.writeSync();
 });

-gulp.task('build', ['sorcery']);
+/**
+ * Submit coverage results to coveralls.io
+ */
+gulp.task('coveralls', function () {
+  gulp.src('coverage/**/lcov.info')
+    .pipe(coveralls());
+});

+gulp.task('build', ['sorcery']);
+gulp.task('test', ['mocha']);
 gulp.task('default', ['build']);
@@ -1,7 +1,7 @@
 {
  "name": "xterm",
  "description": "Full xterm terminal, in your browser",
-  "version": "2.3.2",
+  "version": "2.5.0",
  "ignore": [
    "demo",
    "test",
@@ -36,6 +36,7 @@
  ],
  "devDependencies": {
    "@types/chai": "^3.4.34",
+    "@types/jsdom": "^2.0.30",
    "@types/mocha": "^2.2.33",
    "@types/node": "^6.0.41",
    "browserify": "^13.1.0",
@@ -47,28 +48,32 @@
    "glob": "^7.0.5",
    "gulp": "^3.9.1",
    "gulp-cli": "^1.2.2",
+    "gulp-coveralls": "^0.1.4",
+    "gulp-istanbul": "^1.1.1",
+    "gulp-mocha": "^3.0.1",
    "gulp-sourcemaps": "1.9.1",
    "gulp-typescript": "^3.1.3",
    "jsdoc": "3.4.3",
+    "jsdom": "^9.11.0",
    "merge-stream": "^1.0.1",
-    "mocha": "2.5.3",
    "node-pty": "^0.4.1",
    "nodemon": "1.10.2",
    "sleep": "^3.0.1",
    "sorcery": "^0.10.0",
    "tslint": "^4.0.2",
-    "typescript": "^2.0.3",
+    "typescript": "~2.2.0",
    "vinyl-buffer": "^1.0.0",
    "vinyl-source-stream": "^1.1.0"
  },
  "scripts": {
    "prestart": "npm run build",
    "start": "node demo/app",
-    "dev": "nodemon -e js,ts --watch src --watch demo --exec npm start",
+    "dev": "nodemon -e js,ts,css --watch src --watch demo --exec npm start",
    "lint": "tslint src/*.ts src/**/*.ts",
-    "test": "mocha --recursive ./lib",
+    "test": "gulp test",
    "build:docs": "jsdoc -c jsdoc.json",
    "build": "gulp build",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build",
+    "coveralls": "gulp coveralls"
  }
 }
@@ -1,3 +1,7 @@
+/**
+ * @license MIT
+ */
+
 /**
 * C0 control codes
 * See = https://en.wikipedia.org/wiki/C0_and_C1_control_codes
@@ -385,7 +385,13 @@ export class InputHandler implements IInputHandler {
        while (j--) this._terminal.eraseLine(j);
        break;
      case 3:
-        ; // no saved lines
+        // Clear scrollback (everything not in viewport)
+        const scrollBackSize = this._terminal.lines.length - this._terminal.rows;
+        if (scrollBackSize > 0) {
+          this._terminal.lines.trimStart(scrollBackSize);
+          this._terminal.ybase = Math.max(this._terminal.ybase - scrollBackSize, 0);
+          this._terminal.ydisp = Math.max(this._terminal.ydisp - scrollBackSize, 0);
+        }
        break;
    }
  }
@@ -1394,7 +1400,7 @@ export class InputHandler implements IInputHandler {
    this._terminal.cursorHidden = false;
    this._terminal.insertMode = false;
    this._terminal.originMode = false;
-    this._terminal.wraparoundMode = false; // autowrap
+    this._terminal.wraparoundMode = true;  // defaults: xterm - true, vt100 - false
    this._terminal.applicationKeypad = false; // ?
    this._terminal.viewport.syncScrollArea();
    this._terminal.applicationCursor = false;
@@ -2,6 +2,9 @@
 * @license MIT
 */

+import { LinkMatcherOptions } from './Interfaces';
+import { LinkMatcherHandler, LinkMatcherValidationCallback } from './Types';
+
 export interface IBrowser {
  isNode: boolean;
  userAgent: string;
@@ -44,6 +47,19 @@ export interface ITerminal {
  emit(event: string, data: any);
 }

+export interface ICharMeasure {
+  width: number;
+  height: number;
+  measure(): void;
+}
+
+export interface ILinkifier {
+  linkifyRow(rowIndex: number): void;
+  attachHypertextLinkHandler(handler: LinkMatcherHandler): void;
+  registerLinkMatcher(regex: RegExp, handler: LinkMatcherHandler, options?: LinkMatcherOptions): number;
+  deregisterLinkMatcher(matcherId: number): boolean;
+}
+
 interface ICircularList<T> {
  length: number;
  maxLength: number;
@@ -58,6 +74,25 @@ interface ICircularList<T> {
  shiftElements(start: number, count: number, offset: number): void;
 }

+export interface LinkMatcherOptions {
+  /**
+   * The index of the link from the regex.match(text) call. This defaults to 0
+   * (for regular expressions without capture groups).
+   */
+  matchIndex?: number;
+  /**
+   * A callback that validates an individual link, returning true if valid and
+   * false if invalid.
+   */
+  validationCallback?: LinkMatcherValidationCallback;
+  /**
+   * The priority of the link matcher, this defines the order in which the link
+   * matcher is evaluated relative to others, from highest to lowest. The
+   * default value is 0.
+   */
+  priority?: number;
+}
+
 /**
 * Handles actions generated by the parser.
 */
@@ -0,0 +1,187 @@
+/**
+ * @license MIT
+ */
+import jsdom = require('jsdom');
+import { assert } from 'chai';
+import { ITerminal, ILinkifier } from './Interfaces';
+import { Linkifier } from './Linkifier';
+import { LinkMatcher } from './Types';
+
+class TestLinkifier extends Linkifier {
+  constructor() {
+    Linkifier.TIME_BEFORE_LINKIFY = 0;
+    super();
+  }
+
+  public get linkMatchers(): LinkMatcher[] { return this._linkMatchers; }
+}
+
+describe('Linkifier', () => {
+  let window: Window;
+  let document: Document;
+
+  let container: HTMLElement;
+  let rows: HTMLElement[];
+  let linkifier: TestLinkifier;
+
+  beforeEach(done => {
+    jsdom.env('', (err, w) => {
+      window = w;
+      document = window.document;
+      linkifier = new TestLinkifier();
+      done();
+    });
+  });
+
+  function addRow(html: string) {
+    const element = document.createElement('div');
+    element.innerHTML = html;
+    container.appendChild(element);
+    rows.push(element);
+  }
+
+  describe('before attachToDom', () => {
+    it('should allow link matcher registration', done => {
+      assert.doesNotThrow(() => {
+        const linkMatcherId = linkifier.registerLinkMatcher(/foo/, () => {});
+        assert.isTrue(linkifier.deregisterLinkMatcher(linkMatcherId));
+        done();
+      });
+    });
+  });
+
+  describe('after attachToDom', () => {
+    beforeEach(() => {
+      rows = [];
+      linkifier.attachToDom(document, rows);
+      container = document.createElement('div');
+      document.body.appendChild(container);
+    });
+
+    function clickElement(element: Node) {
+      const event = document.createEvent('MouseEvent');
+      event.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      element.dispatchEvent(event);
+    }
+
+    function assertLinkifiesEntireRow(uri: string, done: MochaDone) {
+        addRow(uri);
+        linkifier.linkifyRow(0);
+        setTimeout(() => {
+          assert.equal((<HTMLElement>rows[0].firstChild).tagName, 'A');
+          assert.equal((<HTMLElement>rows[0].firstChild).textContent, uri);
+          done();
+        }, 0);
+    }
+
+    describe('http links', () => {
+      function assertLinkifiesEntireRow(uri: string, done: MochaDone) {
+        addRow(uri);
+        linkifier.linkifyRow(0);
+        setTimeout(() => {
+          assert.equal((<HTMLElement>rows[0].firstChild).tagName, 'A');
+          assert.equal((<HTMLElement>rows[0].firstChild).textContent, uri);
+          done();
+        }, 0);
+      }
+      it('should allow ~ character in URI path', done => assertLinkifiesEntireRow('http://foo.com/a~b#c~d?e~f', done));
+    });
+
+    describe('link matcher', () => {
+      function assertLinkifiesRow(rowText: string, linkMatcherRegex: RegExp, expectedHtml: string, done: MochaDone) {
+        addRow(rowText);
+        linkifier.registerLinkMatcher(linkMatcherRegex, () => {});
+        linkifier.linkifyRow(0);
+        // Allow linkify to happen
+        setTimeout(() => {
+          assert.equal(rows[0].innerHTML, expectedHtml);
+          done();
+        }, 0);
+      }
+      it('should match a single link', done => {
+        assertLinkifiesRow('foo', /foo/, '<a>foo</a>', done);
+      });
+      it('should match a single link at the start of a text node', done => {
+        assertLinkifiesRow('foo bar', /foo/, '<a>foo</a> bar', done);
+      });
+      it('should match a single link in the middle of a text node', done => {
+        assertLinkifiesRow('foo bar baz', /bar/, 'foo <a>bar</a> baz', done);
+      });
+      it('should match a single link at the end of a text node', done => {
+        assertLinkifiesRow('foo bar', /bar/, 'foo <a>bar</a>', done);
+      });
+      it('should match a link after a link at the start of a text node', done => {
+        assertLinkifiesRow('foo bar', /foo|bar/, '<a>foo</a> <a>bar</a>', done);
+      });
+      it('should match a link after a link in the middle of a text node', done => {
+        assertLinkifiesRow('foo bar baz', /bar|baz/, 'foo <a>bar</a> <a>baz</a>', done);
+      });
+      it('should match a link immediately after a link at the end of a text node', done => {
+        assertLinkifiesRow('<span>foo bar</span>baz', /bar|baz/, '<span>foo <a>bar</a></span><a>baz</a>', done);
+      });
+    });
+
+    describe('validationCallback', () => {
+      it('should enable link if true', done => {
+        addRow('test');
+        linkifier.registerLinkMatcher(/test/, () => done(), {
+          validationCallback: (url, element, cb) => {
+            cb(true);
+            assert.equal((<HTMLElement>rows[0].firstChild).tagName, 'A');
+            setTimeout(() => clickElement(rows[0].firstChild), 0);
+          }
+        });
+        linkifier.linkifyRow(0);
+      });
+
+      it('should disable link if false', done => {
+        addRow('test');
+        linkifier.registerLinkMatcher(/test/, () => assert.fail(), {
+          validationCallback: (url, element, cb) => {
+            cb(false);
+            assert.equal((<HTMLElement>rows[0].firstChild).tagName, 'A');
+            setTimeout(() => clickElement(rows[0].firstChild), 0);
+          }
+        });
+        linkifier.linkifyRow(0);
+        // Allow time for the click to be performed
+        setTimeout(() => done(), 10);
+      });
+
+      it('should trigger for multiple link matches on one row', done => {
+        addRow('test test');
+        let count = 0;
+        linkifier.registerLinkMatcher(/test/, () => assert.fail(), {
+          validationCallback: (url, element, cb) => {
+            count += 1;
+            if (count === 2) {
+              done();
+            }
+            cb(false);
+          }
+        });
+        linkifier.linkifyRow(0);
+      });
+    });
+
+    describe('priority', () => {
+      it('should order the list from highest priority to lowest #1', () => {
+        const aId = linkifier.registerLinkMatcher(/a/, () => {}, { priority: 1 });
+        const bId = linkifier.registerLinkMatcher(/b/, () => {}, { priority: -1 });
+        assert.deepEqual(linkifier.linkMatchers.map(lm => lm.id), [aId, 0, bId]);
+      });
+
+      it('should order the list from highest priority to lowest #2', () => {
+        const aId = linkifier.registerLinkMatcher(/a/, () => {}, { priority: -1 });
+        const bId = linkifier.registerLinkMatcher(/b/, () => {}, { priority: 1 });
+        assert.deepEqual(linkifier.linkMatchers.map(lm => lm.id), [bId, 0, aId]);
+      });
+
+      it('should order items of equal priority in the order they are added', () => {
+        const aId = linkifier.registerLinkMatcher(/a/, () => {}, { priority: 0 });
+        const bId = linkifier.registerLinkMatcher(/b/, () => {}, { priority: 0 });
+        assert.deepEqual(linkifier.linkMatchers.map(lm => lm.id), [0, aId, bId]);
+      });
+    });
+  });
+});
@@ -0,0 +1,349 @@
+/**
+ * @license MIT
+ */
+
+import { LinkMatcherOptions } from './Interfaces';
+import { LinkMatcher, LinkMatcherHandler, LinkMatcherValidationCallback } from './Types';
+
+const INVALID_LINK_CLASS = 'xterm-invalid-link';
+
+const protocolClause = '(https?:\\/\\/)';
+const domainCharacterSet = '[\\da-z\\.-]+';
+const negatedDomainCharacterSet = '[^\\da-z\\.-]+';
+const domainBodyClause = '(' + domainCharacterSet + ')';
+const tldClause = '([a-z\\.]{2,6})';
+const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
+const localHostClause = '(localhost)';
+const portClause = '(:\\d{1,5})';
+const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
+const pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
+const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
+const queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
+const hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
+const negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
+const bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;
+const start = '(?:^|' + negatedDomainCharacterSet + ')(';
+const end = ')($|' + negatedPathCharacterSet + ')';
+const strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);
+
+/**
+ * The ID of the built in http(s) link matcher.
+ */
+const HYPERTEXT_LINK_MATCHER_ID = 0;
+
+/**
+ * The Linkifier applies links to rows shortly after they have been refreshed.
+ */
+export class Linkifier {
+  /**
+   * The time to wait after a row is changed before it is linkified. This prevents
+   * the costly operation of searching every row multiple times, potentially a
+   * huge amount of times.
+   */
+  protected static TIME_BEFORE_LINKIFY = 200;
+
+  protected _linkMatchers: LinkMatcher[];
+
+  private _document: Document;
+  private _rows: HTMLElement[];
+  private _rowTimeoutIds: number[];
+  private _nextLinkMatcherId = HYPERTEXT_LINK_MATCHER_ID;
+
+  constructor() {
+    this._rowTimeoutIds = [];
+    this._linkMatchers = [];
+    this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });
+  }
+
+  /**
+   * Attaches the linkifier to the DOM, enabling linkification.
+   * @param document The document object.
+   * @param rows The array of rows to apply links to.
+   */
+  public attachToDom(document: Document, rows: HTMLElement[]) {
+    this._document = document;
+    this._rows = rows;
+  }
+
+  /**
+   * Queues a row for linkification.
+   * @param {number} rowIndex The index of the row to linkify.
+   */
+  public linkifyRow(rowIndex: number): void {
+    // Don't attempt linkify if not yet attached to DOM
+    if (!this._document) {
+      return;
+    }
+
+    const timeoutId = this._rowTimeoutIds[rowIndex];
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+    this._rowTimeoutIds[rowIndex] = setTimeout(this._linkifyRow.bind(this, rowIndex), Linkifier.TIME_BEFORE_LINKIFY);
+  }
+
+  /**
+   * Attaches a handler for hypertext links, overriding default <a> behavior
+   * for standard http(s) links.
+   * @param {LinkHandler} handler The handler to use, this can be cleared with
+   * null.
+   */
+  public setHypertextLinkHandler(handler: LinkMatcherHandler): void {
+    this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].handler = handler;
+  }
+
+  /**
+   * Attaches a validation callback for hypertext links.
+   * @param {LinkMatcherValidationCallback} callback The callback to use, this
+   * can be cleared with null.
+   */
+  public setHypertextValidationCallback(callback: LinkMatcherValidationCallback): void {
+    this._linkMatchers[HYPERTEXT_LINK_MATCHER_ID].validationCallback = callback;
+  }
+
+  /**
+   * Registers a link matcher, allowing custom link patterns to be matched and
+   * handled.
+   * @param {RegExp} regex The regular expression to search for, specifically
+   * this searches the textContent of the rows. You will want to use \s to match
+   * a space ' ' character for example.
+   * @param {LinkHandler} handler The callback when the link is called.
+   * @param {LinkMatcherOptions} [options] Options for the link matcher.
+   * @return {number} The ID of the new matcher, this can be used to deregister.
+   */
+  public registerLinkMatcher(regex: RegExp, handler: LinkMatcherHandler, options: LinkMatcherOptions = {}): number {
+    if (this._nextLinkMatcherId !== HYPERTEXT_LINK_MATCHER_ID && !handler) {
+      throw new Error('handler must be defined');
+    }
+    const matcher: LinkMatcher = {
+      id: this._nextLinkMatcherId++,
+      regex,
+      handler,
+      matchIndex: options.matchIndex,
+      validationCallback: options.validationCallback,
+      priority: options.priority || 0
+    };
+    this._addLinkMatcherToList(matcher);
+    return matcher.id;
+  }
+
+  /**
+   * Inserts a link matcher to the list in the correct position based on the
+   * priority of each link matcher. New link matchers of equal priority are
+   * considered after older link matchers.
+   * @param matcher The link matcher to be added.
+   */
+  private _addLinkMatcherToList(matcher: LinkMatcher): void {
+    if (this._linkMatchers.length === 0) {
+      this._linkMatchers.push(matcher);
+      return;
+    }
+
+    for (let i = this._linkMatchers.length - 1; i >= 0; i--) {
+      if (matcher.priority <= this._linkMatchers[i].priority) {
+        this._linkMatchers.splice(i + 1, 0, matcher);
+        return;
+      }
+    }
+
+    this._linkMatchers.splice(0, 0, matcher);
+  }
+
+  /**
+   * Deregisters a link matcher if it has been registered.
+   * @param {number} matcherId The link matcher's ID (returned after register)
+   * @return {boolean} Whether a link matcher was found and deregistered.
+   */
+  public deregisterLinkMatcher(matcherId: number): boolean {
+    // ID 0 is the hypertext link matcher which cannot be deregistered
+    for (let i = 1; i < this._linkMatchers.length; i++) {
+      if (this._linkMatchers[i].id === matcherId) {
+        this._linkMatchers.splice(i, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Linkifies a row.
+   * @param {number} rowIndex The index of the row to linkify.
+   */
+  private _linkifyRow(rowIndex: number): void {
+    const row = this._rows[rowIndex];
+    if (!row) {
+      return;
+    }
+    const text = row.textContent;
+    for (let i = 0; i < this._linkMatchers.length; i++) {
+      const matcher = this._linkMatchers[i];
+      const linkElements = this._doLinkifyRow(row, matcher);
+        if (linkElements.length > 0) {
+        // Fire validation callback
+        if (matcher.validationCallback) {
+          for (let j = 0; j < linkElements.length; j++) {
+            const element = linkElements[j];
+            matcher.validationCallback(element.textContent, element, isValid => {
+              if (!isValid) {
+                element.classList.add(INVALID_LINK_CLASS);
+              }
+            });
+          }
+        }
+        // Only allow a single LinkMatcher to trigger on any given row.
+        return;
+      }
+    }
+  }
+
+  /**
+   * Linkifies a row given a specific handler.
+   * @param {HTMLElement} row The row to linkify.
+   * @param {LinkMatcher} matcher The link matcher for this line.
+   * @return The link element if it was added, otherwise undefined.
+   */
+  private _doLinkifyRow(row: HTMLElement, matcher: LinkMatcher): HTMLElement[] {
+    // Iterate over nodes as we want to consider text nodes
+    let result = [];
+    const isHttpLinkMatcher = matcher.id === HYPERTEXT_LINK_MATCHER_ID;
+    const nodes = row.childNodes;
+
+    // Find the first match
+    let match = row.textContent.match(matcher.regex);
+    if (!match || match.length === 0) {
+      return result;
+    }
+    let uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
+    // Set the next searches start index
+    let rowStartIndex = match.index + uri.length;
+
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      const searchIndex = node.textContent.indexOf(uri);
+      if (searchIndex >= 0) {
+        const linkElement = this._createAnchorElement(uri, matcher.handler, isHttpLinkMatcher);
+        if (node.textContent.length === uri.length) {
+          // Matches entire string
+          if (node.nodeType === 3 /*Node.TEXT_NODE*/) {
+            this._replaceNode(node, linkElement);
+          } else {
+            const element = (<HTMLElement>node);
+            if (element.nodeName === 'A') {
+              // This row has already been linkified
+              return result;
+            }
+            element.innerHTML = '';
+            element.appendChild(linkElement);
+          }
+        } else {
+          // Matches part of string
+          const nodesAdded = this._replaceNodeSubstringWithNode(node, linkElement, uri, searchIndex);
+          // No need to consider the new nodes
+          i += nodesAdded;
+        }
+        result.push(linkElement);
+
+        // Find the next match
+        match = row.textContent.substring(rowStartIndex).match(matcher.regex);
+        if (!match || match.length === 0) {
+          return result;
+        }
+        uri = match[typeof matcher.matchIndex !== 'number' ? 0 : matcher.matchIndex];
+        rowStartIndex += match.index + uri.length;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Creates a link anchor element.
+   * @param {string} uri The uri of the link.
+   * @return {HTMLAnchorElement} The link.
+   */
+  private _createAnchorElement(uri: string, handler: LinkMatcherHandler, isHypertextLinkHandler: boolean): HTMLAnchorElement {
+    const element = this._document.createElement('a');
+    element.textContent = uri;
+    element.draggable = false;
+    if (isHypertextLinkHandler) {
+      element.href = uri;
+      // Force link on another tab so work is not lost
+      element.target = '_blank';
+      element.addEventListener('click', (event: MouseEvent) => {
+        if (handler) {
+          return handler(event, uri);
+        }
+      });
+    } else {
+      element.addEventListener('click', (event: MouseEvent) => {
+        // Don't execute the handler if the link is flagged as invalid
+        if (element.classList.contains(INVALID_LINK_CLASS)) {
+          return;
+        }
+        return handler(event, uri);
+      });
+    }
+    return element;
+  }
+
+  /**
+   * Replace a node with 1 or more other nodes.
+   * @param {Node} oldNode The node to replace.
+   * @param {Node[]} newNodes The new nodes to insert in order.
+   */
+  private _replaceNode(oldNode: Node, ...newNodes: Node[]): void {
+    const parent = oldNode.parentNode;
+    for (let i = 0; i < newNodes.length; i++) {
+      parent.insertBefore(newNodes[i], oldNode);
+    }
+    parent.removeChild(oldNode);
+  }
+
+  /**
+   * Replace a substring within a node with a new node.
+   * @param {Node} targetNode The target node; either a text node or a <span>
+   * containing a single text node.
+   * @param {Node} newNode The new node to insert.
+   * @param {string} substring The substring to replace.
+   * @param {number} substringIndex The index of the substring within the string.
+   * @return The number of nodes to skip when searching for the next uri.
+   */
+  private _replaceNodeSubstringWithNode(targetNode: Node, newNode: Node, substring: string, substringIndex: number): number {
+    let node = targetNode;
+    if (node.nodeType !== 3/*Node.TEXT_NODE*/) {
+      node = node.childNodes[0];
+    }
+
+    // The targetNode will be either a text node or a <span>. The text node
+    // (targetNode or its only-child) needs to be replaced with newNode plus new
+    // text nodes potentially on either side.
+    if (node.childNodes.length === 0 && node.nodeType !== 3/*Node.TEXT_NODE*/) {
+      throw new Error('targetNode must be a text node or only contain a single text node');
+    }
+
+    const fullText = node.textContent;
+
+    if (substringIndex === 0) {
+      // Replace with <newNode><textnode>
+      const rightText = fullText.substring(substring.length);
+      const rightTextNode = this._document.createTextNode(rightText);
+      this._replaceNode(node, newNode, rightTextNode);
+      return 0;
+    }
+
+    if (substringIndex === targetNode.textContent.length - substring.length) {
+      // Replace with <textnode><newNode>
+      const leftText = fullText.substring(0, substringIndex);
+      const leftTextNode = this._document.createTextNode(leftText);
+      this._replaceNode(node, leftTextNode, newNode);
+      return 0;
+    }
+
+    // Replace with <textnode><newNode><textnode>
+    const leftText = fullText.substring(0, substringIndex);
+    const leftTextNode = this._document.createTextNode(leftText);
+    const rightText = fullText.substring(substringIndex + substring.length);
+    const rightTextNode = this._document.createTextNode(rightText);
+    this._replaceNode(node, leftTextNode, newNode, rightTextNode);
+    return 1;
+  }
+}
@@ -34,7 +34,7 @@ export class Renderer {
    // Figure out whether boldness affects
    // the character width of monospace fonts.
    if (brokenBold === null) {
-      brokenBold = checkBoldBroken((<any>this._terminal).document);
+      brokenBold = checkBoldBroken((<any>this._terminal).element);
    }

    // TODO: Pull more DOM interactions into Renderer.constructor, element for
@@ -291,14 +291,16 @@ export class Renderer {

 // if bold is broken, we can't
 // use it in the terminal.
-function checkBoldBroken(document) {
-  const body = document.getElementsByTagName('body')[0];
+function checkBoldBroken(terminal) {
+  const document = terminal.ownerDocument;
  const el = document.createElement('span');
  el.innerHTML = 'hello world';
-  body.appendChild(el);
-  const w1 = el.scrollWidth;
+  terminal.appendChild(el);
+  const w1 = el.offsetWidth;
+  const h1 = el.offsetHeight;
  el.style.fontWeight = 'bold';
-  const w2 = el.scrollWidth;
-  body.removeChild(el);
-  return w1 !== w2;
+  const w2 = el.offsetWidth;
+  const h2 = el.offsetHeight;
+  terminal.removeChild(el);
+  return w1 !== w2 || h1 !== h2;
 }
@@ -0,0 +1,14 @@
+/**
+ * @license MIT
+ */
+
+export type LinkMatcher = {
+  id: number,
+  regex: RegExp,
+  handler: LinkMatcherHandler,
+  matchIndex?: number,
+  validationCallback?: LinkMatcherValidationCallback,
+  priority?: number
+};
+export type LinkMatcherHandler = (event: MouseEvent, uri: string) => boolean | void;
+export type LinkMatcherValidationCallback = (uri: string, element: HTMLElement, callback: (isValid: boolean) => void) => void;
@@ -32,6 +32,9 @@
  var exports = {};

  exports.proposeGeometry = function (term) {
+    if (!term.element.parentElement) {
+      return null;
+    }
    var parentElementStyle = window.getComputedStyle(term.element.parentElement),
        parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
        parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17),
@@ -53,7 +56,7 @@
    subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace
    characterWidth = subjectRow.getBoundingClientRect().width;
    subjectRow.style.display = ''; // Revert style before calculating height, since they differ.
-    characterHeight = parseInt(subjectRow.offsetHeight);
+    characterHeight = subjectRow.getBoundingClientRect().height;
    subjectRow.innerHTML = contentBuffer;

    rows = parseInt(availableHeight / characterHeight);
@@ -66,7 +69,9 @@
  exports.fit = function (term) {
    var geometry = exports.proposeGeometry(term);

-    term.resize(geometry.cols, geometry.rows);
+    if (geometry) {
+      term.resize(geometry.cols, geometry.rows);
+    }
  };

  Xterm.prototype.proposeGeometry = function () {
@@ -1,36 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <link rel="stylesheet" href="../../src/xterm.css" />
-        <link rel="stylesheet" href="../../demo/style.css" />
-        <script src="../../src/xterm.js"></script>
-        <script src="linkify.js"></script>
-        <style>
-            body {
-                color: #111;
-            }
-
-            #terminal-container {
-                max-width: 900px;
-                margin: 0 auto;
-            }
-
-            #terminal-container a {
-				color: #fff;
-            }
-        </style>
-    </head>
-    <body>
-        <div id="terminal-container"></div>
-        <script>
-            var term = new Terminal(),
-                container = document.getElementById('terminal-container');
-
-            term.open(container);
-            term.writeln('Hello, welcome to xterm.js');
-            term.writeln('');
-            term.writeln('Check it out at github.com/sourcelair/xterm.js');
-            term.linkify();
-        </script>
-    </body>
-</html>
@@ -1,207 +0,0 @@
-/**
- * Methods for turning URL subscrings in the terminal's content into links (`a` DOM elements).
- * @module xterm/addons/linkify/linkify
- * @license MIT
- */
-
-(function (linkify) {
-  if (typeof exports === 'object' && typeof module === 'object') {
-    /*
-     * CommonJS environment
-     */
-    module.exports = linkify(require('../../xterm'));
-  } else if (typeof define == 'function') {
-    /*
-     * Require.js is available
-     */
-    define(['../../xterm'], linkify);
-  } else {
-    /*
-     * Plain browser environment
-     */
-    linkify(window.Terminal);
-  }
-})(function (Xterm) {
-  'use strict';
-
-  var exports = {},
-      protocolClause = '(https?:\\/\\/)',
-      domainCharacterSet = '[\\da-z\\.-]+',
-      negatedDomainCharacterSet = '[^\\da-z\\.-]+',
-      domainBodyClause = '(' + domainCharacterSet + ')',
-      tldClause = '([a-z\\.]{2,6})',
-      ipClause = '((\\d{1,3}\\.){3}\\d{1,3})',
-      portClause = '(:\\d{1,5})',
-      hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + ')' + portClause + '?',
-      pathClause = '(\\/[\\/\\w\\.-]*)*',
-      negatedPathCharacterSet = '[^\\/\\w\\.-]+',
-      bodyClause = hostClause + pathClause,
-      start = '(?:^|' + negatedDomainCharacterSet + ')(',
-      end = ')($|' + negatedPathCharacterSet + ')',
-      lenientUrlClause = start + protocolClause + '?' + bodyClause + end,
-      strictUrlClause = start + protocolClause + bodyClause + end,
-      lenientUrlRegex = new RegExp(lenientUrlClause),
-      strictUrlRegex = new RegExp(strictUrlClause);
-
-  /**
-   * Converts all valid URLs found in the given terminal line into
-   * hyperlinks. The terminal line can be either the HTML element itself
-   * or the index of the termina line in the children of the terminal
-   * rows container.
-   *
-   * @param {Xterm} terminal - The terminal that owns the given line.
-   * @param {number|HTMLDivElement} line - The terminal line that should get
-   *								  		 "linkified".
-   * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
-   *                            false, the regex requires a protocol clause. Defaults to true.
-   * @param {string} target -  Sets target="" attribute with value provided to links.
-   *                           Default doesn't set target attribute
-   * @emits linkify
-   * @emits linkify:line
-   */
-  exports.linkifyTerminalLine = function (terminal, line, lenient, target) {
-    if (typeof line == 'number') {
-      line = terminal.rowContainer.children[line];
-    } else if (! (line instanceof HTMLDivElement)) {
-      var message = 'The "line" argument should be either a number';
-      message += ' or an HTMLDivElement';
-
-      throw new TypeError(message);
-    }
-
-    if (typeof target === 'undefined') {
-      target = '';
-    } else {
-      target = 'target="' + target + '"';
-    }
-
-    var buffer = document.createElement('span'),
-        nodes = line.childNodes;
-
-    for (var j=0; j<nodes.length; j++) {
-      var node = nodes[j],
-          match;
-
-      /**
-       * Since we cannot access the TextNode's HTML representation
-       * from the instance itself, we assign its data as textContent
-       * to a dummy buffer span, in order to retrieve the TextNode's
-       * HTML representation from the buffer's innerHTML.
-       */
-      buffer.textContent = node.data;
-
-      var nodeHTML = buffer.innerHTML;
-
-      /**
-       * Apply function only on TextNodes
-       */
-      if (node.nodeType != node.TEXT_NODE) {
-        continue;
-      }
-
-      var url = exports.findLinkMatch(node.data, lenient);
-
-      if (!url) {
-        continue;
-      }
-
-      var startsWithProtocol = new RegExp('^' + protocolClause),
-          urlHasProtocol = url.match(startsWithProtocol),
-          href = (urlHasProtocol) ? url : 'http://' + url,
-          link = '<a href="' +  href + '" ' + target + '>' + url + '</a>',
-          newHTML = nodeHTML.replace(url, link);
-
-      line.innerHTML = line.innerHTML.replace(nodeHTML, newHTML);
-    }
-
-    /**
-     * This event gets emitted when conversion of all URL susbtrings
-     * to HTML anchor elements (links) has finished, for a specific
-     * line of the current Xterm instance.
-     *
-     * @event linkify:line
-     */
-    terminal.emit('linkify:line', line);
-  };
-
-  /**
-   * Finds a link within a block of text.
-   *
-   * @param {string} text - The text to search .
-   * @param {boolean} lenient - Whether to use the lenient search.
-   * @return {string} A URL.
-   */
-  exports.findLinkMatch = function (text, lenient) {
-    var match = text.match(lenient ? lenientUrlRegex : strictUrlRegex);
-    if (!match || match.length === 0) {
-      return null;
-    }
-    return match[1];
-  }
-
-  /**
-   * Converts all valid URLs found in the terminal view into hyperlinks.
-   *
-   * @param {Xterm} terminal - The terminal that should get "linkified".
-   * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
-   *                            false, the regex requires a protocol clause. Defaults to true.
-   * @param {string} target -  Sets target="" attribute with value provided to links.
-   *                           Default doesn't set target attribute
-   * @emits linkify
-   * @emits linkify:line
-   */
-  exports.linkify = function (terminal, lenient, target) {
-    var rows = terminal.rowContainer.children;
-
-    lenient = (typeof lenient == "boolean") ? lenient : true;
-    for (var i=0; i<rows.length; i++) {
-      var line = rows[i];
-
-      exports.linkifyTerminalLine(terminal, line, lenient, target);
-    }
-
-    /**
-     * This event gets emitted when conversion of  all URL substrings to
-     * HTML anchor elements (links) has finished for the current Xterm
-     * instance's view.
-     *
-     * @event linkify
-     */
-    terminal.emit('linkify');
-  };
-
-  /**
-   * Extend Xterm prototype.
-   */
-
-  /**
-   * Converts all valid URLs found in the current terminal linte into
-   * hyperlinks.
-   *
-   * @memberof Xterm
-   * @param {number|HTMLDivElement} line - The terminal line that should get
-   *								  		 "linkified".
-   * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
-   *                            false, the regex requires a protocol clause. Defaults to true.
-   * @param {string} target -  Sets target="" attribute with value provided to links.
-   *                           Default doesn't set target attribute
-   */
-  Xterm.prototype.linkifyTerminalLine = function (line, lenient, target) {
-    return exports.linkifyTerminalLine(this, line, lenient, target);
-  };
-
-  /**
-   * Converts all valid URLs found in the current terminal into hyperlinks.
-   *
-   * @memberof Xterm
-   * @param {boolean} lenient - The regex type that will be used to identify links. If lenient is
-   *                            false, the regex requires a protocol clause. Defaults to true.
-   * @param {string} target -  Sets target="" attribute with value provided to links.
-   *                           Default doesn't set target attribute
-   */
-  Xterm.prototype.linkify = function (lenient, target) {
-    return exports.linkify(this, lenient, target);
-  };
-
-  return exports;
-});
@@ -1,5 +0,0 @@
-{
-  "name": "xterm.linkify",
-  "main": "linkify.js",
-  "private": true
-}
@@ -1,48 +0,0 @@
-var assert = require('chai').assert;
-var Terminal = require('../../xterm');
-var linkify = require('../../addons/linkify/linkify');
-
-describe('linkify addon', function () {
-  var xterm;
-
-  describe('API', function () {
-    it('should define Terminal.prototype.linkify', function () {
-      assert.isDefined(Terminal.prototype.linkify);
-    });
-    it('should define Terminal.prototype.linkifyTerminalLine', function () {
-      assert.isDefined(Terminal.prototype.linkifyTerminalLine);
-    });
-  });
-
-  describe('findUrlMatchOnLine', function () {
-    describe('strict regex', function () {
-      it('should match when the entire text is a match', function () {
-        assert.equal(linkify.findLinkMatch('http://github.com', false), 'http://github.com');
-        assert.equal(linkify.findLinkMatch('http://127.0.0.1', false), 'http://127.0.0.1');
-      });
-      it('should match simple domains', function () {
-        assert.equal(linkify.findLinkMatch('foo http://github.com bar', false), 'http://github.com');
-        assert.equal(linkify.findLinkMatch('foo http://www.github.com bar', false), 'http://www.github.com');
-        assert.equal(linkify.findLinkMatch('foo https://github.com bar', false), 'https://github.com');
-        assert.equal(linkify.findLinkMatch('foo https://www.github.com bar', false), 'https://www.github.com');
-      });
-      it('should match web addresses with alpha paths', function () {
-        assert.equal(linkify.findLinkMatch('foo http://github.com/a/b/c bar', false), 'http://github.com/a/b/c');
-        assert.equal(linkify.findLinkMatch('foo http://www.github.com/a/b/c bar', false), 'http://www.github.com/a/b/c');
-      });
-      it('should not include whitespace surrounding a match', function () {
-        assert.equal(linkify.findLinkMatch(' http://github.com', false), 'http://github.com');
-        assert.equal(linkify.findLinkMatch('http://github.com ', false), 'http://github.com');
-        assert.equal(linkify.findLinkMatch('  http://github.com  ', false), 'http://github.com');
-      });
-      it('should match IP addresses', function () {
-        assert.equal(linkify.findLinkMatch('foo http://127.0.0.1 bar', false), 'http://127.0.0.1');
-        assert.equal(linkify.findLinkMatch('foo https://127.0.0.1 bar', false), 'https://127.0.0.1');
-      });
-      it('should match ports on both domains and IP addresses', function () {
-        assert.equal(linkify.findLinkMatch('foo http://127.0.0.1:8080 bar', false), 'http://127.0.0.1:8080');
-        assert.equal(linkify.findLinkMatch('foo http://www.github.com:8080 bar', false), 'http://www.github.com:8080');
-      });
-    });
-  });
-});
@@ -21,7 +21,8 @@ describe('xterm.js', function() {
    };
    xterm.element = {
      classList: {
-        toggle: function(){}
+        toggle: function(){},
+        remove: function(){}
      }
    };
  });
@@ -550,6 +551,7 @@ describe('xterm.js', function() {

  describe('unicode - surrogates', function() {
    it('2 characters per cell', function () {
+      this.timeout(10000);  // This is needed because istanbul patches code and slows it down
      var high = String.fromCharCode(0xD800);
      for (var i=0xDC00; i<=0xDCFF; ++i) {
        xterm.write(high + String.fromCharCode(i));
@@ -0,0 +1,77 @@
+/**
+ * @license MIT
+ */
+import jsdom = require('jsdom');
+import { assert } from 'chai';
+import { ICharMeasure, ITerminal } from '../Interfaces';
+import { CharMeasure } from './CharMeasure';
+
+describe('CharMeasure', () => {
+  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();
+    });
+  });
+
+  describe('measure', () => {
+    it('should set _measureElement on first call', () => {
+      charMeasure.measure();
+      assert.isDefined((<any>charMeasure)._measureElement, 'CharMeasure.measure should have created _measureElement');
+    });
+
+    it('should be performed async on first call', done => {
+      assert.equal(charMeasure.width, null);
+      charMeasure.measure();
+      // Mock getBoundingClientRect since jsdom doesn't have a layout engine
+      (<any>charMeasure)._measureElement.getBoundingClientRect = () => {
+        return { width: 1, height: 1 };
+      };
+      assert.equal(charMeasure.width, null);
+      setTimeout(() => {
+        assert.equal(charMeasure.width, 1);
+        done();
+      }, 0);
+    });
+
+    it('should be performed sync on successive calls', done => {
+      charMeasure.measure();
+      // Mock getBoundingClientRect since jsdom doesn't have a layout engine
+      (<any>charMeasure)._measureElement.getBoundingClientRect = () => {
+        return { width: 1, height: 1 };
+      };
+      setTimeout(() => {
+        const firstWidth = charMeasure.width;
+        // Mock getBoundingClientRect since jsdom doesn't have a layout engine
+        (<any>charMeasure)._measureElement.getBoundingClientRect = () => {
+          return { width: 2, height: 2 };
+        };
+        charMeasure.measure();
+        assert.equal(charMeasure.width, firstWidth * 2);
+        done();
+      }, 0);
+    });
+
+    it('should NOT do a measure when the parent is hidden', done => {
+      charMeasure.measure();
+      setTimeout(() => {
+        const firstWidth = charMeasure.width;
+        container.style.display = 'none';
+        container.style.fontSize = '2em';
+        charMeasure.measure();
+        assert.equal(charMeasure.width, firstWidth);
+        done();
+      }, 0);
+    });
+  });
+});
@@ -9,13 +9,15 @@ import { EventEmitter } from '../EventEmitter.js';
 * Utility class that measures the size of a character.
 */
 export class CharMeasure extends EventEmitter {
+  private _document: Document;
  private _parentElement: HTMLElement;
  private _measureElement: HTMLElement;
  private _width: number;
  private _height: number;

-  constructor(parentElement: HTMLElement) {
+  constructor(document: Document, parentElement: HTMLElement) {
    super();
+    this._document = document;
    this._parentElement = parentElement;
  }

@@ -29,11 +31,12 @@ export class CharMeasure extends EventEmitter {

  public measure(): void {
    if (!this._measureElement) {
-      this._measureElement = document.createElement('span');
+      this._measureElement = this._document.createElement('span');
      this._measureElement.style.position = 'absolute';
      this._measureElement.style.top = '0';
      this._measureElement.style.left = '-9999em';
      this._measureElement.textContent = 'W';
+      this._measureElement.setAttribute('aria-hidden', 'true');
      this._parentElement.appendChild(this._measureElement);
      // Perform _doMeasure async if the element was just attached as sometimes
      // getBoundingClientRect does not return accurate values without this.
@@ -71,7 +71,22 @@
    resize: none;
 }

-.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
+.terminal a {
+    color: inherit;
+    text-decoration: none;
+}
+
+.terminal a:hover {
+    cursor: pointer;
+    text-decoration: underline;
+}
+
+.terminal a.xterm-invalid-link:hover {
+    cursor: text;
+    text-decoration: none;
+}
+
+.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
    background-color: #fff;
    color: #000;
 }
@@ -82,19 +97,9 @@
    background-color: transparent;
 }

-.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink .terminal-cursor {
-    animation: xterm-cursor-blink 1.2s infinite step-end;
-}
-
-@keyframes xterm-cursor-blink {
-    0% {
-        background-color: #fff;
-        color: #000;
-    }
-    50% {
-        background-color: transparent;
-        color: #FFF;
-    }
+.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on .terminal-cursor {
+    background-color: transparent;
+    color: inherit;
 }

 .terminal.xterm-cursor-style-bar .terminal-cursor,
@@ -120,13 +125,13 @@
    right: 0;
    height: 1px;
 }
+.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before,
+.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before {
+    background-color: transparent;
+}
 .terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
 .terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
-    animation: xterm-cursor-non-bar-blink 1.2s infinite step-end;
-}
-@keyframes xterm-cursor-non-bar-blink {
-    0% { background-color: #fff; }
-    50% { background-color: transparent; }
+    background-color: #fff;
 }

 .terminal .composition-view {
@@ -19,6 +19,7 @@ import { C0 } from './EscapeSequences';
 import { InputHandler } from './InputHandler';
 import { Parser } from './Parser';
 import { Renderer } from './Renderer';
+import { Linkifier } from './Linkifier';
 import { CharMeasure } from './utils/CharMeasure';
 import * as Browser from './utils/Browser';
 import * as Keyboard from './utils/Keyboard';
@@ -51,6 +52,13 @@ var WRITE_BUFFER_PAUSE_THRESHOLD = 5;
 */
 var WRITE_BATCH_SIZE = 300;

+/**
+ * The time between cursor blinks. This is driven by JS rather than a CSS
+ * animation due to a bug in Chromium that causes it to use excessive CPU time.
+ * See https://github.com/Microsoft/vscode/issues/22900
+ */
+var CURSOR_BLINK_INTERVAL = 600;
+
 /**
 * Terminal
 */
@@ -158,6 +166,7 @@ function Terminal(options) {
  this.scrollTop = 0;
  this.scrollBottom = this.rows - 1;
  this.customKeydownHandler = null;
+  this.cursorBlinkInterval = null;

  // modes
  this.applicationKeypad = false;
@@ -210,6 +219,7 @@ function Terminal(options) {
  this.parser = new Parser(this.inputHandler, this);
  // Reuse renderer if the Terminal is being recreated via a Terminal.reset call.
  this.renderer = this.renderer || null;
+  this.linkifier = this.linkifier || new Linkifier();

  // user input states
  this.writeBuffer = [];
@@ -421,7 +431,7 @@ Terminal.prototype.setOption = function(key, value) {
  this[key] = value;
  this.options[key] = value;
  switch (key) {
-    case 'cursorBlink': this.element.classList.toggle('xterm-cursor-blink', value); break;
+    case 'cursorBlink': this.setCursorBlinking(value); break;
    case 'cursorStyle':
      // Style 'block' applies with no class
      this.element.classList.toggle(`xterm-cursor-style-underline`, value === 'underline');
@@ -431,6 +441,29 @@ Terminal.prototype.setOption = function(key, value) {
  }
 };

+Terminal.prototype.restartCursorBlinking = function () {
+  this.setCursorBlinking(this.options.cursorBlink);
+};
+
+Terminal.prototype.setCursorBlinking = function (enabled) {
+  this.element.classList.toggle('xterm-cursor-blink', enabled);
+  this.clearCursorBlinkingInterval();
+  if (enabled) {
+    var self = this;
+    this.cursorBlinkInterval = setInterval(function () {
+      self.element.classList.toggle('xterm-cursor-blink-on');
+    }, CURSOR_BLINK_INTERVAL);
+  }
+};
+
+Terminal.prototype.clearCursorBlinkingInterval = function () {
+  this.element.classList.remove('xterm-cursor-blink-on');
+  if (this.cursorBlinkInterval) {
+    clearInterval(this.cursorBlinkInterval);
+    this.cursorBlinkInterval = null;
+  }
+};
+
 /**
 * Binds the desired focus behavior on a given terminal object.
 *
@@ -443,6 +476,7 @@ Terminal.bindFocus = function (term) {
    }
    term.element.classList.add('focus');
    term.showCursor();
+    term.restartCursorBlinking.apply(term);
    Terminal.focus = term;
    term.emit('focus', {terminal: term});
  });
@@ -467,6 +501,7 @@ Terminal.bindBlur = function (term) {
      term.send(C0.ESC + '[O');
    }
    term.element.classList.remove('focus');
+    term.clearCursorBlinkingInterval.apply(term);
    Terminal.focus = null;
    term.emit('blur', {terminal: term});
  });
@@ -546,6 +581,9 @@ Terminal.bindKeys = function(term) {
  on(term.textarea, 'compositionupdate', term.compositionHelper.compositionupdate.bind(term.compositionHelper));
  on(term.textarea, 'compositionend', term.compositionHelper.compositionend.bind(term.compositionHelper));
  term.on('refresh', term.compositionHelper.updateCompositionElements.bind(term.compositionHelper));
+  term.on('refresh', function (data) {
+    term.queueLinkification(data.start, data.end)
+  });
 };


@@ -589,7 +627,7 @@ Terminal.prototype.open = function(parent) {
  this.element.classList.add('terminal');
  this.element.classList.add('xterm');
  this.element.classList.add('xterm-theme-' + this.theme);
-  this.element.classList.toggle('xterm-cursor-blink', this.options.cursorBlink);
+  this.setCursorBlinking(this.options.cursorBlink);

  this.element.style.height
  this.element.setAttribute('tabindex', 0);
@@ -607,6 +645,7 @@ Terminal.prototype.open = function(parent) {
  this.rowContainer.classList.add('xterm-rows');
  this.element.appendChild(this.rowContainer);
  this.children = [];
+  this.linkifier.attachToDom(document, this.children);

  // Create the container that will hold helpers like the textarea for
  // capturing DOM Events. Then produce the helpers.
@@ -641,7 +680,7 @@ Terminal.prototype.open = function(parent) {
  }
  this.parent.appendChild(this.element);

-  this.charMeasure = new CharMeasure(this.helperContainer);
+  this.charMeasure = new CharMeasure(document, this.helperContainer);
  this.charMeasure.on('charsizechanged', function () {
    self.updateCharSizeCSS();
  });
@@ -957,10 +996,8 @@ Terminal.prototype.bindMouse = function() {
    }

    // convert to cols/rows
-    w = self.element.clientWidth;
-    h = self.element.clientHeight;
-    x = Math.ceil((x / w) * self.cols);
-    y = Math.ceil((y / h) * self.rows);
+    x = Math.ceil(x / self.charMeasure.width);
+    y = Math.ceil(y / self.charMeasure.height);

    // be sure to avoid sending
    // bad positions to the program
@@ -1054,8 +1091,8 @@ Terminal.prototype.destroy = function() {
 /**
 * Tells the renderer to refresh terminal content between two rows (inclusive) at the next
 * opportunity.
- * @param {number} start The row to start from (between 0 and terminal's height terminal - 1)
- * @param {number} end The row to end at (between fromRow and terminal's height terminal - 1)
+ * @param {number} start The row to start from (between 0 and this.rows - 1).
+ * @param {number} end The row to end at (between start and this.rows - 1).
 */
 Terminal.prototype.refresh = function(start, end) {
  if (this.renderer) {
@@ -1063,6 +1100,19 @@ Terminal.prototype.refresh = function(start, end) {
  }
 };

+/**
+ * Queues linkification for the specified rows.
+ * @param {number} start The row to start from (between 0 and this.rows - 1).
+ * @param {number} end The row to end at (between start and this.rows - 1).
+ */
+Terminal.prototype.queueLinkification = function(start, end) {
+  if (this.linkifier) {
+    for (let i = start; i <= end; i++) {
+      this.linkifier.linkifyRow(i);
+    }
+  }
+}
+
 /**
 * Display the cursor element
 */
@@ -1263,6 +1313,66 @@ Terminal.prototype.attachCustomKeydownHandler = function(customKeydownHandler) {
  this.customKeydownHandler = customKeydownHandler;
 }

+/**
+ * Attaches a http(s) link handler, forcing web links to behave differently to
+ * regular <a> tags. This will trigger a refresh as links potentially need to be
+ * reconstructed. Calling this with null will remove the handler.
+ * @param {LinkHandler} handler The handler callback function.
+ */
+Terminal.prototype.setHypertextLinkHandler = function(handler) {
+  if (!this.linkifier) {
+    throw new Error('Cannot attach a hypertext link handler before Terminal.open is called');
+  }
+  this.linkifier.setHypertextLinkHandler(handler);
+  // Refresh to force links to refresh
+  this.refresh(0, this.rows - 1);
+}
+
+/**
+ * Attaches a validation callback for hypertext links. This is useful to use
+ * validation logic or to do something with the link's element and url.
+ * @param {LinkMatcherValidationCallback} callback The callback to use, this can
+ * be cleared with null.
+ */
+Terminal.prototype.setHypertextValidationCallback = function(handler) {
+  if (!this.linkifier) {
+    throw new Error('Cannot attach a hypertext validation callback before Terminal.open is called');
+  }
+  this.linkifier.setHypertextValidationCallback(handler);
+  // Refresh to force links to refresh
+  this.refresh(0, this.rows - 1);
+}
+
+/**
+   * Registers a link matcher, allowing custom link patterns to be matched and
+   * handled.
+   * @param {RegExp} regex The regular expression to search for, specifically
+   * this searches the textContent of the rows. You will want to use \s to match
+   * a space ' ' character for example.
+   * @param {LinkHandler} handler The callback when the link is called.
+   * @param {LinkMatcherOptions} [options] Options for the link matcher.
+   * @return {number} The ID of the new matcher, this can be used to deregister.
+ */
+Terminal.prototype.registerLinkMatcher = function(regex, handler, options) {
+  if (this.linkifier) {
+    var matcherId = this.linkifier.registerLinkMatcher(regex, handler, options);
+    this.refresh(0, this.rows - 1);
+    return matcherId;
+  }
+}
+
+/**
+ * Deregisters a link matcher if it has been registered.
+ * @param {number} matcherId The link matcher's ID (returned after register)
+ */
+Terminal.prototype.deregisterLinkMatcher = function(matcherId) {
+  if (this.linkifier) {
+    if (this.linkifier.deregisterLinkMatcher(matcherId)) {
+      this.refresh(0, this.rows - 1);
+    }
+  }
+}
+
 /**
 * Handle a keydown event
 * Key Resources:
@@ -1274,6 +1384,8 @@ Terminal.prototype.keyDown = function(ev) {
    return false;
  }

+  this.restartCursorBlinking();
+
  if (!this.compositionHelper.keydown.bind(this.compositionHelper)(ev)) {
    if (this.ybase !== this.ydisp) {
      this.scrollToBottom();
@@ -1743,14 +1855,8 @@ Terminal.prototype.resize = function(x, y) {
        this.lines.get(i).push(ch);
      }
    }
-  } else { // (j > x)
-    i = this.lines.length;
-    while (i--) {
-      while (this.lines.get(i).length > x) {
-        this.lines.get(i).pop();
-      }
-    }
  }
+
  this.cols = x;
  this.setupStops(this.cols);

@@ -12,13 +12,6 @@
    "src/**/*"
  ],
  "exclude": [
-    "src/addons/**/*",
-    "build",
-    "demo",
-    "dist",
-    "out",
-    "test",
-    "node_modules",
-    "docs"
+    "src/addons/**/*"
  ]
 }
Author	SHA1	Message	Date
Paris Kasidiaris	d2f8f9dc1a	Bump version to 2.5.0 Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>	2017-04-05 18:48:57 +00:00
Daniel Imms	df13469b6e	Merge pull request #627 from Tyriar/591_element_on_validation Give API access to valid link elements	2017-04-05 11:34:34 -07:00
Daniel Imms	584ec681af	Merge remote-tracking branch 'ups/master' into 591_element_on_validation	2017-04-04 09:50:04 -07:00
Daniel Imms	0c5b5cca4a	Merge pull request #623 from Tyriar/612_multiple_links_in_row Support multiple link matches in a single row	2017-04-04 09:41:19 -07:00
Daniel Imms	64663bf4a8	Fix tests	2017-04-04 09:35:52 -07:00
Daniel Imms	fe8334a873	Merge remote-tracking branch 'ups/master' into 612_multiple_links_in_row	2017-04-04 09:33:53 -07:00
Daniel Imms	c74fd40e2a	Merge pull request #619 from Tyriar/618_register_link_before_dom Allow links to be registered before terminal is attached to DOM	2017-04-04 09:13:09 -07:00
Daniel Imms	0f8ff67451	Merge branch 'master' into 618_register_link_before_dom	2017-04-04 09:02:37 -07:00
Daniel Imms	8b0032c210	Merge branch 'master' into 612_multiple_links_in_row	2017-04-04 09:02:35 -07:00
Daniel Imms	d9254ef2d9	Merge pull request #626 from Tyriar/625_cursor_blink_perf Use setInterval over animation for cursor blink	2017-04-04 09:02:27 -07:00
Daniel Imms	66be05a962	Merge branch 'master' into 612_multiple_links_in_row	2017-04-04 09:00:47 -07:00
Daniel Imms	0e85a09dd3	Merge branch 'master' into 618_register_link_before_dom	2017-04-04 08:58:43 -07:00
Daniel Imms	0c4ba9fd67	Clear cursor blink interval on blur	2017-04-03 15:09:38 -07:00
Daniel Imms	aca81c764a	Use setInterval over animation for cursor blink Fixes #625	2017-04-03 14:49:21 -07:00
Daniel Imms	6b3ddb97d1	Merge pull request #624 from InDieTasten/patch-1 Fix typos in comment	2017-03-31 13:27:29 -07:00
InDieTasten	26ccf2a316	Fix typos in comment	2017-03-31 22:16:11 +02:00
Daniel Imms	361894194a	Merge branch 'master' into 612_multiple_links_in_row	2017-03-31 03:06:23 -07:00
Daniel Imms	8c2db8ddb8	More tests	2017-03-31 02:10:07 -07:00
Daniel Imms	5546baa927	Fix edge case	2017-03-31 01:54:21 -07:00
Daniel Imms	d814009721	Add tests	2017-03-31 01:48:51 -07:00
Daniel Imms	08fd050c3f	Support multiple link matches in a single row Fixes #612	2017-03-31 01:48:35 -07:00
Daniel Imms	0b096d7d55	Merge pull request #621 from coderaiser/patch-1 Added Cloud Commander to real world uses	2017-03-30 11:31:11 -07:00
coderaiser	44cfb2dc87	Added Cloud Commander to real world uses	2017-03-30 14:26:56 +03:00
Daniel Imms	b0624cadb7	Allow links to be registered before terminal is attached to DOM Fixes #618	2017-03-24 11:04:04 -07:00
Paris Kasidiaris	045f361b0d	Merge pull request #616 from LucianBuzzo/crop-lines Prevent line data from being discarded on resize.	2017-03-20 09:52:22 +00:00
Lucian Buzzo	cb77b9dc1a	Prevent line data from being discarded on resize.	2017-03-19 08:26:37 +00:00
Paris Kasidiaris	0723dac596	Merge pull request #615 from andfoy/patch-1 Added Spyder IDE Terminal as a xterm case-use application	2017-03-19 00:26:41 +00:00
Edgar Andrés Margffoy Tuay	365f9b4c1b	Added Spyder IDE as a xterm case-use application	2017-03-18 18:05:05 -05:00
Daniel Imms	2cf90d90f7	Merge pull request #610 from Tyriar/non_draggable_links Ensure terminal links are not draggable	2017-03-17 09:22:05 -07:00
Daniel Imms	da14f64d1b	Merge branch 'master' into non_draggable_links	2017-03-17 02:27:07 -07:00
Paris Kasidiaris	ef1b1c8ffc	Merge pull request #608 from sourcelair/add-logo Add xterm.js logo	2017-03-17 08:18:08 +00:00
Daniel Imms	adde8ab2c3	Ensure terminal links are not draggable	2017-03-16 12:07:25 -07:00
Paris Kasidiaris	22cc8079dc	Add xterm.js logo	2017-03-16 08:54:07 +00:00
Daniel Imms	6d25706300	Merge pull request #606 from Tyriar/vscode22640_tilde_path Allow ~ char in linkify path and query fragments	2017-03-15 18:01:47 -07:00
Paris Kasidiaris	81419c980b	Merge pull request #603 from sourcelair/fix-blurred-terminal-cursor Fix cursor style on blurred terminals	2017-03-15 22:09:18 +00:00
Paris Kasidiaris	097e21f641	Merge pull request #604 from sourcelair/rebuild-on-css Rebuild xterm.js even when CSS changes	2017-03-15 22:09:03 +00:00
Daniel Imms	b68180b97b	Allow ~ char in linkify path and query fragments	2017-03-15 13:55:57 -07:00
Daniel Imms	d9059d18c0	Merge pull request #600 from sourcelair/Tyriar-patch-1 Polish development and contribution section	2017-03-15 10:53:03 -07:00
Paris Kasidiaris	5225a6e27a	Rebuild xterm.js even when CSS changes Otherwise you had to run `npm build` manually every time you changed a CSS file to see the updated result in the demo.	2017-03-15 18:36:06 +02:00
Paris Kasidiaris	9055bace96	Fix cursor style on blurred terminals	2017-03-15 18:28:17 +02:00
Paris Kasidiaris	eb25e88754	Merge pull request #598 from mikesir87/fix-fit-calculation Fixed characterHeight calculation, which could cause overflowing	2017-03-15 14:34:13 +00:00
Michael Irwin	0cb8ecc6f7	Use boundingClientRect instead of style to get actual height PR #598	2017-03-15 09:06:56 -04:00
Daniel Imms	8cf76cc6e9	Polish development and contribution section	2017-03-14 15:15:36 -07:00
Michael Irwin	3c3a646d42	Fixed characterHeight calculation, which could cause overflowing The previous calculation was simply using the height of the letter W, but wasn't taking into account that each row has a lineHeight, which might be greater. If the lineHeight is .4px off, after many rows, it will cause the proposedGeometry to have an extra row, potentially causing hidden rows (based on layout).	2017-03-14 17:02:53 -04:00
Paris Kasidiaris	ff29fd69a3	Merge pull request #572 from AndrienkoAleksandr/gulpImprove Use tsconfig.json data in gulpfile.js instead of hardcoded values.	2017-03-11 13:21:47 +00:00
Daniel Imms	91994a399c	Merge pull request #582 from tmyt/propose/row-height Support checking height in checkBoldBroken	2017-03-10 12:53:12 -08:00
Daniel Imms	bef7137c92	Fix bug	2017-03-09 10:47:09 -08:00
Daniel Imms	11f62bab34	Expose setHypertextValidationCallback	2017-03-09 10:39:08 -08:00
Daniel Imms	b66776a047	Include element in validationCallback Fixes #591	2017-03-09 10:23:59 -08:00
Daniel Imms	2c151f444c	Merge pull request #589 from warpdesign/patch-1 FIXED: typo	2017-03-08 15:52:55 -08:00
Nicolas Ramz	d8f8b060cb	FIXED: typo `<div id="terminal"></div>` wasn't used, instead, a new one was created and used since getElementById('#terminal') returned null.	2017-03-09 00:47:29 +01:00
Daniel Imms	ea9376019c	Merge pull request #586 from AndrienkoAleksandr/cleanUpTsConfig Clean up tsconfig.json.	2017-03-08 12:02:09 -08:00
Daniel Imms	008d1df106	Merge remote-tracking branch 'up/master' into cleanUpTsConfig	2017-03-08 11:47:56 -08:00
Daniel Imms	ec91a6c7f4	Merge pull request #588 from Tyriar/587_csi_3_J Implement CSI 3 J - Erase saved lines	2017-03-08 11:08:46 -08:00
yutaka	4b2ae6a79f	Use rendered height for detect broken bold font.	2017-03-08 11:30:23 +00:00
yutaka	2ec756fd6b	Use offsetWidth instead of scrollWidth scrollWidth does not work on Chrome with `display: inline` element.	2017-03-08 05:11:26 +00:00
yutaka	f0d5b40121	Detect bold font was broken correctly.	2017-03-08 04:54:18 +00:00
yutaka	31a0996b2f	Revert "Set charMeasure.height values to each row height" This reverts commit `43cb4f471f`.	2017-03-08 00:27:22 +00:00
Daniel Imms	0bbd8f0a16	Implement CSI 3 J - Erase saved lines Fixes #587	2017-03-07 14:01:42 -08:00
Paris Kasidiaris	b1619e42fd	Bump version to 2.4.0 Signed-off-by: Paris Kasidiaris <paris@sourcelair.com>	2017-03-07 09:38:48 +00:00
Daniel Imms	4cfec2fc09	Merge pull request #579 from Tyriar/578_ctrl_click_links Require ctrl for link clicks	2017-03-06 07:21:58 -08:00
Aleksandr Andrienko	3d721a95bb	Clean up tsconfig.json. 'include' field in the tsconfig.json defines source scope (top level of this scope is "src" folder), so we do not need 'exclude' folders in the root of the project, because this folders had already excluded by 'include' scope. Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>	2017-03-06 13:17:01 +02:00
Aleksandr Andrienko	dc3a136704	Use tsconfig.json data in gulpfile.js instead of hardcoded values. Use tsconfig.json data in gulpfile.js instead of hardcoded values. Little code clean up Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>	2017-03-06 12:25:22 +02:00
Daniel Imms	235ae2fbb9	Fix http link handler logic	2017-03-04 15:02:08 -08:00
Daniel Imms	1f518b0b45	Allow http link handler to fallback to standard handler	2017-03-04 14:44:11 -08:00
Daniel Imms	ab34d53d6b	Remove unused import	2017-03-04 14:09:13 -08:00
Daniel Imms	aafb5333b9	Give event to handler	2017-03-04 14:08:05 -08:00
Daniel Imms	5e2791f981	Revert "Add fail handler" This reverts commit `1ecc5674ac`.	2017-03-04 14:01:40 -08:00
Daniel Imms	1ecc5674ac	Add fail handler	2017-03-04 14:01:34 -08:00
Daniel Imms	c9ad3a595a	Merge pull request #584 from coderaiser/patch-1 Fix demo: wrong pid on windows #567	2017-03-03 14:38:55 -08:00
coderaiser	43558fa1dc	Fix demo: wrong pid on windows #567	2017-03-03 23:40:36 +02:00
Daniel Imms	15a867d2b7	Support cmd+click on mac	2017-03-03 12:37:34 -08:00
yutaka	43cb4f471f	Set charMeasure.height values to each row height	2017-03-03 07:57:05 +00:00
Daniel Imms	012051c1db	Fix matchIndex on http	2017-03-02 17:35:10 -08:00
Daniel Imms	b5483898da	Merge remote-tracking branch 'upstream/master' into 578_ctrl_click_links	2017-03-02 17:34:30 -08:00
Daniel Imms	c7b4c2beaf	Require ctrl for link clicks Fixes #578	2017-03-02 17:33:58 -08:00
Daniel Imms	8693d067e3	Merge pull request #577 from Tyriar/549_link_priority Implement link matcher priorities	2017-03-02 15:24:09 -08:00
Daniel Imms	78d5fc9506	Fix bug with priority	2017-03-02 12:05:34 -08:00
Daniel Imms	7ac4f1a9be	Implement link matcher priorities Fixes #549	2017-03-02 11:25:27 -08:00
Daniel Imms	670fb01fbf	Merge pull request #566 from Tyriar/linkify_issues Linkify issues	2017-03-02 09:02:24 -08:00
Daniel Imms	ec9608d54b	Merge pull request #574 from Tyriar/link_validation_fixes Link validation fixes	2017-03-02 00:42:01 -08:00
Daniel Imms	dcffaf1c8c	Ensure linkElement exists before firing validation callback	2017-03-01 09:38:59 -08:00
Daniel Imms	efac5293c0	Use text cursor for invalid links Part of #570	2017-03-01 09:37:30 -08:00
Daniel Imms	c7563346a2	Merge pull request #571 from Tyriar/570_link_validation Implement link validation	2017-03-01 09:12:53 -08:00
Daniel Imms	69906532b1	Remove test harness	2017-02-27 15:44:10 -08:00
Daniel Imms	9404fae725	Merge remote-tracking branch 'upstream/master' into linkify_issues	2017-02-27 12:59:59 -08:00
Daniel Imms	3542f15575	Don't expose CharMeasure/Linkifier for tests	2017-02-27 12:57:18 -08:00
Daniel Imms	15d79143e2	Get rid of exposed test method (phantom is gone)	2017-02-27 12:56:54 -08:00
Daniel Imms	f6dafee748	Remove dead code	2017-02-27 12:52:54 -08:00
Daniel Imms	356d86ae74	Merge remote-tracking branch 'upstream/master' into 570_link_validation	2017-02-27 12:47:53 -08:00
Daniel Imms	e673c6ec97	Upgrade to TypeScript 2.2	2017-02-27 11:54:55 -08:00
Daniel Imms	3e5fcf7004	Merge pull request #569 from wavebeem/issue/562 Fixes #562 adds Windows demo setup help	2017-02-27 11:52:47 -08:00
Daniel Imms	96d2a2bc68	Pin TypeScript at v2.1 to fix PhantomJS error	2017-02-27 11:47:57 -08:00
Daniel Imms	b401992178	Add jsdom types	2017-02-27 11:22:59 -08:00
Daniel Imms	4c34351383	Remove PhantomJS completely	2017-02-27 11:22:50 -08:00
Daniel Imms	202b54afbb	Convert CharMeasure phantom test to jsdom	2017-02-27 11:18:00 -08:00
Daniel Imms	26ebc3d944	Use jsdom instead of phantomjs for linkifier test	2017-02-27 11:00:12 -08:00
Daniel Imms	d0f36e9939	Pin typescript 2.1 to prevent exports error	2017-02-27 10:02:12 -08:00
Daniel Imms	4c99c032ca	Add tests	2017-02-27 09:47:36 -08:00
Daniel Imms	6198556e50	Implement link validation Fixes #570	2017-02-27 08:35:59 -08:00
Brian Mock	514eba0e4e	Fixes #562 adds Windows demo setup help	2017-02-25 12:16:18 -08:00
Daniel Imms	7279ee0f5f	Support % in URLs	2017-02-24 08:56:42 -08:00
Daniel Imms	ccadf3fcca	Support percent and numbers in query/hash fragments	2017-02-23 10:02:18 -08:00
Daniel Imms	cb80ce0d2c	Link . and - in hash fragments and query strings	2017-02-23 09:55:05 -08:00
Daniel Imms	9aae43961f	Support linking hash fragments	2017-02-23 09:53:20 -08:00
Daniel Imms	b810687163	Support linking = in query strings	2017-02-23 09:42:59 -08:00
Daniel Imms	28d4ec779d	Fix localhost links	2017-02-23 09:37:35 -08:00
Paris Kasidiaris	cf4da6c748	Merge pull request #565 from sourcelair/issue-#531-coveralls Fix #531: Submit code coverage to coveralls.io	2017-02-22 19:15:04 +02:00
Paris Kasidiaris	e569b5669a	Add coveralls badge	2017-02-22 16:22:50 +02:00
Paris Kasidiaris	695a9523fe	Fix #531 : Submit code coverage to coveralls.io	2017-02-22 16:17:22 +02:00
Daniel Imms	01b8e28a7d	Merge pull request #556 from Tyriar/555_fix_mouse_coords Use CharMeasure to determine mouse coordinates	2017-02-20 03:17:50 -08:00
Daniel Imms	e221030a2b	Merge pull request #559 from Tyriar/558_linkify_bad_trim Remove bad trim optimization from Linkifier	2017-02-20 03:17:42 -08:00
Daniel Imms	88dc697392	Merge pull request #557 from Tyriar/CharMeasure_aria_hidden Hide CharMeasure element from assistive technologies	2017-02-20 03:17:34 -08:00
Daniel Imms	99a270216c	Remove bad trim optimization from Linkifier This prevents whitespace from going missing after links are applied. Fixes #558	2017-02-19 15:17:03 -08:00
Daniel Imms	d06c920a2d	Hide CharMeasure element from assistive technologies	2017-02-19 13:20:36 -08:00
Daniel Imms	5452986ce3	Use CharMeasure to determine mouse coordinates Fixes #555	2017-02-19 12:34:36 -08:00
Daniel Imms	ae69841174	Merge pull request #538 from Tyriar/455_linkify Implement web links and custom link matcher registration	2017-02-17 11:40:59 -08:00
Daniel Imms	e6fc80c13b	Fix link matcher iteration direction	2017-02-17 10:22:55 -08:00
Daniel Imms	a10ee8f58c	Revert priority change, http handler needs to be top	2017-02-17 10:18:46 -08:00
Daniel Imms	3f69da2455	Support query string in linkifier	2017-02-17 10:06:35 -08:00
Daniel Imms	a14a0834e9	Merge remote-tracking branch 'upstream/master' into 455_linkify	2017-02-17 10:05:22 -08:00
Daniel Imms	c4f431849b	Add a null check on linkifyRow	2017-02-16 22:41:08 -08:00
Daniel Imms	ade3389cea	Merge pull request #535 from Tyriar/534_phantomjs Add PhantomJS test support and CharMeasure tests	2017-02-15 13:29:50 -08:00
Paris Kasidiaris	6873ba0909	Merge pull request #541 from AndrienkoAleksandr/FixSoftReset Fix 'Autowrap Mode' after 'Soft Terminal reset' command.	2017-02-15 11:24:42 +02:00
Daniel Imms	c3f31b5f65	Apply link matchers in reverse This enables consumers to have full control.	2017-02-14 20:06:15 -08:00
Daniel Imms	3b62aa444b	Improve jsdoc	2017-02-14 19:45:22 -08:00
Daniel Imms	fb2b10b565	Merge pull request #545 from Martin1994/blink_cursor_color Let blink animation support style inheritance	2017-02-14 19:23:22 -08:00
Martin Wang	345553012f	Let blink animation support style inheritance With this change, blinking cursor will use the same font and background color that set before.	2017-02-14 12:35:39 -05:00
Daniel Imms	fddc13d98e	Merge pull request #544 from LucianBuzzo/master Make fit plugin guard against non-existent parent element.	2017-02-13 13:26:14 -08:00
Lucian Buzzo	aeb9f798c9	Make fit plugin guard against non-existent parent element.	2017-02-13 21:01:28 +00:00
Daniel Imms	5183332f6e	Next link matcher ID must be non-static	2017-02-10 12:29:36 -08:00
Aleksandr Andrienko	c53183d94b	Fix default 'wraparoundMode' value for 'Soft reset'() XTERM terminal.	2017-02-10 16:52:19 +02:00
Daniel Imms	1ee774d01d	Remove linkify test	2017-02-09 22:03:31 -08:00
Daniel Imms	1c030f57ef	Force a refresh after register/deregister link matcher	2017-02-09 21:12:28 -08:00
Daniel Imms	c8bb321654	Get custom link matcher working	2017-02-09 21:08:50 -08:00
Daniel Imms	a1d71c9198	Properly queue linkify after refresh	2017-02-09 20:35:06 -08:00
Daniel Imms	55cb43d70b	Add license	2017-02-09 20:12:35 -08:00
Daniel Imms	551159e0c3	Remove linkify addon	2017-02-09 20:10:01 -08:00
Daniel Imms	3bf31aa478	Polish	2017-02-09 20:09:47 -08:00
Daniel Imms	7167b06bf8	Add custom link handlers, use generic way for http handler	2017-02-08 20:44:22 -08:00
Daniel Imms	34582f9f65	Remove logs	2017-02-08 20:21:18 -08:00
Daniel Imms	8dc9ec5733	Only show underline on hover	2017-02-08 20:20:18 -08:00
Daniel Imms	e8adf8ad2b	Use gulp-mocha and attach run both test type in npm test	2017-02-08 20:06:14 -08:00
Daniel Imms	1306431e7c	Add PhantomJS test support and CharMeasure tests Fixes #534	2017-02-08 19:53:32 -08:00
Daniel Imms	f7bc0fba4d	Remove unnecessary variables	2017-02-08 18:57:45 -08:00
Daniel Imms	0f3ee21d9d	Enable custom http link handlers	2017-02-08 14:13:30 -08:00
Daniel Imms	a489037ec4	Improve node insertion, support custom link handlers	2017-02-08 13:50:36 -08:00
Daniel Imms	2207d356f2	Initial linkify implementation Part of 455	2017-02-08 11:11:52 -08:00