From fd34caee2322af515fc1e94785d3a41dbc7e85da Mon Sep 17 00:00:00 2001
From: Juan Campa <juancampa@gmail.com>
Date: Fri, 7 Dec 2018 22:50:59 -0500
Subject: [PATCH 01/34] Use a time-based limit to Terminal._innerWrite

The idea is that it should run for a bit and then let the renderer draw
a frame so that the terminal look responsive. The existing approach
limits the work done using a fixed number elements from the write
buffer so the duration of a frame can vary widely.

This approach looks at the clock to determine when to stop, we basically
allocate an amount of time each frame to write, while the rest can be
used for rendering.

From my tests this change makes the terminal feel a lot smoother.
---
 src/Terminal.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 2cfc1ca8..a641a86b 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -64,10 +64,12 @@ const document = (typeof window !== 'undefined') ? window.document : null;
 const WRITE_BUFFER_PAUSE_THRESHOLD = 5;
 
 /**
- * The number of writes to perform in a single batch before allowing the
- * renderer to catch up with a 0ms setTimeout.
+ * The max number of ms to spend on writes before allowing the renderer to
+ * catch up with a 0ms setTimeout. A value of < 33 to keep us close to
+ * 30fps, and a value of < 16 to try to run at 60fps. Of course, the real FPS
+ * depends on the time it takes for the renderer to draw the frame.
  */
-const WRITE_BATCH_SIZE = 300;
+const WRITE_TIMEOUT_MS = 12;
 
 /**
  * The set of options that only have an effect when set in the Terminal constructor.
@@ -1358,13 +1360,13 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
       this.writeBuffer = [];
     }
 
-    const writeBatch = this.writeBuffer.splice(0, WRITE_BATCH_SIZE);
-    while (writeBatch.length > 0) {
-      const data = writeBatch.shift();
+    const time = Date.now();
+    while (this.writeBuffer.length > 0) {
+      const data = this.writeBuffer.shift();
 
       // If XOFF was sent in order to catch up with the pty process, resume it if
       // the writeBuffer is empty to allow more data to come in.
-      if (this._xoffSentToCatchUp && writeBatch.length === 0 && this.writeBuffer.length === 0) {
+      if (this._xoffSentToCatchUp && this.writeBuffer.length === 0 && this.writeBuffer.length === 0) {
         this.handler(C0.DC1);
         this._xoffSentToCatchUp = false;
       }
@@ -1382,6 +1384,10 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
 
       this.updateRange(this.buffer.y);
       this.refresh(this._refreshStart, this._refreshEnd);
+
+      if (Date.now() - time >= WRITE_TIMEOUT_MS) {
+        break;
+      }
     }
     if (this.writeBuffer.length > 0) {
       // Allow renderer to catch up before processing the next batch

From 3d2ae2b01edd34e9475c7d58884a501c2426237f Mon Sep 17 00:00:00 2001
From: Juan Campa <juancampa@gmail.com>
Date: Sun, 9 Dec 2018 17:58:44 -0500
Subject: [PATCH 02/34] Removing redundant condition. Clearer variable name

---
 src/Terminal.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index a641a86b..2c7f648b 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -1360,13 +1360,13 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
       this.writeBuffer = [];
     }
 
-    const time = Date.now();
+    const startTime = Date.now();
     while (this.writeBuffer.length > 0) {
       const data = this.writeBuffer.shift();
 
       // If XOFF was sent in order to catch up with the pty process, resume it if
       // the writeBuffer is empty to allow more data to come in.
-      if (this._xoffSentToCatchUp && this.writeBuffer.length === 0 && this.writeBuffer.length === 0) {
+      if (this._xoffSentToCatchUp && this.writeBuffer.length === 0) {
         this.handler(C0.DC1);
         this._xoffSentToCatchUp = false;
       }
@@ -1385,7 +1385,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
       this.updateRange(this.buffer.y);
       this.refresh(this._refreshStart, this._refreshEnd);
 
-      if (Date.now() - time >= WRITE_TIMEOUT_MS) {
+      if (Date.now() - startTime >= WRITE_TIMEOUT_MS) {
         break;
       }
     }

From 249f8800af98bf9a715b77bedd086bd350f975c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Mon, 7 Jan 2019 11:30:26 +0100
Subject: [PATCH 03/34] account empty cells in stringIndexToBufferIndex

---
 src/Buffer.test.ts | 6 +++---
 src/Buffer.ts      | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index 0546dfe8..663c7000 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -511,7 +511,7 @@ describe('Buffer', () => {
       const s = terminal.buffer.iterator(true).next().content;
       assert.equal(input, s);
       for (let i = 10; i < input.length; ++i) {
-        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i);
+        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i, true);
         const j = (i - 0) << 1;
         assert.deepEqual([(j / terminal.cols) | 0, j % terminal.cols], bufferIndex);
       }
@@ -523,7 +523,7 @@ describe('Buffer', () => {
       const s = terminal.buffer.iterator(true).next().content;
       assert.equal(input, s);
       for (let i = 0; i < input.length; ++i) {
-        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i);
+        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i, true);
         assert.equal(input[i], terminal.buffer.lines.get(bufferIndex[0]).get(bufferIndex[1])[CHAR_DATA_CHAR_INDEX]);
       }
     });
@@ -535,7 +535,7 @@ describe('Buffer', () => {
       const s = terminal.buffer.iterator(true).next().content;
       assert.equal(input, s);
       for (let i = 0; i < input.length; ++i) {
-        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i);
+        const bufferIndex = terminal.buffer.stringIndexToBufferIndex(0, i, true);
         assert.equal(
           (!(i % 3))
             ? input[i]
diff --git a/src/Buffer.ts b/src/Buffer.ts
index 625a2497..7b3bcee5 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -220,14 +220,16 @@ export class Buffer implements IBuffer {
    * @param stringIndex index within the string
    * @param startCol column offset the string was retrieved from
    */
