Move the renderer events to RenderCoordinator

src/renderer/RenderCoordinator.ts

@@ -5,23 +5,56 @@
 
 import { IRenderer } from './Types';
 import { RenderDebouncer } from '../ui/RenderDebouncer';
+import { EventEmitter2, IEvent } from '../common/EventEmitter2';
 
 export class RenderCoordinator {
   private _renderDebouncer: RenderDebouncer;
 
+  private _onCanvasResize = new EventEmitter2<{ width: number, height: number }>();
+  public get onCanvasResize(): IEvent<{ width: number, height: number }> { return this._onCanvasResize.event; }
+  private _onRender = new EventEmitter2<{ start: number, end: number }>();
+  public get onRender(): IEvent<{ start: number, end: number }> { return this._onRender.event; }
+
+  private _canvasWidth: number = 0;
+  private _canvasHeight: number = 0;
+
   constructor(
     private _renderer: IRenderer,
     private _rowCount: number
   ) {
-    this._renderDebouncer = new RenderDebouncer((start, end) => this._renderer.renderRows(start, end));
+    this._renderDebouncer = new RenderDebouncer((start, end) => this._renderRows(start, end));
   }
 
   public refreshRows(start: number, end: number): void {
     this._renderDebouncer.refresh(start, end, this._rowCount);
   }
 
+  private _renderRows(start: number, end: number): void {
+    this._renderer.renderRows(start, end);
+    this._onRender.fire({ start, end });
+  }
+
   public resize(cols: number, rows: number): void {
     this._rowCount = rows;
+    this._fireOnCanvasResize();
+  }
+
+  public changeOptions(): void {
+    this._renderer.onOptionsChanged();
+    this._fireOnCanvasResize();
+  }
+
+  private _fireOnCanvasResize(): void {
+    // Don't fire the event if the dimensions haven't changed
+    if (this._renderer.dimensions.canvasWidth === this._canvasWidth && this._renderer.dimensions.canvasHeight === this._canvasHeight) {
+      return;
+    }
+    this._canvasWidth = this._renderer.dimensions.canvasWidth;
+    this._canvasHeight = this._renderer.dimensions.canvasHeight;
+    this._onCanvasResize.fire({
+      width: this._canvasWidth,
+      height: this._canvasHeight
+    });
   }
 
   public setRenderer(renderer: IRenderer): void {

src/renderer/Renderer.ts

@@ -11,12 +11,10 @@ import { ITerminal, CharacterJoinerHandler } from '../Types';
 import { LinkRenderLayer } from './LinkRenderLayer';
 import { ScreenDprMonitor } from '../ui/ScreenDprMonitor';
 import { CharacterJoinerRegistry } from '../renderer/CharacterJoinerRegistry';
-import { EventEmitter2, IEvent } from '../common/EventEmitter2';
 import { Disposable } from '../common/Lifecycle';
 import { IColorSet } from '../ui/Types';
 
 export class Renderer extends Disposable implements IRenderer {
-
   private _renderLayers: IRenderLayer[];
   private _devicePixelRatio: number;
   private _screenDprMonitor: ScreenDprMonitor;
@@ -26,11 +24,6 @@ export class Renderer extends Disposable implements IRenderer {
 
   public dimensions: IRenderDimensions;
 
-  private _onCanvasResize = new EventEmitter2<{ width: number, height: number }>();
-  public get onCanvasResize(): IEvent<{ width: number, height: number }> { return this._onCanvasResize.event; }
-  private _onRender = new EventEmitter2<{ start: number, end: number }>();
-  public get onRender(): IEvent<{ start: number, end: number }> { return this._onRender.event; }
-
   constructor(
     private _terminal: ITerminal,
     private _colors: IColorSet
@@ -130,11 +123,6 @@ export class Renderer extends Disposable implements IRenderer {
     // Resize the screen
     this._terminal.screenElement.style.width = `${this.dimensions.canvasWidth}px`;
     this._terminal.screenElement.style.height = `${this.dimensions.canvasHeight}px`;
-
-    this._onCanvasResize.fire({
-      width: this.dimensions.canvasWidth,
-      height: this.dimensions.canvasHeight
-    });
   }
 
   public onCharSizeChanged(): void {
@@ -179,7 +167,6 @@ export class Renderer extends Disposable implements IRenderer {
    */
   public renderRows(start: number, end: number): void {
     this._renderLayers.forEach(l => l.onGridChanged(this._terminal, start, end));
-    this._onRender.fire({ start, end });
   }
 
   /**

src/renderer/Types.ts

@@ -5,7 +5,6 @@
 
 import { ITerminal, CharacterJoinerHandler } from '../Types';
 import { IDisposable } from 'xterm';
-import { IEvent } from '../common/EventEmitter2';
 import { IColorSet } from '../ui/Types';
 
 /**
@@ -28,9 +27,6 @@ export const enum FLAGS {
 export interface IRenderer extends IDisposable {
   dimensions: IRenderDimensions;
 
-  onCanvasResize: IEvent<{ width: number, height: number }>;
-  onRender: IEvent<{ start: number, end: number }>;
-
   dispose(): void;
   onThemeChange(colors: IColorSet): void;
   onWindowResize(devicePixelRatio: number): void;

src/renderer/dom/DomRenderer.ts

@@ -7,7 +7,6 @@ import { IRenderer, IRenderDimensions } from '../Types';
 import { ILinkifierEvent, ITerminal, CharacterJoinerHandler } from '../../Types';
 import { BOLD_CLASS, ITALIC_CLASS, CURSOR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_BLINK_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory } from './DomRendererRowFactory';
 import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
-import { EventEmitter2, IEvent } from '../../common/EventEmitter2';
 import { Disposable } from '../../common/Lifecycle';
 import { IColorSet } from '../../ui/Types';
 
@@ -40,12 +39,6 @@ export class DomRenderer extends Disposable implements IRenderer {
 
   public dimensions: IRenderDimensions;
 
-  // TODO: These events should be owned by RenderCoordinator
-  private _onCanvasResize = new EventEmitter2<{ width: number, height: number }>();
-  public get onCanvasResize(): IEvent<{ width: number, height: number }> { return this._onCanvasResize.event; }
-  private _onRender = new EventEmitter2<{ start: number, end: number }>();
-  public get onRender(): IEvent<{ start: number, end: number }> { return this._onRender.event; }
-
   constructor(
     private _terminal: ITerminal,
     private _colors: IColorSet
@@ -240,10 +233,6 @@ export class DomRenderer extends Disposable implements IRenderer {
   public onResize(cols: number, rows: number): void {
     this._refreshRowElements(cols, rows);
     this._updateDimensions();
-    this._onCanvasResize.fire({
-      width: this.dimensions.canvasWidth,
-      height: this.dimensions.canvasHeight
-    });
   }
 
   public onCharSizeChanged(): void {
@@ -351,8 +340,6 @@ export class DomRenderer extends Disposable implements IRenderer {
       const cursorStyle = terminal.options.cursorStyle;
       rowElement.appendChild(this._rowFactory.createRow(lineData, row === cursorAbsoluteY, cursorStyle, cursorX, cursorBlink, this.dimensions.actualCellWidth, terminal.cols));
     }
-
-    this._onRender.fire({ start, end });
   }
 
   private get _terminalSelector(): string {