From 8acf137d148d430bcbbb2f8627a3726abe4fe1a0 Mon Sep 17 00:00:00 2001
From: Antonin Stefanutti <antonin@stefanutti.fr>
Date: Thu, 8 Nov 2018 14:44:18 +0100
Subject: [PATCH 1/3] Use WheelEvent.deltaY instead of WheelEvent.wheelDeltaY
 for wheel event

Fixes #1781
---
 src/Terminal.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index e887146287..c9bc98ffe5 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -985,7 +985,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
           : 65;
           break;
         case 'wheel':
-          button = (<WheelEvent>ev).wheelDeltaY > 0
+          button = (<WheelEvent>ev).deltaY < 0
             ? 64
           : 65;
           break;

From de7d5e1eecc4398ef8e7e5db0662002631a6508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Fri, 9 Nov 2018 01:03:44 +0100
Subject: [PATCH 2/3] swallow 7bit ST, add missing executables

---
 src/EscapeSequenceParser.test.ts | 12 ++++++++++--
 src/EscapeSequenceParser.ts      |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/EscapeSequenceParser.test.ts b/src/EscapeSequenceParser.test.ts
index 5db6d7ffb1..e92f412574 100644
--- a/src/EscapeSequenceParser.test.ts
+++ b/src/EscapeSequenceParser.test.ts
@@ -369,7 +369,8 @@ describe('EscapeSequenceParser', function (): void {
           parser.currentState = ParserState.ESCAPE_INTERMEDIATE;
           parser.parse(collect[i]);
           chai.expect(parser.currentState).equal(ParserState.GROUND);
-          testTerminal.compare([['esc', '', collect[i]]]);
+          // '\x5c' --> ESC + \ (7bit ST) parser does not expose this as it already got handled
+          testTerminal.compare((collect[i] === '\x5c') ? [] : [['esc', '', collect[i]]]);
           parser.reset();
           testTerminal.clear();
         }
@@ -1051,6 +1052,13 @@ describe('EscapeSequenceParser', function (): void {
           ['csi', '<', [0, 0], 'c']
         ], null);
       });
+      it('7bit ST should be swallowed', function(): void {
+        test('abc\x9d123tzf\x1b\\defg', [
+          ['print', 'abc'],
+          ['osc', '123tzf'],
+          ['print', 'defg']
+        ], null);
+      });
     });
   });
 
@@ -1089,7 +1097,7 @@ describe('EscapeSequenceParser', function (): void {
       parser.reset();
       testTerminal.clear();
       parser.currentState = ParserState.GROUND;
-      parser.parse('\x1e');
+      parser.parse('\x9c');
       chai.expect(parser.currentState).equal(ParserState.GROUND);
       testTerminal.compare([]);
       parser.reset();
diff --git a/src/EscapeSequenceParser.ts b/src/EscapeSequenceParser.ts
index bf744e0502..b38c50f543 100644
--- a/src/EscapeSequenceParser.ts
+++ b/src/EscapeSequenceParser.ts
@@ -66,7 +66,7 @@ export class TransitionTable {
 const PRINTABLES = r(0x20, 0x7f);
 const EXECUTABLES = r(0x00, 0x18);
 EXECUTABLES.push(0x19);
-EXECUTABLES.concat(r(0x1c, 0x20));
+EXECUTABLES.push.apply(EXECUTABLES, r(0x1c, 0x20));
 const DEFAULT_TRANSITION = ParserAction.ERROR << 4 | ParserState.GROUND;
 
 /**
@@ -261,6 +261,9 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
     this._dcsHandlers = Object.create(null);
     this._activeDcsHandler = null;
     this._errorHandler = this._errorHandlerFb;
+
+    // swallow 7bit ST (ESC+\)
+    this.setEscHandler('\\', () => {});
   }
 
   public dispose(): void {

From 8ea0bb55b4d2f0e2e1fbbaf79ddaee72938bc1cd Mon Sep 17 00:00:00 2001
From: Jeff Smith <whydoubt@gmail.com>
Date: Thu, 8 Nov 2018 00:11:50 -0600
Subject: [PATCH 3/3] Make scrollbar draggable when using DOM renderer

Fixes #1751
---
 src/renderer/dom/DomRenderer.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/renderer/dom/DomRenderer.ts b/src/renderer/dom/DomRenderer.ts
index 22ecd0cdc4..fadd9b7211 100644
--- a/src/renderer/dom/DomRenderer.ts
+++ b/src/renderer/dom/DomRenderer.ts
@@ -123,16 +123,14 @@ export class DomRenderer extends EventEmitter implements IRenderer {
         ` display: inline-block;` +
         ` height: 100%;` +
         ` vertical-align: top;` +
-        ` width: ${this._terminal.charMeasure.width}px` +
+        ` width: ${this.dimensions.actualCellWidth}px` +
         `}`;
 
     this._dimensionsStyleElement.innerHTML = styles;
 
     this._selectionContainer.style.height = (<any>this._terminal)._viewportElement.style.height;
-    this._rowContainer.style.width = `${this.dimensions.canvasWidth}px`;
-    this._rowContainer.style.height = `${this.dimensions.canvasHeight}px`;
-    this._terminal.screenElement.style.width = '';
-    this._terminal.screenElement.style.height = '';
+    this._terminal.screenElement.style.width = `${this.dimensions.canvasWidth}px`;
+    this._terminal.screenElement.style.height = `${this.dimensions.canvasHeight}px`;
   }
 
   public setTheme(theme: ITheme | undefined): IColorSet {