-  public stringIndexToBufferIndex(lineIndex: number, stringIndex: number): BufferIndex {
+  public stringIndexToBufferIndex(lineIndex: number, stringIndex: number, trimRight: boolean = false): BufferIndex {
     while (stringIndex) {
       const line = this.lines.get(lineIndex);
       if (!line) {
         return [-1, -1];
       }
-      for (let i = 0; i < line.length; ++i) {
-        stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length;
+      const length = (trimRight) ? line.getTrimmedLength() : line.length;
+      for (let i = 0; i < length; ++i) {
+        if (line.get(i)[CHAR_DATA_WIDTH_INDEX])
+          stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length || 1;
         if (stringIndex < 0) {
           return [lineIndex, i];
         }

From 883ad01bd508e6df1f69127449b31710c8d9b6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Mon, 7 Jan 2019 11:39:16 +0100
Subject: [PATCH 04/34] make linter happy

---
 src/Buffer.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 7b3bcee5..0ad86bf1 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -228,8 +228,9 @@ export class Buffer implements IBuffer {
       }
       const length = (trimRight) ? line.getTrimmedLength() : line.length;
       for (let i = 0; i < length; ++i) {
-        if (line.get(i)[CHAR_DATA_WIDTH_INDEX])
-          stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length || 1;
+        if (line.get(i)[CHAR_DATA_WIDTH_INDEX]) {
+          stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length || 1; // WHITESPACE_CELL_CHAR.length
+        }
         if (stringIndex < 0) {
           return [lineIndex, i];
         }

From 2a1f25e7dce1254dde2b24e74bfbd2c97fc8e29c Mon Sep 17 00:00:00 2001
From: Thomas Zilz <t.zilz@mofux.org>
Date: Sun, 27 Jan 2019 13:15:37 +0100
Subject: [PATCH 05/34] Make textarea positioning work with css transformations
 on parent elements

---
 src/Terminal.ts     |  6 +++---
 src/ui/Clipboard.ts | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 4ddd0431..c1fc8ec8 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -566,12 +566,12 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
       // Firefox doesn't appear to fire the contextmenu event on right click
       this.register(addDisposableDomListener(this.element, 'mousedown', (event: MouseEvent) => {
         if (event.button === 2) {
-          rightClickHandler(event, this.textarea, this.selectionManager, this.options.rightClickSelectsWord);
+          rightClickHandler(event, this, this.selectionManager, this.options.rightClickSelectsWord);
         }
       }));
     } else {
       this.register(addDisposableDomListener(this.element, 'contextmenu', (event: MouseEvent) => {
-        rightClickHandler(event, this.textarea, this.selectionManager, this.options.rightClickSelectsWord);
+        rightClickHandler(event, this, this.selectionManager, this.options.rightClickSelectsWord);
       }));
     }
 
@@ -583,7 +583,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
       // that the regular click event doesn't fire for the middle mouse button.
       this.register(addDisposableDomListener(this.element, 'auxclick', (event: MouseEvent) => {
         if (event.button === 1) {
-          moveTextAreaUnderMouseCursor(event, this.textarea);
+          moveTextAreaUnderMouseCursor(event, this);
         }
       }));
     }
diff --git a/src/ui/Clipboard.ts b/src/ui/Clipboard.ts
index b1acba9d..2570a8b1 100644
--- a/src/ui/Clipboard.ts
+++ b/src/ui/Clipboard.ts
@@ -85,26 +85,32 @@ export function pasteHandler(ev: ClipboardEvent, term: ITerminal): void {
  * @param ev The original right click event to be handled.
  * @param textarea The terminal's textarea.
  */
-export function moveTextAreaUnderMouseCursor(ev: MouseEvent, textarea: HTMLTextAreaElement): void {
-  // Bring textarea at the cursor position
-  textarea.style.position = 'fixed';
-  textarea.style.width = '20px';
-  textarea.style.height = '20px';
-  textarea.style.left = (ev.clientX - 10) + 'px';
-  textarea.style.top = (ev.clientY - 10) + 'px';
-  textarea.style.zIndex = '1000';
+export function moveTextAreaUnderMouseCursor(ev: MouseEvent, term: ITerminal): void {
 
-  textarea.focus();
+  // Calculate textarea position relative to the screen element
+  const pos = term.screenElement.getBoundingClientRect();
+  const left = ev.clientX - pos.left - 10;
+  const top = ev.clientY - pos.top - 10;
+
+  // Bring textarea at the cursor position
+  term.textarea.style.position = 'absolute';
+  term.textarea.style.width = '20px';
+  term.textarea.style.height = '20px';
+  term.textarea.style.left = `${left}px`;
+  term.textarea.style.top = `${top}px`;
+  term.textarea.style.zIndex = '1000';
+
+  term.textarea.focus();
 
   // Reset the terminal textarea's styling
   // Timeout needs to be long enough for click event to be handled.
   setTimeout(() => {
-    textarea.style.position = null;
-    textarea.style.width = null;
-    textarea.style.height = null;
-    textarea.style.left = null;
-    textarea.style.top = null;
-    textarea.style.zIndex = null;
+    term.textarea.style.position = null;
+    term.textarea.style.width = null;
+    term.textarea.style.height = null;
+    term.textarea.style.left = null;
+    term.textarea.style.top = null;
+    term.textarea.style.zIndex = null;
   }, 200);
 }
 
@@ -115,14 +121,14 @@ export function moveTextAreaUnderMouseCursor(ev: MouseEvent, textarea: HTMLTextA
  * @param selectionManager The terminal's selection manager.
  * @param shouldSelectWord If true and there is no selection the current word will be selected
  */
-export function rightClickHandler(ev: MouseEvent, textarea: HTMLTextAreaElement, selectionManager: ISelectionManager, shouldSelectWord: boolean): void {
-  moveTextAreaUnderMouseCursor(ev, textarea);
+export function rightClickHandler(ev: MouseEvent, term: ITerminal, selectionManager: ISelectionManager, shouldSelectWord: boolean): void {
+  moveTextAreaUnderMouseCursor(ev, term);
 
   if (shouldSelectWord && !selectionManager.isClickInSelection(ev)) {
     selectionManager.selectWordAtCursor(ev);
   }
 
   // Get textarea ready to copy from the context menu
-  textarea.value = selectionManager.selectionText;
-  textarea.select();
+  term.textarea.value = selectionManager.selectionText;
+  term.textarea.select();
 }

From fc1692b3eb10cacb52284dd11e7e343c40ace716 Mon Sep 17 00:00:00 2001
From: Nikita Chuklinov <nchuklinov@roox.ru>
Date: Wed, 30 Jan 2019 20:34:16 +0300
Subject: [PATCH 06/34] clear state if selection doesn't exists

---
 src/renderer/SelectionRenderLayer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/SelectionRenderLayer.ts b/src/renderer/SelectionRenderLayer.ts
index 81782ee8..fc16a2fb 100644
--- a/src/renderer/SelectionRenderLayer.ts
+++ b/src/renderer/SelectionRenderLayer.ts
@@ -55,6 +55,7 @@ export class SelectionRenderLayer extends BaseRenderLayer {
 
     // Selection does not exist
     if (!start || !end) {
+      this._clearState();
       return;
     }
 

From 33e46682b1a8cbb7bc0946749adee2b1b1113ebd Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 30 Jan 2019 15:18:28 -0800
Subject: [PATCH 07/34] Fix various problems with reflow

- No longer reflow lines where the full unwrapped line contains the cursor
- Add guards to prevent y and ybase becoming invalid values

Part of Microsoft/vscode#67364
Fixes #1910
---
 src/Buffer.ts       | 44 +++++++++++++++++++++++++++++---------------
 src/BufferReflow.ts | 14 ++++++++++----
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 52d9572d..bc2d5f20 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -3,13 +3,13 @@
  * @license MIT
  */
 
-import { CircularList, IInsertEvent, IDeleteEvent } from './common/CircularList';
-import { CharData, ITerminal, IBuffer, IBufferLine, BufferIndex, IBufferStringIterator, IBufferStringIteratorResult } from './Types';
-import { EventEmitter } from './common/EventEmitter';
 import { IMarker } from 'xterm';
 import { BufferLine } from './BufferLine';
+import { reflowLargerApplyNewLayout, reflowLargerCreateNewLayout, reflowLargerGetLinesToRemove, reflowSmallerGetNewLineLengths } from './BufferReflow';
+import { CircularList, IDeleteEvent, IInsertEvent } from './common/CircularList';
+import { EventEmitter } from './common/EventEmitter';
 import { DEFAULT_COLOR } from './renderer/atlas/Types';
-import { reflowSmallerGetNewLineLengths, reflowLargerGetLinesToRemove, reflowLargerCreateNewLayout, reflowLargerApplyNewLayout } from './BufferReflow';
+import { BufferIndex, CharData, IBuffer, IBufferLine, IBufferStringIterator, IBufferStringIteratorResult, ITerminal } from './Types';
 
 export const DEFAULT_ATTR = (0 << 18) | (DEFAULT_COLOR << 9) | (256 << 0);
 export const CHAR_DATA_ATTR_INDEX = 0;
@@ -212,7 +212,7 @@ export class Buffer implements IBuffer {
     this.scrollBottom = newRows - 1;
 
     if (this._hasScrollback) {
-      this._reflow(newCols);
+      this._reflow(newCols, newRows);
 
       // Trim the end of the line off if cols shrunk
       if (this._cols > newCols) {
@@ -226,7 +226,7 @@ export class Buffer implements IBuffer {
     this._rows = newRows;
   }
 
-  private _reflow(newCols: number): void {
+  private _reflow(newCols: number, newRows: number): void {
     if (this._cols === newCols) {
       return;
     }
@@ -235,12 +235,12 @@ export class Buffer implements IBuffer {
     if (newCols > this._cols) {
       this._reflowLarger(newCols);
     } else {
-      this._reflowSmaller(newCols);
+      this._reflowSmaller(newCols, newRows);
     }
   }
 
   private _reflowLarger(newCols: number): void {
-    const toRemove: number[] = reflowLargerGetLinesToRemove(this.lines, newCols);
+    const toRemove: number[] = reflowLargerGetLinesToRemove(this.lines, newCols, this.ybase + this.y);
     if (toRemove.length > 0) {
       const newLayoutResult = reflowLargerCreateNewLayout(this.lines, toRemove);
       reflowLargerApplyNewLayout(this.lines, newLayoutResult.layout);
@@ -253,9 +253,13 @@ export class Buffer implements IBuffer {
     let viewportAdjustments = countRemoved;
     while (viewportAdjustments-- > 0) {
       if (this.ybase === 0) {
-        this.y--;
-        // Add an extra row at the bottom of the viewport
-        this.lines.push(new BufferLine(newCols, FILL_CHAR_DATA));
+        if (this.y > 0) {
+          this.y--;
+        }
+        if (this.lines.length < this._rows) {
+          // Add an extra row at the bottom of the viewport
+          this.lines.push(new BufferLine(newCols, FILL_CHAR_DATA));
+        }
       } else {
         if (this.ydisp === this.ybase) {
           this.ydisp--;
@@ -265,7 +269,7 @@ export class Buffer implements IBuffer {
     }
   }
 
-  private _reflowSmaller(newCols: number): void {
+  private _reflowSmaller(newCols: number, newRows: number): void {
     // Gather all BufferLines that need to be inserted into the Buffer here so that they can be
     // batched up and only committed once
     const toInsert = [];
@@ -285,6 +289,13 @@ export class Buffer implements IBuffer {
         wrappedLines.unshift(nextLine);
       }
 
+      // If these lines contain the cursor don't touch them, the program will handle fixing up
+      // wrapped lines with the cursor
+      const absoluteY = this.ybase + this.y;
+      if (absoluteY >= y && absoluteY < y + wrappedLines.length) {
+        continue;
+      }
+
       const lastLineLength = wrappedLines[wrappedLines.length - 1].getTrimmedLength();
       const destLineLengths = reflowSmallerGetNewLineLengths(wrappedLines, this._cols, newCols);
       const linesToAdd = destLineLengths.length - wrappedLines.length;
@@ -357,10 +368,13 @@ export class Buffer implements IBuffer {
             this.ydisp++;
           }
         } else {
-          if (this.ybase === this.ydisp) {
-            this.ydisp++;
+          // Ensure ybase does not exceed its maximum value
+          if (this.ybase < Math.min(this.lines.maxLength, this.lines.length + countToInsert) - newRows) {
+            if (this.ybase === this.ydisp) {
+              this.ydisp++;
+            }
+            this.ybase++;
           }
-          this.ybase++;
         }
       }
     }
diff --git a/src/BufferReflow.ts b/src/BufferReflow.ts
index 59934e46..24ab69e6 100644
--- a/src/BufferReflow.ts
+++ b/src/BufferReflow.ts
@@ -3,10 +3,10 @@
  * @license MIT
  */
 
+import { FILL_CHAR_DATA } from './Buffer';
 import { BufferLine } from './BufferLine';
 import { CircularList, IDeleteEvent } from './common/CircularList';
 import { IBufferLine } from './Types';
-import { FILL_CHAR_DATA } from './Buffer';
 
 export interface INewLayoutResult {
   layout: number[];
@@ -19,7 +19,7 @@ export interface INewLayoutResult {
  * @param lines The buffer lines.
  * @param newCols The columns after resize.
  */
-export function reflowLargerGetLinesToRemove(lines: CircularList<IBufferLine>, newCols: number): number[] {
+export function reflowLargerGetLinesToRemove(lines: CircularList<IBufferLine>, newCols: number, bufferAbsoluteY: number): number[] {
   // Gather all BufferLines that need to be removed from the Buffer here so that they can be
   // batched up and only committed once
   const toRemove: number[] = [];
@@ -39,6 +39,13 @@ export function reflowLargerGetLinesToRemove(lines: CircularList<IBufferLine>, n
       nextLine = lines.get(++i) as BufferLine;
     }
 
+    // If these lines contain the cursor don't touch them, the program will handle fixing up wrapped
+    // lines with the cursor
+    if (bufferAbsoluteY >= y && bufferAbsoluteY < i) {
+      y += wrappedLines.length - 1;
+      continue;
+    }
+
     // Copy buffer data to new locations
     let destLineIndex = 0;
     let destCol = wrappedLines[destLineIndex].getTrimmedLength();
@@ -64,7 +71,7 @@ export function reflowLargerGetLinesToRemove(lines: CircularList<IBufferLine>, n
       }
 
       // Make sure the last cell isn't wide, if it is copy it to the current dest
-      if (destCol === 0) {
+      if (destCol === 0 && destLineIndex !== 0) {
         if (wrappedLines[destLineIndex - 1].getWidth(newCols - 1) === 2) {
           wrappedLines[destLineIndex].copyCellsFrom(wrappedLines[destLineIndex - 1], newCols - 1, destCol++, 1, false);
           // Null out the end of the last row
@@ -166,7 +173,6 @@ export function reflowLargerApplyNewLayout(lines: CircularList<IBufferLine>, new
  */
 export function reflowSmallerGetNewLineLengths(wrappedLines: BufferLine[], oldCols: number, newCols: number): number[] {
   const newLineLengths: number[] = [];
-
   const cellsNeeded = wrappedLines.map(l => l.getTrimmedLength()).reduce((p, c) => p + c);
 
   // Use srcCol and srcLine to find the new wrapping point, use that to get the cellsAvailable and

From db31a44da3da0100ae26d0fb6a20eeecf61881f6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 30 Jan 2019 22:14:47 -0800
Subject: [PATCH 08/34] Fix tests

---
 src/Buffer.test.ts | 66 +++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index a56fd63a..2a244472 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -265,6 +265,7 @@ describe('Buffer', () => {
           const char = String.fromCharCode(code);
           firstLine.set(i, [null, char, 1, code]);
         }
+        buffer.y = 1;
         assert.equal(buffer.lines.get(0).length, 5);
         assert.equal(buffer.lines.get(0).translateToString(), 'abcde');
         buffer.resize(1, 10);
@@ -296,7 +297,7 @@ describe('Buffer', () => {
         buffer.fillViewportRows();
         terminal.options.scrollback = 1;
         buffer.resize(10, 5);
-        const lastLine = buffer.lines.get(4);
+        const lastLine = buffer.lines.get(3);
         for (let i = 0; i < 10; i++) {
           const code = 'a'.charCodeAt(0) + i;
           const char = String.fromCharCode(code);
@@ -308,27 +309,27 @@ describe('Buffer', () => {
         assert.equal(buffer.y, 4);
         assert.equal(buffer.ybase, 1);
         assert.equal(buffer.lines.length, 6);
-        assert.equal(buffer.lines.get(0).translateToString(), '  ');
-        assert.equal(buffer.lines.get(1).translateToString(), 'ab');
-        assert.equal(buffer.lines.get(2).translateToString(), 'cd');
-        assert.equal(buffer.lines.get(3).translateToString(), 'ef');
-        assert.equal(buffer.lines.get(4).translateToString(), 'gh');
-        assert.equal(buffer.lines.get(5).translateToString(), 'ij');
+        assert.equal(buffer.lines.get(0).translateToString(), 'ab');
+        assert.equal(buffer.lines.get(1).translateToString(), 'cd');
+        assert.equal(buffer.lines.get(2).translateToString(), 'ef');
+        assert.equal(buffer.lines.get(3).translateToString(), 'gh');
+        assert.equal(buffer.lines.get(4).translateToString(), 'ij');
+        assert.equal(buffer.lines.get(5).translateToString(), '  ');
         buffer.resize(1, 5);
         assert.equal(buffer.y, 4);
         assert.equal(buffer.ybase, 1);
         assert.equal(buffer.lines.length, 6);
-        assert.equal(buffer.lines.get(0).translateToString(), 'e');
-        assert.equal(buffer.lines.get(1).translateToString(), 'f');
-        assert.equal(buffer.lines.get(2).translateToString(), 'g');
-        assert.equal(buffer.lines.get(3).translateToString(), 'h');
-        assert.equal(buffer.lines.get(4).translateToString(), 'i');
-        assert.equal(buffer.lines.get(5).translateToString(), 'j');
+        assert.equal(buffer.lines.get(0).translateToString(), 'f');
+        assert.equal(buffer.lines.get(1).translateToString(), 'g');
+        assert.equal(buffer.lines.get(2).translateToString(), 'h');
+        assert.equal(buffer.lines.get(3).translateToString(), 'i');
+        assert.equal(buffer.lines.get(4).translateToString(), 'j');
+        assert.equal(buffer.lines.get(5).translateToString(), ' ');
         buffer.resize(10, 5);
-        assert.equal(buffer.y, 0);
+        assert.equal(buffer.y, 1);
         assert.equal(buffer.ybase, 0);
         assert.equal(buffer.lines.length, 5);
-        assert.equal(buffer.lines.get(0).translateToString(), 'efghij    ');
+        assert.equal(buffer.lines.get(0).translateToString(), 'fghij     ');
         assert.equal(buffer.lines.get(1).translateToString(), '          ');
         assert.equal(buffer.lines.get(2).translateToString(), '          ');
         assert.equal(buffer.lines.get(3).translateToString(), '          ');
@@ -339,6 +340,7 @@ describe('Buffer', () => {
         // 3+ lines removed on a reflow actually remove the right lines
         buffer.fillViewportRows();
         buffer.resize(10, 10);
+        buffer.y = 2;
         const firstLine = buffer.lines.get(0);
         const secondLine = buffer.lines.get(1);
         for (let i = 0; i < 10; i++) {
@@ -358,8 +360,8 @@ describe('Buffer', () => {
           assert.equal(buffer.lines.get(i).translateToString(), '          ');
         }
         buffer.resize(2, 10);
-        assert.equal(buffer.ybase, 0);
-        assert.equal(buffer.lines.length, 10);
+        assert.equal(buffer.ybase, 1);
+        assert.equal(buffer.lines.length, 11);
         assert.equal(buffer.lines.get(0).translateToString(), 'ab');
         assert.equal(buffer.lines.get(1).translateToString(), 'cd');
         assert.equal(buffer.lines.get(2).translateToString(), 'ef');
@@ -370,7 +372,10 @@ describe('Buffer', () => {
         assert.equal(buffer.lines.get(7).translateToString(), '45');
         assert.equal(buffer.lines.get(8).translateToString(), '67');
         assert.equal(buffer.lines.get(9).translateToString(), '89');
+        assert.equal(buffer.lines.get(10).translateToString(), '  ');
         buffer.resize(10, 10);
+        assert.equal(buffer.ybase, 0);
+        assert.equal(buffer.lines.length, 10);
         assert.equal(buffer.lines.get(0).translateToString(), 'abcdefghij');
         assert.equal(buffer.lines.get(1).translateToString(), '0123456789');
         for (let i = 2; i < 10; i++) {
@@ -379,22 +384,23 @@ describe('Buffer', () => {
       });
       it('should transfer combined char data over to reflowed lines', () => {
         buffer.fillViewportRows();
-        buffer.resize(4, 2);
+        buffer.resize(4, 3);
+        buffer.y = 2;
         const firstLine = buffer.lines.get(0);
         firstLine.set(0, [ null, 'a', 1, 'a'.charCodeAt(0) ]);
         firstLine.set(1, [ null, 'b', 1, 'b'.charCodeAt(0) ]);
         firstLine.set(2, [ null, 'c', 1, 'c'.charCodeAt(0) ]);
         firstLine.set(3, [ null, '😁', 1, '😁'.charCodeAt(0) ]);
-        assert.equal(buffer.lines.length, 2);
+        assert.equal(buffer.lines.length, 3);
         assert.equal(buffer.lines.get(0).translateToString(), 'abc😁');
         assert.equal(buffer.lines.get(1).translateToString(), '    ');
-        buffer.resize(2, 2);
+        buffer.resize(2, 3);
         assert.equal(buffer.lines.get(0).translateToString(), 'ab');
         assert.equal(buffer.lines.get(1).translateToString(), 'c😁');
       });
       it('should adjust markers when reflowing', () => {
         buffer.fillViewportRows();
-        buffer.resize(10, 15);
+        buffer.resize(10, 16);
         for (let i = 0; i < 10; i++) {
           const code = 'a'.charCodeAt(0) + i;
           const char = String.fromCharCode(code);
@@ -410,6 +416,7 @@ describe('Buffer', () => {
           const char = String.fromCharCode(code);
           buffer.lines.get(2).set(i, [null, char, 1, code]);
         }
+        buffer.y = 3;
         // Buffer:
         // abcdefghij
         // 0123456789
@@ -423,7 +430,7 @@ describe('Buffer', () => {
         assert.equal(firstMarker.line, 0);
         assert.equal(secondMarker.line, 1);
         assert.equal(thirdMarker.line, 2);
-        buffer.resize(2, 15);
+        buffer.resize(2, 16);
         assert.equal(buffer.lines.get(0).translateToString(), 'ab');
         assert.equal(buffer.lines.get(1).translateToString(), 'cd');
         assert.equal(buffer.lines.get(2).translateToString(), 'ef');
@@ -442,7 +449,7 @@ describe('Buffer', () => {
         assert.equal(firstMarker.line, 0, 'first marker should remain unchanged');
         assert.equal(secondMarker.line, 5, 'second marker should be shifted since the first line wrapped');
         assert.equal(thirdMarker.line, 10, 'third marker should be shifted since the first and second lines wrapped');
-        buffer.resize(10, 15);
+        buffer.resize(10, 16);
         assert.equal(buffer.lines.get(0).translateToString(), 'abcdefghij');
         assert.equal(buffer.lines.get(1).translateToString(), '0123456789');
         assert.equal(buffer.lines.get(2).translateToString(), 'klmnopqrst');
@@ -456,7 +463,7 @@ describe('Buffer', () => {
       it('should dispose markers whose rows are trimmed during a reflow', () => {
         buffer.fillViewportRows();
         terminal.options.scrollback = 1;
-        buffer.resize(10, 10);
+        buffer.resize(10, 11);
         for (let i = 0; i < 10; i++) {
           const code = 'a'.charCodeAt(0) + i;
           const char = String.fromCharCode(code);
@@ -472,6 +479,7 @@ describe('Buffer', () => {
           const char = String.fromCharCode(code);
           buffer.lines.get(2).set(i, [null, char, 1, code]);
         }
+        buffer.y = 10;
         // Buffer:
         // abcdefghij
         // 0123456789
@@ -479,14 +487,14 @@ describe('Buffer', () => {
         const firstMarker = buffer.addMarker(0);
         const secondMarker = buffer.addMarker(1);
         const thirdMarker = buffer.addMarker(2);
-        buffer.y = 2;
+        buffer.y = 3;
         assert.equal(buffer.lines.get(0).translateToString(), 'abcdefghij');
         assert.equal(buffer.lines.get(1).translateToString(), '0123456789');
         assert.equal(buffer.lines.get(2).translateToString(), 'klmnopqrst');
         assert.equal(firstMarker.line, 0);
         assert.equal(secondMarker.line, 1);
         assert.equal(thirdMarker.line, 2);
-        buffer.resize(2, 10);
+        buffer.resize(2, 11);
         assert.equal(buffer.lines.get(0).translateToString(), 'ij');
         assert.equal(buffer.lines.get(1).translateToString(), '01');
         assert.equal(buffer.lines.get(2).translateToString(), '23');
@@ -503,7 +511,7 @@ describe('Buffer', () => {
         assert.equal(firstMarker.isDisposed, true, 'first marker was trimmed');
         assert.equal(secondMarker.isDisposed, false);
         assert.equal(thirdMarker.isDisposed, false);
-        buffer.resize(10, 10);
+        buffer.resize(10, 11);
         assert.equal(buffer.lines.get(0).translateToString(), 'ij        ');
         assert.equal(buffer.lines.get(1).translateToString(), '0123456789');
         assert.equal(buffer.lines.get(2).translateToString(), 'klmnopqrst');
@@ -513,6 +521,7 @@ describe('Buffer', () => {
       it('should wrap wide characters correctly when reflowing larger', () => {
         buffer.fillViewportRows();
         buffer.resize(12, 10);
+        buffer.y = 2;
         for (let i = 0; i < 12; i += 4) {
           buffer.lines.get(0).set(i, [null, '汉', 2, '汉'.charCodeAt(0)]);
           buffer.lines.get(1).set(i, [null, '汉', 2, '汉'.charCodeAt(0)]);
@@ -547,6 +556,7 @@ describe('Buffer', () => {
       it('should wrap wide characters correctly when reflowing smaller', () => {
         buffer.fillViewportRows();
         buffer.resize(12, 10);
+        buffer.y = 2;
         for (let i = 0; i < 12; i += 4) {
           buffer.lines.get(0).set(i, [null, '汉', 2, '汉'.charCodeAt(0)]);
           buffer.lines.get(1).set(i, [null, '汉', 2, '汉'.charCodeAt(0)]);
@@ -937,6 +947,7 @@ describe('Buffer', () => {
             describe('&& ydisp === ybase', () => {
               it('should trim lines and keep ydisp = ybase', () => {
                 buffer.ydisp = 10;
+                buffer.y = 13;
                 buffer.resize(2, 10);
                 assert.equal(buffer.ydisp, 10);
                 assert.equal(buffer.ybase, 10);
@@ -962,6 +973,7 @@ describe('Buffer', () => {
             describe('&& ydisp !== ybase', () => {
               it('should trim lines and not change ydisp', () => {
                 buffer.ydisp = 5;
+                buffer.y = 13;
                 buffer.resize(2, 10);
                 assert.equal(buffer.ydisp, 5);
                 assert.equal(buffer.ybase, 10);

From 7b7f85e3cf0976b157a64c727276ad3b9d807e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Thu, 31 Jan 2019 22:56:55 +0100
Subject: [PATCH 09/34] add test for correct tab handling, docs

---
 src/Buffer.test.ts | 7 +++++++
 src/Buffer.ts      | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index 1ef2271f..53de19b7 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -1312,6 +1312,13 @@ describe('Buffer', () => {
           terminal.buffer.lines.get(bufferIndex[0]).get(bufferIndex[1])[CHAR_DATA_CHAR_INDEX]);
       }
     });
+
+    it('should handle \t in lines correctly', () => {
+      const input = '\thttps://google.de';
+      terminal.writeSync(input);
+      const s = terminal.buffer.iterator(true).next().content;
+      assert.equal(s, Array(terminal.getOption('tabStopWidth') + 1).join(' ') + 'https://google.de');
+    });
   });
   describe('BufferStringIterator', function(): void {
     it('iterator does not overflow buffer limits', function(): void {
diff --git a/src/Buffer.ts b/src/Buffer.ts
index 8eddf73f..7f4b6071 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -458,7 +458,9 @@ export class Buffer implements IBuffer {
       const length = (trimRight) ? line.getTrimmedLength() : line.length;
       for (let i = 0; i < length; ++i) {
         if (line.get(i)[CHAR_DATA_WIDTH_INDEX]) {
-          stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length || 1; // WHITESPACE_CELL_CHAR.length
+          // empty cells report a string length of 0, but get replaced
+          // with a whitespace in translateToString, thus replace with 1
+          stringIndex -= line.get(i)[CHAR_DATA_CHAR_INDEX].length || 1;
         }
         if (stringIndex < 0) {
           return [lineIndex, i];

From 828f14f2abd58f42497903e745fbfc0af02c34bd Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Thu, 31 Jan 2019 14:00:39 -0800
Subject: [PATCH 10/34] Improve docs on Terminal.resize

---
 typings/xterm.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index dc9ebbae..d813bc5f 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -443,7 +443,9 @@ declare module 'xterm' {
     addDisposableListener(type: string, handler: (...args: any[]) => void): IDisposable;
 
     /**
-     * Resizes the terminal.
+     * Resizes the terminal. It's best practice to debounce calls to resize,
+     * this will help ensure that the pty can respond to the resize event
+     * before another one occurs.
      * @param x The number of columns to resize to.
      * @param y The number of rows to resize to.
      */

From 54a1319f57c4a8f38f91209705d4d85f402940b0 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Fri, 1 Feb 2019 18:23:10 -0800
Subject: [PATCH 11/34] v3.11.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ed3a4b8..fa9cc070 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "main": "lib/public/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",

From 1829cb7609029405230e69803c0262f2768a40ff Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Fri, 1 Feb 2019 19:28:07 -0800
Subject: [PATCH 12/34] Add roadmap wiki link to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 35ccc9b6..f22c6c00 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ Do you use xterm.js in your application as well? Please [open a Pull Request](ht
 
 Xterm.js follows a monthly release cycle roughly.
 
-All current and past releases are available on this repo's [Releases page](https://github.com/sourcelair/xterm.js/releases), while a rough roadmap is available by looking through [Milestones](https://github.com/sourcelair/xterm.js/milestones).
+All current and past releases are available on this repo's [Releases page](https://github.com/sourcelair/xterm.js/releases), you can view the [high-level roadmap on the wiki](https://github.com/xtermjs/xterm.js/wiki/Roadmap) and see what we're working on now by looking through [Milestones](https://github.com/sourcelair/xterm.js/milestones).
 
 ## Contributing
 

From f3aac10bbd32efb4c5f648d7fe7b7cdd10a25a55 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Sun, 3 Feb 2019 10:46:20 -0800
Subject: [PATCH 13/34] Update license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 28adbdad..4472336c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2018, The xterm.js authors (https://github.com/xtermjs/xterm.js)
+Copyright (c) 2017-2019, The xterm.js authors (https://github.com/xtermjs/xterm.js)
 Copyright (c) 2014-2016, SourceLair Private Company (https://www.sourcelair.com)
 Copyright (c) 2012-2013, Christopher Jeffrey (https://github.com/chjj/)
 

From 69d3a4667f6d3ade4a89e71be066de0e69d82d16 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Mon, 4 Feb 2019 13:28:14 +0200
Subject: [PATCH 14/34] fix: Renderer: IntersectionObserver can produce more
 then 1 entry

---
 src/renderer/Renderer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index 02328877..b8ef87aa 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -70,7 +70,7 @@ export class Renderer extends EventEmitter implements IRenderer {
     // Detect whether IntersectionObserver is detected and enable renderer pause
     // and resume based on terminal visibility if so
     if ('IntersectionObserver' in window) {
-      const observer = new IntersectionObserver(e => this.onIntersectionChange(e[0]), { threshold: 0 });
+      const observer = new IntersectionObserver(e => this.onIntersectionChange(e[e.length - 1]), { threshold: 0 });
       observer.observe(this._terminal.element);
       this.register({ dispose: () => observer.disconnect() });
     }

From b88230db8ba0d54fb194f5b903215a53b017a743 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Tue, 5 Feb 2019 08:20:16 -0800
Subject: [PATCH 15/34] Make sure the viewport is filled when reflowing a row
 change

Fixes #1926
---
 src/Buffer.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 7f4b6071..e40fa8b4 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -233,22 +233,22 @@ export class Buffer implements IBuffer {
 
     // Iterate through rows, ignore the last one as it cannot be wrapped
     if (newCols > this._cols) {
-      this._reflowLarger(newCols);
+      this._reflowLarger(newCols, newRows);
     } else {
       this._reflowSmaller(newCols, newRows);
     }
   }
 
-  private _reflowLarger(newCols: number): void {
+  private _reflowLarger(newCols: number, newRows: number): void {
     const toRemove: number[] = reflowLargerGetLinesToRemove(this.lines, newCols, this.ybase + this.y);
     if (toRemove.length > 0) {
       const newLayoutResult = reflowLargerCreateNewLayout(this.lines, toRemove);
       reflowLargerApplyNewLayout(this.lines, newLayoutResult.layout);
-      this._reflowLargerAdjustViewport(newCols, newLayoutResult.countRemoved);
+      this._reflowLargerAdjustViewport(newCols, newRows, newLayoutResult.countRemoved);
     }
   }
 
-  private _reflowLargerAdjustViewport(newCols: number, countRemoved: number): void {
+  private _reflowLargerAdjustViewport(newCols: number, newRows: number, countRemoved: number): void {
     // Adjust viewport based on number of items removed
     let viewportAdjustments = countRemoved;
     while (viewportAdjustments-- > 0) {
@@ -256,7 +256,7 @@ export class Buffer implements IBuffer {
         if (this.y > 0) {
           this.y--;
         }
-        if (this.lines.length < this._rows) {
+        if (this.lines.length < newRows) {
           // Add an extra row at the bottom of the viewport
           this.lines.push(new BufferLine(newCols, FILL_CHAR_DATA));
         }

From d17dfbc73fc61d467ad079e4e0b90ae778687a88 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 8 Feb 2019 12:13:00 -0800
Subject: [PATCH 16/34] Cover a case when resizing smaller making y go out of
 bounds

---
 src/Buffer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index e40fa8b4..d017aa7e 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -360,7 +360,7 @@ export class Buffer implements IBuffer {
       let viewportAdjustments = linesToAdd - trimmedLines;
       while (viewportAdjustments-- > 0) {
         if (this.ybase === 0) {
-          if (this.y < this._rows - 1) {
+          if (this.y < newRows - 1) {
             this.y++;
             this.lines.pop();
           } else {

From 92be01dd8188b9b2eb730048526f51443b4fac6c Mon Sep 17 00:00:00 2001
From: Ahtsham Raziq <ahtsham.raziq@barefootandco.com>
Date: Sat, 9 Feb 2019 23:24:32 +0500
Subject: [PATCH 17/34] Compose file: fix variable substitution

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8e6a2f46..6eefed89 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - ./:/usr/src/app
     ports:
-      - ${XTERMJS_PORT:3000}:3000
+      - ${XTERMJS_PORT:-3000}:3000
     command: ["npm", "start"]
 
   watch:

From 84d7bfeacce308c0dc762e038a20ea36b03b44cd Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Mon, 11 Feb 2019 05:14:55 -0800
Subject: [PATCH 18/34] Remove font-family from .css file

Fixes #1935
---
 src/xterm.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/xterm.css b/src/xterm.css
index 24cd475f..2e47b1a1 100644
--- a/src/xterm.css
+++ b/src/xterm.css
@@ -36,7 +36,6 @@
  */
 
 .xterm {
-    font-family: courier-new, courier, monospace;
     font-feature-settings: "liga" 0;
     position: relative;
     user-select: none;

From 817401bbcd08c45ffa8169341213d49b7de81823 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Mon, 11 Feb 2019 05:32:47 -0800
Subject: [PATCH 19/34] Align y draw coord with how cache draws it

Fixes #1937
---
 src/renderer/BaseRenderLayer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 3e0b8643..a609d79c 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -241,7 +241,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     this._ctx.fillText(
         charData[CHAR_DATA_CHAR_INDEX],
         x * this._scaledCellWidth + this._scaledCharLeft,
-        (y + 0.5) * this._scaledCellHeight + this._scaledCharTop);
+        y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
   }
 
   /**
@@ -316,7 +316,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     this._ctx.fillText(
         chars,
         x * this._scaledCellWidth + this._scaledCharLeft,
-        (y + 0.5) * this._scaledCellHeight + this._scaledCharTop);
+        y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
     this._ctx.restore();
   }
 

From 78426d8a12c56f40cf1c2d74fb53c23f2982ebb5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Mon, 11 Feb 2019 06:05:14 -0800
Subject: [PATCH 20/34] Make the composition view use the same font as the
 terminal

---
 src/CompositionHelper.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CompositionHelper.ts b/src/CompositionHelper.ts
index 31ad866b..5f838c7a 100644
--- a/src/CompositionHelper.ts
+++ b/src/CompositionHelper.ts
@@ -203,6 +203,7 @@ export class CompositionHelper {
       this._compositionView.style.top = cursorTop + 'px';
       this._compositionView.style.height = cellHeight + 'px';
       this._compositionView.style.lineHeight = cellHeight + 'px';
+      this._compositionView.style.fontFamily = this._terminal.options.fontFamily;
       // Sync the textarea to the exact position of the composition view so the IME knows where the
       // text is.
       const compositionViewBounds = this._compositionView.getBoundingClientRect();

From c934200c86ccaca419cae6aae210880a52791c46 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Mon, 11 Feb 2019 06:07:31 -0800
Subject: [PATCH 21/34] Also set font size

---
 src/CompositionHelper.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CompositionHelper.ts b/src/CompositionHelper.ts
index 5f838c7a..840bef55 100644
--- a/src/CompositionHelper.ts
+++ b/src/CompositionHelper.ts
@@ -204,6 +204,7 @@ export class CompositionHelper {
       this._compositionView.style.height = cellHeight + 'px';
       this._compositionView.style.lineHeight = cellHeight + 'px';
       this._compositionView.style.fontFamily = this._terminal.options.fontFamily;
+      this._compositionView.style.fontSize = this._terminal.options.fontSize + 'px';
       // Sync the textarea to the exact position of the composition view so the IME knows where the
       // text is.
       const compositionViewBounds = this._compositionView.getBoundingClientRect();

From 9f29eeed2338dbc8861c65a1a35631fc34d980e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E8=99=AB?= <liuzheng712@gmail.com>
Date: Tue, 19 Feb 2019 17:19:19 +0800
Subject: [PATCH 22/34] Update README.md

(Jumpserver)[https://github.com/jumpserver/] use xterm.js
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f22c6c00..59e406e9 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,7 @@ Xterm.js is used in several world-class applications to provide great terminal e
 
 - [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on xterm.js
 - [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on xterm.js
+- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation. 
 - [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on xterm.js
 - [**Katacoda**](https://www.katacoda.com/): Katacoda is an Interactive Learning Platform for software developers, covering the latest Cloud Native technologies.
 - [**Eclipse Che**](http://www.eclipse.org/che): Developer workspace server, cloud IDE, and Eclipse next-generation IDE.

From e1c1c7a4f217f75eea4ed71fd0afcf5a1f14a93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E8=99=AB?= <liuzheng712@gmail.com>
Date: Wed, 20 Feb 2019 14:57:16 +0800
Subject: [PATCH 23/34] Update README.md

move it to the bottom
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 59e406e9..17bc9fb4 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,6 @@ Xterm.js is used in several world-class applications to provide great terminal e
 
 - [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on xterm.js
 - [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on xterm.js
-- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation. 
 - [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on xterm.js
 - [**Katacoda**](https://www.katacoda.com/): Katacoda is an Interactive Learning Platform for software developers, covering the latest Cloud Native technologies.
 - [**Eclipse Che**](http://www.eclipse.org/che): Developer workspace server, cloud IDE, and Eclipse next-generation IDE.
@@ -155,6 +154,7 @@ computational environment for Jupyter, supporting interactive data science and s
 - [**Juno**](http://junolab.org/): A flexible Julia IDE, based on Atom.
 - [**webssh**](https://github.com/huashengdun/webssh): Web based ssh client.
 - [**info-beamer hosted**](https://info-beamer.com): Uses Xterm.js to manage digital signage devices from the web dashboard.
+- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation. 
 
 [And much more...](https://github.com/xtermjs/xterm.js/network/dependents)
 

From 3285374618a2ea112e5124c3b551ae0ac0761035 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 20 Feb 2019 07:03:40 -0800
Subject: [PATCH 24/34] Disable reflow when winptyCompat is on

Fixes #1943
---
 src/Buffer.ts                           | 6 +++++-
 src/addons/winptyCompat/winptyCompat.ts | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 7f4b6071..bf0bfe17 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -211,7 +211,7 @@ export class Buffer implements IBuffer {
 
     this.scrollBottom = newRows - 1;
 
-    if (this._hasScrollback) {
+    if (this._isReflowEnabled) {
       this._reflow(newCols, newRows);
 
       // Trim the end of the line off if cols shrunk
@@ -226,6 +226,10 @@ export class Buffer implements IBuffer {
     this._rows = newRows;
   }
 
+  private get _isReflowEnabled(): boolean {
+    return this._hasScrollback && !(this._terminal as any).isWinptyCompatEnabled;
+  }
+
   private _reflow(newCols: number, newRows: number): void {
     if (this._cols === newCols) {
       return;
diff --git a/src/addons/winptyCompat/winptyCompat.ts b/src/addons/winptyCompat/winptyCompat.ts
index aec580ed..d162f4e9 100644
--- a/src/addons/winptyCompat/winptyCompat.ts
+++ b/src/addons/winptyCompat/winptyCompat.ts
@@ -19,6 +19,8 @@ export function winptyCompatInit(terminal: Terminal): void {
     return;
   }
 
+  (addonTerminal._core as any).isWinptyCompatEnabled = true;
+
   // Winpty does not support wraparound mode which means that lines will never
   // be marked as wrapped. This causes issues for things like copying a line
   // retaining the wrapped new line characters or if consumers are listening

From 0854f846533689b253e3a6b6924216b2b52592f3 Mon Sep 17 00:00:00 2001
From: Sebastian Pfitzner <pfitzseb@physik.hu-berlin.de>
Date: Tue, 26 Feb 2019 11:28:51 +0100
Subject: [PATCH 25/34] actually fix mouse handler before term attached

---
 src/InputHandler.ts | 8 ++++++--
 src/Terminal.ts     | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 2f53cfcb..7405ff9f 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1284,7 +1284,9 @@ export class InputHandler extends Disposable implements IInputHandler {
           if (this._terminal.element) {
             this._terminal.element.classList.add('enable-mouse-events');
           }
-          this._terminal.selectionManager.disable();
+          if (this._terminal.selectionManager) {
+            this._terminal.selectionManager.disable();
+          }
           this._terminal.log('Binding to mouse events.');
           break;
         case 1004: // send focusin/focusout events
@@ -1474,7 +1476,9 @@ export class InputHandler extends Disposable implements IInputHandler {
           if (this._terminal.element) {
             this._terminal.element.classList.remove('enable-mouse-events');
           }
-          this._terminal.selectionManager.enable();
+          if (this._terminal.selectionManager) {
+            this._terminal.selectionManager.enable();
+          }
           break;
         case 1004: // send focusin/focusout events
           this._terminal.sendFocus = false;
diff --git a/src/Terminal.ts b/src/Terminal.ts
index c1fc8ec8..cb9bc675 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -738,6 +738,11 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
     this.mouseHelper = new MouseHelper(this.renderer);
     // apply mouse event classes set by escape codes before terminal was attached
     this.element.classList.toggle('enable-mouse-events', this.mouseEvents);
+    if (this.mouseEvents) {
+      this.selectionManager.disable()
+    } else {
+      this.selectionManager.enable()
+    }
 
     if (this.options.screenReaderMode) {
       // Note that this must be done *after* the renderer is created in order to

From e178139907a8a9a098a249849931faf89bdec5dc Mon Sep 17 00:00:00 2001
From: Nick Shaffner <nshaffner@gmail.com>
Date: Wed, 27 Feb 2019 22:37:22 -0800
Subject: [PATCH 26/34] Fix for issue #812: Xterm.js's encoding of mouse
 coordinate

See: https://github.com/xtermjs/xterm.js/issues/812
Changed the utf-8 mouse encoding to match iTerm
---
 src/Terminal.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index c1fc8ec8..0539a904 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -854,16 +854,11 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
         if (ch > 127) ch = 127;
         data.push(ch);
       } else {
-        if (ch === 2047) {
-          data.push(0);
+        if (ch > 2047) {
+          data.push(2047);
           return;
-        }
-        if (ch < 127) {
-          data.push(ch);
         } else {
-          if (ch > 2047) ch = 2047;
-          data.push(0xC0 | (ch >> 6));
-          data.push(0x80 | (ch & 0x3F));
+          data.push(ch);
         }
       }
     }

From 4e479b455a659a53c7a26d05549bd38ba301c9be Mon Sep 17 00:00:00 2001
From: Ioannis Cherouvim <743305+cherouvim@users.noreply.github.com>
Date: Fri, 1 Mar 2019 14:40:21 +0200
Subject: [PATCH 27/34] docs: Consistent style on lists.

Added some missing dots, capitalized a couple of lines.
---
 CONTRIBUTING.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7924027..e8102a2e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,21 +33,21 @@ opening an issue, read these pointers.
 You can find issues to work on by looking at the [help wanted](https://github.com/xtermjs/xterm.js/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) or [good first issue](https://github.com/xtermjs/xterm.js/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) issues. It's a good idea to comment on the issue saying that you're taking it, just in case someone else comes along and you duplicate work. Once you have your issue, here are the steps to contribute:
 
 - Fork [xterm.js](https://github.com/sourcelair/xterm.js/)
-  ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
-- Get the [xterm.js demo](https://github.com/xtermjs/xterm.js/wiki/Contributing#running-the-demo) running
-- Make your changes
+  ([how to fork a repo](https://help.github.com/articles/fork-a-repo)).
+- Get the [xterm.js demo](https://github.com/xtermjs/xterm.js/wiki/Contributing#running-the-demo) running.
+- Make your changes.
 - If your changes are easy to test or likely to regress, add tests. Tests go into `test`, directory.
 - Follow the general code style of the rest of the project (see below).
 - Submit a pull request
 ([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
   Don't put more than one feature/fix in a single pull request.
 
-By contributing code to xterm.js you
+By contributing code to xterm.js you:
 
- - agree to license the contributed code under xterm.js' [MIT
+ - Agree to license the contributed code under xterm.js' [MIT
    license](LICENSE).
 
- - confirm that you have the right to contribute and license the code
+ - Confirm that you have the right to contribute and license the code
    in question. (Either you hold all rights on the code, or the rights
    holder has explicitly granted the right to use it like this,
    through a compatible open source license or through a direct

From a8a0344d1ac5ea411ea244a73754a06ffda2d308 Mon Sep 17 00:00:00 2001
From: Ioannis Cherouvim <743305+cherouvim@users.noreply.github.com>
Date: Fri, 1 Mar 2019 14:51:19 +0200
Subject: [PATCH 28/34] docs: style improvements

- Added a trailing dot at the end of each list line.
- Consistent usage of `xterm.js` in "Real-world uses".
---
 README.md | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 17bc9fb4..d70e8b7e 100644
--- a/README.md
+++ b/README.md
@@ -7,17 +7,17 @@ Xterm.js is a front-end component written in TypeScript that lets applications b
 
 ## Features
 
-- **Terminal apps just work**: Xterm.js works with most terminal apps such as `bash`, `vim` and `tmux`, this includes support for curses-based apps and mouse event support
-- **Perfomant**: Xterm.js is *really* fast, it even includes a GPU-accelerated renderer
-- **Rich unicode support**: Supports CJK, emojis and IMEs
-- **Self-contained**: Requires zero dependencies to work
-- **Accessible**: Screen reader support can be turned on using the `screenReaderMode` option
+- **Terminal apps just work**: Xterm.js works with most terminal apps such as `bash`, `vim` and `tmux`, this includes support for curses-based apps and mouse event support.
+- **Perfomant**: Xterm.js is *really* fast, it even includes a GPU-accelerated renderer.
+- **Rich unicode support**: Supports CJK, emojis and IMEs.
+- **Self-contained**: Requires zero dependencies to work.
+- **Accessible**: Screen reader support can be turned on using the `screenReaderMode` option.
 - **And much more**: Links, theming, addons, well documented API, etc.
 
 ## What xterm.js is not
 
-- Xterm.js is not a terminal application that you can download and use on your computer
-- Xterm.js is not `bash`. Xterm.js can be connected to processes like `bash` and let you interact with them (provide input, receive output)
+- Xterm.js is not a terminal application that you can download and use on your computer.
+- Xterm.js is not `bash`. Xterm.js can be connected to processes like `bash` and let you interact with them (provide input, receive output).
 
 ## Getting Started
 
@@ -41,7 +41,7 @@ To start using xterm.js on your browser, add the `xterm.js` and `xterm.css` to t
       <script>
         var term = new Terminal();
         term.open(document.getElementById('terminal'));
-        term.write('Hello from \x1B[1;3;31mxterm.js\x1B[0m $ ')
+        term.write('Hello from \x1B[1;3;31mxterm.js\x1B[0m $ ')
       </script>
     </body>
   </html>
@@ -106,9 +106,9 @@ Note that some APIs are marked *experimental*, these are added to enable experim
 ## Real-world uses
 Xterm.js is used in several world-class applications to provide great terminal experiences.
 
-- [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on xterm.js
-- [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on xterm.js
-- [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on xterm.js
+- [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on `xterm.js`.
+- [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on `xterm.js`.
+- [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on `xterm.js`.
 - [**Katacoda**](https://www.katacoda.com/): Katacoda is an Interactive Learning Platform for software developers, covering the latest Cloud Native technologies.
 - [**Eclipse Che**](http://www.eclipse.org/che): Developer workspace server, cloud IDE, and Eclipse next-generation IDE.
 - [**Codenvy**](http://www.codenvy.com): Cloud workspaces for development teams.
@@ -125,11 +125,10 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Selenoid UI**](https://github.com/aerokube/selenoid-ui): Simple UI for the scallable golang implementation of Selenium Hub named Selenoid. We use XTerm for streaming logs over websockets from docker containers.
 - [**Portainer**](https://portainer.io): Simple management UI for Docker.
 - [**SSHy**](https://github.com/stuicey/SSHy): HTML5 Based SSHv2 Web Client with E2E encryption utilising `xterm.js`, SJCL & websockets.
-- [**JupyterLab**](https://github.com/jupyterlab/jupyterlab): An extensible
-computational environment for Jupyter, supporting interactive data science and scientific computing across all programming languages.
+- [**JupyterLab**](https://github.com/jupyterlab/jupyterlab): An extensible computational environment for Jupyter, supporting interactive data science and scientific computing across all programming languages.
 - [**Theia**](https://github.com/theia-ide/theia): Theia is a cloud & desktop IDE framework implemented in TypeScript.
 - [**Opshell**](https://github.com/ricktbaker/opshell) Ops Helper tool to make life easier working with AWS instances across multiple organizations.
-- [**Proxmox VE**](https://www.proxmox.com/en/proxmox-ve): Proxmox VE is a complete open-source platform for enterprise virtualization. It uses xterm.js for container terminals and the host shell.
+- [**Proxmox VE**](https://www.proxmox.com/en/proxmox-ve): Proxmox VE is a complete open-source platform for enterprise virtualization. It uses `xterm.js` for container terminals and the host shell.
 - [**Script Runner**](https://github.com/ioquatix/script-runner): Run scripts (or a shell) in Atom.
 - [**Whack Whack Terminal**](https://github.com/Microsoft/WhackWhackTerminal): Terminal emulator for Visual Studio 2017.
 - [**VTerm**](https://github.com/vterm/vterm): Extensible terminal emulator based on Electron and React.
@@ -138,23 +137,23 @@ computational environment for Jupyter, supporting interactive data science and s
 - [**Azure Cloud Shell**](https://shell.azure.com): Azure Cloud Shell is a Microsoft-managed admin machine built on Azure, for Azure.
 - [**atom-xterm**](https://atom.io/packages/atom-xterm): Atom plugin for providing terminals inside your Atom workspace.
 - [**rtty**](https://github.com/zhaojh329/rtty): A reverse proxy WebTTY. It is composed of the client and the server.
-- [**Pisth**](https://github.com/ColdGrub1384/Pisth): An SFTP and SSH client for iOS
+- [**Pisth**](https://github.com/ColdGrub1384/Pisth): An SFTP and SSH client for iOS.
 - [**abstruse**](https://github.com/bleenco/abstruse): Abstruse CI is a continuous integration platform based on Node.JS and Docker.
 - [**Azure Data Studio**](https://github.com/Microsoft/azuredatastudio): A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
-- [**FreeMAN**](https://github.com/matthew-matvei/freeman): A free, cross-platform file manager for power users
+- [**FreeMAN**](https://github.com/matthew-matvei/freeman): A free, cross-platform file manager for power users.
 - [**Fluent Terminal**](https://github.com/felixse/FluentTerminal): A terminal emulator based on UWP and web technologies.
-- [**Hyper**](https://hyper.is): A terminal built on web technologies
+- [**Hyper**](https://hyper.is): A terminal built on web technologies.
 - [**Diag**](https://diag.ai): A better way to troubleshoot problems faster. Capture, share and reapply troubleshooting knowledge so you can focus on solving problems that matter.
-- [**GoTTY**](https://github.com/yudai/gotty): A simple command line tool that shares your terminal as a web application based on xterm.js.
+- [**GoTTY**](https://github.com/yudai/gotty): A simple command line tool that shares your terminal as a web application based on `xterm.js`.
 - [**genact**](https://github.com/svenstaro/genact): A nonsense activity generator.
 - [**cPanel & WHM**](https://cpanel.com): The hosting platform of choice.
-- [**Nutanix**](https://github.com/nutanix): Nutanix Enterprise Cloud uses xterm in the webssh functionality within Nutanix Calm, and is also looking to move our old noserial (termjs) functionality to xterm.js
+- [**Nutanix**](https://github.com/nutanix): Nutanix Enterprise Cloud uses xterm in the webssh functionality within Nutanix Calm, and is also looking to move our old noserial (termjs) functionality to `xterm.js`.
 - [**SSH Web Client**](https://github.com/roke22/PHP-SSH2-Web-Client): SSH Web Client with PHP.
 - [**Shellvault**](https://www.shellvault.io): The cloud-based SSH terminal you can access from anywhere.
 - [**Juno**](http://junolab.org/): A flexible Julia IDE, based on Atom.
 - [**webssh**](https://github.com/huashengdun/webssh): Web based ssh client.
-- [**info-beamer hosted**](https://info-beamer.com): Uses Xterm.js to manage digital signage devices from the web dashboard.
-- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation. 
+- [**info-beamer hosted**](https://info-beamer.com): Uses `xterm.js` to manage digital signage devices from the web dashboard.
+- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use `xterm.js` for web terminal emulation.
 
 [And much more...](https://github.com/xtermjs/xterm.js/network/dependents)
 

From 09754fddf8e3ba0dbbd3840b65a69822482fb64b Mon Sep 17 00:00:00 2001
From: Ioannis Cherouvim <743305+cherouvim@users.noreply.github.com>
Date: Fri, 1 Mar 2019 21:15:20 +0200
Subject: [PATCH 29/34] xterm.js references to the library should not be
 backticked

---
 README.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d70e8b7e..5378f443 100644
--- a/README.md
+++ b/README.md
@@ -106,17 +106,17 @@ Note that some APIs are marked *experimental*, these are added to enable experim
 ## Real-world uses
 Xterm.js is used in several world-class applications to provide great terminal experiences.
 
-- [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on `xterm.js`.
-- [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on `xterm.js`.
-- [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on `xterm.js`.
+- [**SourceLair**](https://www.sourcelair.com/): In-browser IDE that provides its users with fully-featured Linux terminals based on xterm.js.
+- [**Microsoft Visual Studio Code**](http://code.visualstudio.com/): Modern, versatile and powerful open source code editor that provides an integrated terminal based on xterm.js.
+- [**ttyd**](https://github.com/tsl0922/ttyd): A command-line tool for sharing terminal over the web, with fully-featured terminal emulation based on xterm.js.
 - [**Katacoda**](https://www.katacoda.com/): Katacoda is an Interactive Learning Platform for software developers, covering the latest Cloud Native technologies.
 - [**Eclipse Che**](http://www.eclipse.org/che): Developer workspace server, cloud IDE, and Eclipse next-generation IDE.
 - [**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.
+- [**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.
-- [**Codevolve**](https://www.codevolve.com "Codevolve"): Online platform for interactive coding and web development courses. Live container-backed terminal uses `xterm.js`.
+- [**Codevolve**](https://www.codevolve.com "Codevolve"): Online platform for interactive coding and web development courses. Live container-backed terminal uses xterm.js.
 - [**RStudio**](https://www.rstudio.com/products/RStudio "RStudio"): RStudio is an integrated development environment (IDE) for R.
 - [**Terminal for Atom**](https://github.com/jsmecham/atom-terminal-tab): A simple terminal for the Atom text editor.
 - [**Eclipse Orion**](https://orionhub.org): A modern, open source software development environment that runs in the cloud. Code, deploy and run in the cloud.
@@ -124,11 +124,11 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Hexlet**](https://en.hexlet.io): Practical programming courses (JavaScript, PHP, Unix, databases, functional programming). A steady path from the first line of code to the first job.
 - [**Selenoid UI**](https://github.com/aerokube/selenoid-ui): Simple UI for the scallable golang implementation of Selenium Hub named Selenoid. We use XTerm for streaming logs over websockets from docker containers.
 - [**Portainer**](https://portainer.io): Simple management UI for Docker.
-- [**SSHy**](https://github.com/stuicey/SSHy): HTML5 Based SSHv2 Web Client with E2E encryption utilising `xterm.js`, SJCL & websockets.
+- [**SSHy**](https://github.com/stuicey/SSHy): HTML5 Based SSHv2 Web Client with E2E encryption utilising xterm.js, SJCL & websockets.
 - [**JupyterLab**](https://github.com/jupyterlab/jupyterlab): An extensible computational environment for Jupyter, supporting interactive data science and scientific computing across all programming languages.
 - [**Theia**](https://github.com/theia-ide/theia): Theia is a cloud & desktop IDE framework implemented in TypeScript.
 - [**Opshell**](https://github.com/ricktbaker/opshell) Ops Helper tool to make life easier working with AWS instances across multiple organizations.
-- [**Proxmox VE**](https://www.proxmox.com/en/proxmox-ve): Proxmox VE is a complete open-source platform for enterprise virtualization. It uses `xterm.js` for container terminals and the host shell.
+- [**Proxmox VE**](https://www.proxmox.com/en/proxmox-ve): Proxmox VE is a complete open-source platform for enterprise virtualization. It uses xterm.js for container terminals and the host shell.
 - [**Script Runner**](https://github.com/ioquatix/script-runner): Run scripts (or a shell) in Atom.
 - [**Whack Whack Terminal**](https://github.com/Microsoft/WhackWhackTerminal): Terminal emulator for Visual Studio 2017.
 - [**VTerm**](https://github.com/vterm/vterm): Extensible terminal emulator based on Electron and React.
@@ -144,16 +144,16 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Fluent Terminal**](https://github.com/felixse/FluentTerminal): A terminal emulator based on UWP and web technologies.
 - [**Hyper**](https://hyper.is): A terminal built on web technologies.
 - [**Diag**](https://diag.ai): A better way to troubleshoot problems faster. Capture, share and reapply troubleshooting knowledge so you can focus on solving problems that matter.
-- [**GoTTY**](https://github.com/yudai/gotty): A simple command line tool that shares your terminal as a web application based on `xterm.js`.
+- [**GoTTY**](https://github.com/yudai/gotty): A simple command line tool that shares your terminal as a web application based on xterm.js.
 - [**genact**](https://github.com/svenstaro/genact): A nonsense activity generator.
 - [**cPanel & WHM**](https://cpanel.com): The hosting platform of choice.
-- [**Nutanix**](https://github.com/nutanix): Nutanix Enterprise Cloud uses xterm in the webssh functionality within Nutanix Calm, and is also looking to move our old noserial (termjs) functionality to `xterm.js`.
+- [**Nutanix**](https://github.com/nutanix): Nutanix Enterprise Cloud uses xterm in the webssh functionality within Nutanix Calm, and is also looking to move our old noserial (termjs) functionality to xterm.js.
 - [**SSH Web Client**](https://github.com/roke22/PHP-SSH2-Web-Client): SSH Web Client with PHP.
 - [**Shellvault**](https://www.shellvault.io): The cloud-based SSH terminal you can access from anywhere.
 - [**Juno**](http://junolab.org/): A flexible Julia IDE, based on Atom.
 - [**webssh**](https://github.com/huashengdun/webssh): Web based ssh client.
-- [**info-beamer hosted**](https://info-beamer.com): Uses `xterm.js` to manage digital signage devices from the web dashboard.
-- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use `xterm.js` for web terminal emulation.
+- [**info-beamer hosted**](https://info-beamer.com): Uses xterm.js to manage digital signage devices from the web dashboard.
+- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation.
 
 [And much more...](https://github.com/xtermjs/xterm.js/network/dependents)
 

From c63f15a9b26c770dcbcceca6dfaf33acb3121d67 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 4 Mar 2019 10:00:04 -0800
Subject: [PATCH 30/34] Fix lint

---
 src/Terminal.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index cb9bc675..5de369fe 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -739,9 +739,9 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
     // apply mouse event classes set by escape codes before terminal was attached
     this.element.classList.toggle('enable-mouse-events', this.mouseEvents);
     if (this.mouseEvents) {
-      this.selectionManager.disable()
+      this.selectionManager.disable();
     } else {
-      this.selectionManager.enable()
+      this.selectionManager.enable();
     }
 
     if (this.options.screenReaderMode) {

From 32e157bfaa43164171bac02798fc293df30d151c Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 4 Mar 2019 10:04:52 -0800
Subject: [PATCH 31/34] Remove unnecessary else

---
 src/Terminal.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 0539a904..25c92fdf 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -857,9 +857,8 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
         if (ch > 2047) {
           data.push(2047);
           return;
-        } else {
-          data.push(ch);
         }
+        data.push(ch);
       }
     }
 

From 07430a4892365e65946c05b34d51ba668fbc2b9f Mon Sep 17 00:00:00 2001
From: Jesse Stolwijk <stolwijkjesse@gmail.com>
Date: Tue, 5 Mar 2019 00:00:54 +0100
Subject: [PATCH 32/34] Replace array shift with offset (#1955)

---
 src/Terminal.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 4d480eb6..19b5f125 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -1350,19 +1350,20 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
     }
   }
 
-  protected _innerWrite(): void {
+  protected _innerWrite(bufferOffset: number = 0): void {
     // Ensure the terminal isn't disposed
     if (this._isDisposed) {
       this.writeBuffer = [];
     }
 
     const startTime = Date.now();
-    while (this.writeBuffer.length > 0) {
-      const data = this.writeBuffer.shift();
+    while (this.writeBuffer.length > bufferOffset) {
+      const data = this.writeBuffer[bufferOffset];
+      bufferOffset++;
 
       // If XOFF was sent in order to catch up with the pty process, resume it if
-      // the writeBuffer is empty to allow more data to come in.
-      if (this._xoffSentToCatchUp && this.writeBuffer.length === 0) {
+      // we reached the end of the writeBuffer to allow more data to come in.
+      if (this._xoffSentToCatchUp && this.writeBuffer.length === bufferOffset) {
         this.handler(C0.DC1);
         this._xoffSentToCatchUp = false;
       }
@@ -1385,11 +1386,12 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
         break;
       }
     }
-    if (this.writeBuffer.length > 0) {
+    if (this.writeBuffer.length > bufferOffset) {
       // Allow renderer to catch up before processing the next batch
-      setTimeout(() => this._innerWrite(), 0);
+      setTimeout(() => this._innerWrite(bufferOffset), 0);
     } else {
       this._writeInProgress = false;
+      this.writeBuffer = [];
     }
   }
 

From bc41cc7d279e7edd2b7f50b8032252efc4d88f31 Mon Sep 17 00:00:00 2001
From: Bruno Ribeito <b.m.fernandes.ribeiro@gmail.com>
Date: Thu, 7 Mar 2019 00:15:03 +0000
Subject: [PATCH 33/34] Fix #1908

---
 src/ui/MouseZoneManager.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/ui/MouseZoneManager.ts b/src/ui/MouseZoneManager.ts
index a232f5b9..79022723 100644
--- a/src/ui/MouseZoneManager.ts
+++ b/src/ui/MouseZoneManager.ts
@@ -23,6 +23,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
 
   private _areZonesActive: boolean = false;
   private _mouseMoveListener: (e: MouseEvent) => any;
+  private _mouseLeaveListener: (e: MouseEvent) => any;
   private _clickListener: (e: MouseEvent) => any;
 
   private _tooltipTimeout: number = null;
@@ -38,6 +39,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
 
     // These events are expensive, only listen to it when mouse zones are active
     this._mouseMoveListener = e => this._onMouseMove(e);
+    this._mouseLeaveListener = e => this._onMouseLeave(e);
     this._clickListener = e => this._onClick(e);
   }
 
@@ -89,6 +91,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
     if (!this._areZonesActive) {
       this._areZonesActive = true;
       this._terminal.element.addEventListener('mousemove', this._mouseMoveListener);
+      this._terminal.element.addEventListener('mouseleave', this._mouseLeaveListener);
       this._terminal.element.addEventListener('click', this._clickListener);
     }
   }
@@ -97,6 +100,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
     if (this._areZonesActive) {
       this._areZonesActive = false;
       this._terminal.element.removeEventListener('mousemove', this._mouseMoveListener);
+      this._terminal.element.removeEventListener('mouseleave', this._mouseLeaveListener);
       this._terminal.element.removeEventListener('click', this._clickListener);
     }
   }
@@ -169,6 +173,18 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
     }
   }
 
+  private _onMouseLeave(e: MouseEvent): void {
+    // Fire the hover end callback and cancel any existing timer if the mouse
+    // leaves the terminal element
+    if (this._currentZone) {
+      this._currentZone.leaveCallback();
+      this._currentZone = null;
+      if (this._tooltipTimeout) {
+        clearTimeout(this._tooltipTimeout);
+      }
+    }
+  }
+
   private _onClick(e: MouseEvent): void {
     // Find the active zone and click it if found
     const zone = this._findZoneEventAt(e);

From 4046d682c9770276240746cd5d46647ddfb2e10d Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Fri, 8 Mar 2019 09:21:01 -0800
Subject: [PATCH 34/34] v3.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa9cc070..c5fad515 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "main": "lib/public/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",