From 7048f6edf7e973e86a8836bf1fe50d6943d6f6cf Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 4 Aug 2016 18:34:04 -0700
Subject: [PATCH] Add some tests, fix app keypad mode bug

---
 src/xterm.js                    | 24 +++++-----
 test/composition-helper-test.js |  6 +--
 test/viewport-test.js           | 79 +++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 test/viewport-test.js

diff --git a/src/xterm.js b/src/xterm.js
index 573863f..e26288c 100644
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -219,7 +219,7 @@
       }
 
       return true;
-    }
+    };
 
     /**
      * Finalizes the composition, resuming regular input actions. This is called when a composition
@@ -275,7 +275,7 @@
           }
         }, 0);
       }
-    }
+    };
 
     /**
      * Apply any changes made to the textarea after the current event chain is allowed to complete.
@@ -296,7 +296,7 @@
           }
         }
       }, 0);
-    }
+    };
 
     /**
      * Positions the composition view on top of the cursor and the textarea just below it (so the
@@ -322,7 +322,7 @@
     CompositionHelper.prototype.clearTextareaPosition = function() {
       this.textarea.style.left = '';
       this.textarea.style.top = '';
-    }
+    };
 
     /**
      * Represents the viewport of a terminal, the visible area within the larger buffer of output.
@@ -332,13 +332,11 @@
      * @param {HTMLElement} charMeasureElement A DOM element used to measure the character size of
      *   the terminal.
      */
-    function Viewport(terminal, viewportElement, charMeasureElement) {
+    function Viewport(terminal, viewportElement, scrollArea, charMeasureElement) {
       this.terminal = terminal;
       this.viewportElement = viewportElement;
+      this.scrollArea = scrollArea;
       this.charMeasureElement = charMeasureElement;
-      this.scrollArea = document.createElement('div');
-      this.scrollArea.classList.add('xterm-scroll-area');
-      this.viewportElement.appendChild(this.scrollArea);
       this.currentRowHeight = 0;
       this.lastRecordedBufferLength = 0;
       this.lastRecordedViewportHeight = 0;
@@ -368,7 +366,7 @@
           this.lastRecordedViewportHeight = this.terminal.rows;
           this.viewportElement.style.height = size.height * this.terminal.rows + 'px';
         }
-        this.scrollArea.style.height = (size.height * this.terminal.lines.length) + 'px';
+        this.scrollArea.style.height = (size.height * this.lastRecordedBufferLength) + 'px';
       }
     };
 
@@ -377,7 +375,7 @@
      */
     Viewport.prototype.syncScrollArea = function() {
       if (this.isApplicationMode) {
-        this.lastRecordedBufferLength = this.currentRowHeight * this.terminal.rows;
+        this.lastRecordedBufferLength = this.terminal.rows;
         this.refresh();
         return;
       }
@@ -965,6 +963,9 @@
       this.viewportElement = document.createElement('div');
       this.viewportElement.classList.add('xterm-viewport');
       this.element.appendChild(this.viewportElement);
+      this.viewportScrollArea = document.createElement('div');
+      this.viewportScrollArea.classList.add('xterm-scroll-area');
+      this.viewportElement.appendChild(this.viewportScrollArea);
 
       /*
       * Create the container that will hold the lines of the terminal and then
@@ -1012,7 +1013,7 @@
       }
       this.parent.appendChild(this.element);
 
-      this.viewport = new Viewport(this, this.viewportElement, this.charMeasureElement);
+      this.viewport = new Viewport(this, this.viewportElement, this.viewportScrollArea, this.charMeasureElement);
 
       // Draw the screen.
       this.refresh(0, this.rows - 1);
@@ -5387,6 +5388,7 @@
 
     Terminal.EventEmitter = EventEmitter;
     Terminal.CompositionHelper = CompositionHelper;
+    Terminal.Viewport = Viewport;
     Terminal.inherits = inherits;
 
     /**
diff --git a/test/composition-helper-test.js b/test/composition-helper-test.js
index 7bc4ee4..ceb2b4e 100644
--- a/test/composition-helper-test.js
+++ b/test/composition-helper-test.js
@@ -19,14 +19,14 @@ describe('CompositionHelper', function () {
         top: 0
       },
       textContent: ''
-    }
+    };
     textarea = {
       value: '',
       style: {
         left: 0,
         top: 0
       }
-    }
+    };
     terminal = {
       element: {
         querySelector: function () {
@@ -36,7 +36,7 @@ describe('CompositionHelper', function () {
       handler: function (text) {
         handledText += text;
       }
-    }
+    };
     handledText = '';
     compositionHelper = new Terminal.CompositionHelper(textarea, compositionView, terminal);
   });
diff --git a/test/viewport-test.js b/test/viewport-test.js
new file mode 100644
index 0000000..39bcedf
--- /dev/null
+++ b/test/viewport-test.js
@@ -0,0 +1,79 @@
+var assert = require('chai').assert;
+var Terminal = require('../src/xterm');
+
+describe('Viewport', function () {
+  var terminal;
+  var viewportElement;
+  var charMeasureElement;
+  var viewport;
+
+  var CHARACTER_HEIGHT = 10;
+
+  beforeEach(function () {
+    terminal = {
+      lines: [],
+      rows: 0,
+      ydisp: 0,
+      on: function () {},
+      rowContainer: {
+        style: {
+          lineHeight: 0
+        }
+      }
+    };
+    viewportElement = {
+      addEventListener: function () {},
+      style: {
+        height: 0,
+        lineHeight: 0
+      }
+    };
+    scrollAreaElement = {
+      style: {
+        height: 0
+      }
+    };
+    charMeasureElement = {
+      getBoundingClientRect: function () {
+        return { width: null, height: CHARACTER_HEIGHT };
+      }
+    };
+    viewport = new Terminal.Viewport(terminal, viewportElement, scrollAreaElement, charMeasureElement);
+  });
+
+  describe('Public API', function () {
+    it('should define Viewport.prototype.onWheel', function () {
+      assert.isDefined(Terminal.Viewport.prototype.onWheel);
+    });
+    it('should define Viewport.prototype.setApplicationMode', function () {
+      assert.isDefined(Terminal.Viewport.prototype.setApplicationMode);
+    });
+  });
+
+  describe('setApplicationMode', function () {
+    it('should restrict the scroll area to the viewport', function () {
+      terminal.lines.push('');
+      terminal.lines.push('');
+      terminal.rows = 1;
+      viewport.syncScrollArea();
+      assert.equal(scrollAreaElement.style.height, 2 * CHARACTER_HEIGHT + 'px');
+      viewport.setApplicationMode(true);
+      assert.equal(scrollAreaElement.style.height, CHARACTER_HEIGHT + 'px');
+      viewport.setApplicationMode(false);
+      assert.equal(scrollAreaElement.style.height, 2 * CHARACTER_HEIGHT + 'px');
+    });
+  });
+
+  describe('refresh', function () {
+    it('should set the line-height of the terminal', function () {
+      assert.equal(viewportElement.style.lineHeight, CHARACTER_HEIGHT + 'px');
+      assert.equal(terminal.rowContainer.style.lineHeight, CHARACTER_HEIGHT + 'px');
+      charMeasureElement.getBoundingClientRect = function () {
+        return { width: null, height: 1 };
+      };
+      viewport.refresh();
+      assert.equal(viewportElement.style.lineHeight, '1px');
+      assert.equal(terminal.rowContainer.style.lineHeight, '1px');
+    });
+  });
+});
-- 
2.39.5