From ec96c40fdef0dfde94f82fc1b0d879095004e3fc Mon Sep 17 00:00:00 2001
From: Benjamin Woodruff <github@benjam.info>
Date: Mon, 16 Apr 2018 09:41:00 -0700
Subject: [PATCH] Re-add colors.ansi slicing in generateConfig

- We need to make a clone of this array, because ColorManager mutates
  it.
- We only want to compare the first 16 colors instead of all 256, since
  only the first 16 will ever change. In DynamicCharAtlas, we can pull
  the additional colors from DEFAULT_ANSI_COLORS.

I tested this out by loading the demo and changing the theme a few
times.
---
 src/renderer/atlas/CharAtlasUtils.ts   |  2 +-
 src/renderer/atlas/DynamicCharAtlas.ts | 51 +++++++++++++++++---------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/renderer/atlas/CharAtlasUtils.ts b/src/renderer/atlas/CharAtlasUtils.ts
index ded04085a9..9ec65b7acf 100644
--- a/src/renderer/atlas/CharAtlasUtils.ts
+++ b/src/renderer/atlas/CharAtlasUtils.ts
@@ -17,7 +17,7 @@ export function generateConfig(scaledCharWidth: number, scaledCharHeight: number
     selection: null,
     // For the static char atlas, we only use the first 16 colors, but we need all 256 for the
     // dynamic character atlas.
-    ansi: colors.ansi,
+    ansi: colors.ansi.slice(0, 16),
   };
   return {
     type: terminal.options.experimentalCharAtlas,
diff --git a/src/renderer/atlas/DynamicCharAtlas.ts b/src/renderer/atlas/DynamicCharAtlas.ts
index 2fc6206f01..86b6ebfb96 100644
--- a/src/renderer/atlas/DynamicCharAtlas.ts
+++ b/src/renderer/atlas/DynamicCharAtlas.ts
@@ -5,7 +5,9 @@
 
 import { DIM_OPACITY, IGlyphIdentifier, INVERTED_DEFAULT_COLOR } from './Types';
 import { ICharAtlasConfig } from '../../shared/atlas/Types';
+import { IColor } from '../../shared/Types';
 import BaseCharAtlas from './BaseCharAtlas';
+import { DEFAULT_ANSI_COLORS } from '../ColorManager';
 import { clearColor } from '../../shared/atlas/CharAtlasGenerator';
 import LRUMap from './LRUMap';
 
@@ -153,28 +155,48 @@ export default class DynamicCharAtlas extends BaseCharAtlas {
     );
   }
 
-  // TODO: We do this (or something similar) in multiple places. We should split this off
-  // into a shared function.
-  private _drawToCache(glyph: IGlyphIdentifier, index: number): IGlyphCacheValue {
-    this._drawToCacheCount++;
+  private _getColorFromAnsiIndex(idx: number): IColor {
+    if (idx < this._config.colors.ansi.length) {
+      return this._config.colors.ansi[idx];
+    }
+    return DEFAULT_ANSI_COLORS[idx];
+  }
 
-    // draw the background
-    let backgroundColor;
+  private _getBackgroundColor(glyph: IGlyphIdentifier): IColor {
     if (this._config.allowTransparency) {
       // The background color might have some transparency, so we need to render it as fully
       // transparent in the atlas. Otherwise we'd end up drawing the transparent background twice
       // around the anti-aliased edges of the glyph, and it would look too dark.
-      backgroundColor = TRANSPARENT_COLOR;
+      return TRANSPARENT_COLOR;
     } else if (glyph.bg === INVERTED_DEFAULT_COLOR) {
-      backgroundColor = this._config.colors.foreground;
+      return this._config.colors.foreground;
     } else if (glyph.bg < 256) {
-      backgroundColor = this._config.colors.ansi[glyph.bg];
+      return this._getColorFromAnsiIndex(glyph.bg);
+    } else {
+      return this._config.colors.background;
+    }
+  }
+
+  private _getForegroundColor(glyph: IGlyphIdentifier): IColor {
+    if (glyph.fg === INVERTED_DEFAULT_COLOR) {
+      return this._config.colors.background;
+    } else if (glyph.fg < 256) {
+      // 256 color support
+      return this._getColorFromAnsiIndex(glyph.fg);
     } else {
-      backgroundColor = this._config.colors.background;
+      return this._config.colors.foreground;
     }
+  }
+
+  // TODO: We do this (or something similar) in multiple places. We should split this off
+  // into a shared function.
+  private _drawToCache(glyph: IGlyphIdentifier, index: number): IGlyphCacheValue {
+    this._drawToCacheCount++;
 
     this._tmpCtx.save();
 
+    // draw the background
+    const backgroundColor = this._getBackgroundColor(glyph);
     // Use a 'copy' composite operation to clear any existing glyph out of _tmpCtxWithAlpha, regardless of
     // transparency in backgroundColor
     this._tmpCtx.globalCompositeOperation = 'copy';
@@ -190,14 +212,7 @@ export default class DynamicCharAtlas extends BaseCharAtlas {
     }
     this._tmpCtx.textBaseline = 'top';
 
-    if (glyph.fg === INVERTED_DEFAULT_COLOR) {
-      this._tmpCtx.fillStyle = this._config.colors.background.css;
-    } else if (glyph.fg < 256) {
-      // 256 color support
-      this._tmpCtx.fillStyle = this._config.colors.ansi[glyph.fg].css;
-    } else {
-      this._tmpCtx.fillStyle = this._config.colors.foreground.css;
-    }
+    this._tmpCtx.fillStyle = this._getForegroundColor(glyph).css;
 
     // Apply alpha to dim the character
     if (glyph.dim) {