Merge render layer interface types

src/renderer/Renderer.ts

@@ -6,48 +6,41 @@ import { ITerminal, ITheme } from '../Interfaces';
 import { DomElementObjectPool } from '../utils/DomElementObjectPool';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';
 import { createBackgroundFillData } from './Canvas';
-import { IDataRenderLayer, ISelectionRenderLayer } from './Interfaces';
 import { BackgroundRenderLayer } from './BackgroundRenderLayer';
 import { ForegroundRenderLayer } from './ForegroundRenderLayer';
 import { SelectionRenderLayer } from './SelectionRenderLayer';
 import { CursorRenderLayer } from './CursorRenderLayer';
 import { ColorManager } from './ColorManager';
 import { BaseRenderLayer } from './BaseRenderLayer';
+import { IRenderLayer } from './Interfaces';
 
 export class Renderer {
   /** A queue of the rows to be refreshed */
   private _refreshRowsQueue: {start: number, end: number}[] = [];
   private _refreshAnimationFrame = null;
 
-  private _dataRenderLayers: IDataRenderLayer[];
-  private _selectionRenderLayers: ISelectionRenderLayer[];
+  private _renderLayers: IRenderLayer[];
 
   private _colorManager: ColorManager;
 
   constructor(private _terminal: ITerminal) {
     this._colorManager = new ColorManager();
-    this._dataRenderLayers = [
+    this._renderLayers = [
       new BackgroundRenderLayer(this._terminal.element, 0, this._colorManager.colors),
+      new SelectionRenderLayer(this._terminal.element, 1, this._colorManager.colors),
       new ForegroundRenderLayer(this._terminal.element, 2, this._colorManager.colors),
       new CursorRenderLayer(this._terminal.element, 3, this._colorManager.colors)
     ];
-    this._selectionRenderLayers = [
-      new SelectionRenderLayer(this._terminal.element, 1, this._colorManager.colors)
-    ];
   }
 
   public setTheme(theme: ITheme): void {
     console.log('setTheme');
     this._colorManager.setTheme(theme);
     // Clear layers and force a full render
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].onThemeChanged(this._terminal, this._colorManager.colors);
-      this._dataRenderLayers[i].reset(this._terminal);
-    }
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].onThemeChanged(this._terminal, this._colorManager.colors);
-      this._selectionRenderLayers[i].reset(this._terminal);
-    }
+    this._renderLayers.forEach(l => {
+      l.onThemeChanged(this._terminal, this._colorManager.colors);
+      l.reset(this._terminal);
+    });
 
     // TODO: This is currently done for every single terminal, but it's static so it's wasting time
     this._terminal.refresh(0, this._terminal.rows - 1);
@@ -56,53 +49,29 @@ export class Renderer {
   public onResize(cols: number, rows: number): void {
     const width = this._terminal.charMeasure.width * this._terminal.cols;
     const height = this._terminal.charMeasure.height * this._terminal.rows;
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].resize(this._terminal, width, height, false);
-    }
+    this._renderLayers.forEach(l => l.resize(this._terminal, width, height, false));
   }
 
   public onCharSizeChanged(charWidth: number, charHeight: number): void {
     const width = charWidth * this._terminal.cols;
     const height = charHeight * this._terminal.rows;
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].resize(this._terminal, width, height, true);
-    }
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].resize(this._terminal, width, height, true);
-    }
+    this._renderLayers.forEach(l => l.resize(this._terminal, width, height, true));
   }
 
   public onSelectionChanged(start: [number, number], end: [number, number]): void {
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].render(this._terminal, start, end);
-    }
+    this._renderLayers.forEach(l => l.onSelectionChanged(this._terminal, start, end));
   }
 
   public onCursorMove(): void {
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].onCursorMove(this._terminal);
-    }
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].onCursorMove(this._terminal);
-    }
+    this._renderLayers.forEach(l => l.onCursorMove(this._terminal));
   }
 
   public onOptionsChanged(): void {
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].onOptionsChanged(this._terminal);
-    }
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].onOptionsChanged(this._terminal);
-    }
+    this._renderLayers.forEach(l => l.onOptionsChanged(this._terminal));
   }
 
   public clear(): void {
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].reset(this._terminal);
-    }
-    for (let i = 0; i < this._selectionRenderLayers.length; i++) {
-      this._selectionRenderLayers[i].reset(this._terminal);
-    }
+    this._renderLayers.forEach(l => l.reset(this._terminal));
   }
 
   /**
@@ -146,9 +115,7 @@ export class Renderer {
     this._refreshAnimationFrame = null;
 
     // Render
-    for (let i = 0; i < this._dataRenderLayers.length; i++) {
-      this._dataRenderLayers[i].render(this._terminal, start, end);
-    }
+    this._renderLayers.forEach(l => l.onGridChanged(this._terminal, start, end));
     this._terminal.emit('refresh', {start, end});
   }
 }