Merge remote-tracking branch 'ups/master' into webgl2

src/renderer/atlas/CharAtlasUtils.ts

@@ -6,6 +6,7 @@
 import { ITerminal } from '../../Types';
 import { IColorSet } from '../Types';
 import { ICharAtlasConfig } from '../../shared/atlas/Types';
+import { DEFAULT_COLOR } from './Types';
 
 export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet, devicePixelRatio: number = window.devicePixelRatio): ICharAtlasConfig {
   // null out some fields that don't matter
@@ -51,3 +52,7 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
       a.colors.foreground === b.colors.foreground &&
       a.colors.background === b.colors.background;
 }
+
+export function is256Color(colorCode: number): boolean {
+  return colorCode < DEFAULT_COLOR;
+}

src/renderer/atlas/DynamicCharAtlas.ts

@@ -42,7 +42,7 @@ interface IGlyphCacheValue {
   inBitmap: boolean;
 }
 
-function getGlyphCacheKey(glyph: IGlyphIdentifier): number {
+export function getGlyphCacheKey(glyph: IGlyphIdentifier): number {
   // Note that this only returns a valid key when code < 256
   // Layout:
   // 0b00000000000000000000000000000001: italic (1)

src/renderer/atlas/StaticCharAtlas.ts

@@ -3,10 +3,11 @@
  * @license MIT
  */
 
-import { DIM_OPACITY, IGlyphIdentifier } from './Types';
+import { DIM_OPACITY, IGlyphIdentifier, DEFAULT_COLOR } from './Types';
 import { CHAR_ATLAS_CELL_SPACING, ICharAtlasConfig } from '../../shared/atlas/Types';
 import { generateStaticCharAtlasTexture } from '../../shared/atlas/CharAtlasGenerator';
 import BaseCharAtlas from './BaseCharAtlas';
+import { is256Color } from './CharAtlasUtils';
 
 export default class StaticCharAtlas extends BaseCharAtlas {
   private _texture: HTMLCanvasElement | ImageBitmap;
@@ -41,8 +42,8 @@ export default class StaticCharAtlas extends BaseCharAtlas {
     const isAscii = glyph.code < 256;
     // A color is basic if it is one of the 4 bit ANSI colors.
     const isBasicColor = glyph.fg < 16;
-    const isDefaultColor = glyph.fg >= 256;
-    const isDefaultBackground = glyph.bg >= 256;
+    const isDefaultColor = glyph.fg === DEFAULT_COLOR;
+    const isDefaultBackground = glyph.bg === DEFAULT_COLOR;
     return isAscii && (isBasicColor || isDefaultColor) && isDefaultBackground && !glyph.italic;
   }
 
@@ -58,9 +59,9 @@ export default class StaticCharAtlas extends BaseCharAtlas {
     }
 
     let colorIndex = 0;
-    if (glyph.fg < 256) {
+    if (is256Color(glyph.fg)) {
       colorIndex = 2 + glyph.fg + (glyph.bold ? 16 : 0);
-    } else {
+    } else if (glyph.fg === DEFAULT_COLOR) {
       // If default color and bold
       if (glyph.bold) {
         colorIndex = 1;

src/renderer/atlas/Types.ts

@@ -3,7 +3,8 @@
  * @license MIT
  */
 
-export const INVERTED_DEFAULT_COLOR = -1;
+export const DEFAULT_COLOR = 256;
+export const INVERTED_DEFAULT_COLOR = 257;
 export const DIM_OPACITY = 0.5;
 
 export interface IGlyphIdentifier {