Remove Terminal.queueRefresh, call refresh directly

diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 55fb13ca1349fb4191b219f494e21502c2ad2836..10e72e9da72d233a282f155cc0fef52cc261f91e 100644 (file)
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1125,7 +1125,7 @@ export class InputHandler implements IInputHandler {
             //   this.x = this.savedX;
             //   this.y = this.savedY;
             // }
-            this._terminal.queueRefresh(0, this._terminal.rows - 1);
+            this._terminal.refresh(0, this._terminal.rows - 1);
             this._terminal.viewport.syncScrollArea();
             this._terminal.showCursor();
           }

diff --git a/src/test/escape-sequences-test.js b/src/test/escape-sequences-test.js
index 684de07958eaca798631f6eaa43b09e5a4855786..f35bc00ab401621df8731e97c3155893b8154a84 100644 (file)
--- a/src/test/escape-sequences-test.js
+++ b/src/test/escape-sequences-test.js
@@ -75,7 +75,7 @@ describe('xterm output comparison', function() {
 
   beforeEach(function () {
     xterm = new Terminal(COLS, ROWS);
-    xterm.queueRefresh = function() {};
+    xterm.refresh = function() {};
     xterm.viewport = {
       syncScrollArea: function() {}
     };

diff --git a/src/test/test.js b/src/test/test.js
index 890b9ad1acfe1002764e5fde6679eeeccaf970d2..d0d70686a6d1d343480a2a295003eb4f21649565 100644 (file)
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -14,10 +14,6 @@ describe('xterm.js', function() {
     xterm.compositionHelper = {
       keydown: function(){ return true; }
     };
-    // Force synchronous refreshes
-    xterm.queueRefresh = function(start, end) {
-      xterm.refresh(start, end);
-    };
     // Force synchronous writes
     xterm.write = function(data) {
       xterm.writeBuffer.push(data);

diff --git a/src/xterm.js b/src/xterm.js
index d43ce91e52fca7b92408eb126173aa8e4732d80e..0229df902366b042324acf0ed182a957731dca49 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -461,7 +461,7 @@ Terminal.prototype.blur = function() {
  */
 Terminal.bindBlur = function (term) {
   on(term.textarea, 'blur', function (ev) {
-    term.queueRefresh(term.y, term.y);
+    term.refresh(term.y, term.y);
     if (term.sendFocus) {
       term.send(C0.ESC + '[O');
     }
@@ -650,7 +650,7 @@ Terminal.prototype.open = function(parent) {
   this.renderer = new Renderer(this);
 
   // Setup loop that draws to screen
-  this.queueRefresh(0, this.rows - 1);
+  this.refresh(0, this.rows - 1);
 
   // Initialize global actions that
   // need to be taken on the document.
@@ -1057,16 +1057,6 @@ Terminal.prototype.destroy = function() {
  * @param {number} end The row to end at (between fromRow and terminal's height terminal - 1)
  */
 Terminal.prototype.refresh = function(start, end) {
-  this.queueRefresh(start, end);
-};
-
-/**
- * Tells the renderer to refresh terminal content between two rows (inclusive) at the next
- * opportunity.
- * @param {number} start The row to start from (between 0 and terminal's height terminal - 1)
- * @param {number} end The row to end at (between fromRow and terminal's height terminal - 1)
- */
-Terminal.prototype.queueRefresh = function(start, end) {
   if (this.renderer) {
     this.renderer.queueRefresh(start, end);
   }
@@ -1078,7 +1068,7 @@ Terminal.prototype.queueRefresh = function(start, end) {
 Terminal.prototype.showCursor = function() {
   if (!this.cursorState) {
     this.cursorState = 1;
-    this.queueRefresh(this.y, this.y);
+    this.refresh(this.y, this.y);
   }
 };
 
@@ -1167,7 +1157,7 @@ Terminal.prototype.scrollDisp = function(disp, suppressScrollEvent) {
     this.emit('scroll', this.ydisp);
   }
 
-  this.queueRefresh(0, this.rows - 1);
+  this.refresh(0, this.rows - 1);
 };
 
 /**
@@ -1239,7 +1229,7 @@ Terminal.prototype.innerWrite = function() {
     this.parser.parse(data);
 
     this.updateRange(this.y);
-    this.queueRefresh(this.refreshStart, this.refreshEnd);
+    this.refresh(this.refreshStart, this.refreshEnd);
   }
   if (this.writeBuffer.length > 0) {
     // Allow renderer to catch up before processing the next batch
@@ -1824,7 +1814,7 @@ Terminal.prototype.resize = function(x, y) {
 
   this.charMeasure.measure();
 
-  this.queueRefresh(0, this.rows - 1);
+  this.refresh(0, this.rows - 1);
 
   this.normal = null;
 
@@ -1956,7 +1946,7 @@ Terminal.prototype.clear = function() {
   for (var i = 1; i < this.rows; i++) {
     this.lines.push(this.blankLine());
   }
-  this.queueRefresh(0, this.rows - 1);
+  this.refresh(0, this.rows - 1);
   this.emit('scroll', this.ydisp);
 };
 
@@ -2094,7 +2084,7 @@ Terminal.prototype.reset = function() {
   var customKeydownHandler = this.customKeydownHandler;
   Terminal.call(this, this.options);
   this.customKeydownHandler = customKeydownHandler;
-  this.queueRefresh(0, this.rows - 1);
+  this.refresh(0, this.rows - 1);
   this.viewport.syncScrollArea();
 };