Merge branch 'master' into webgl2

src/renderer/webgl/GlyphRenderer.ts

@@ -5,13 +5,14 @@
 
 import { createProgram, PROJECTION_MATRIX } from './WebglUtils';
 import { IColorManager, IRenderDimensions } from '../Types';
-import { ITerminal, IBufferLine } from '../../Types';
-import { NULL_CELL_CODE, CHAR_DATA_CHAR_INDEX, WHITESPACE_CELL_CODE } from '../../Buffer';
+import { ITerminal } from '../../Types';
 import WebglCharAtlas from './WebglCharAtlas';
 import { IWebGL2RenderingContext, IWebGLVertexArrayObject, IRenderModel, IRasterizedGlyph } from './Types';
 import { INDICIES_PER_CELL } from './WebglRenderer';
 import { COMBINED_CHAR_BIT_MASK } from './RenderModel';
 import { fill, slice } from '../../common/TypedArrayUtils';
+import { NULL_CELL_CODE, WHITESPACE_CELL_CODE, CHAR_DATA_CHAR_INDEX } from '../../core/buffer/BufferLine';
+import { IBufferLine } from '../../core/Types';
 
 interface IVertices {
   attributes: Float32Array;

src/renderer/webgl/RectangleRenderer.ts

@@ -8,8 +8,9 @@ import { IColorManager, IRenderDimensions, IColor } from '../Types';
 import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';
 import { IRenderModel, IWebGLVertexArrayObject, IWebGL2RenderingContext, ISelectionRenderModel } from './Types';
 import { fill } from '../../common/TypedArrayUtils';
-import { INVERTED_DEFAULT_COLOR, DEFAULT_COLOR } from '../atlas/Types';
+import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
 import { is256Color } from '../atlas/CharAtlasUtils';
+import { DEFAULT_COLOR } from '../../common/Types';
 
 const enum VertexAttribLocations {
   POSITION = 0,

src/renderer/webgl/WebglCharAtlas.ts

@@ -3,14 +3,15 @@
  * @license MIT
  */
 
-import { DIM_OPACITY, IGlyphIdentifier, INVERTED_DEFAULT_COLOR, DEFAULT_COLOR, ICharAtlasConfig } from '../atlas/Types';
+import { DIM_OPACITY, IGlyphIdentifier, INVERTED_DEFAULT_COLOR, ICharAtlasConfig } from '../atlas/Types';
 import BaseCharAtlas from '../atlas/BaseCharAtlas';
 import { DEFAULT_ANSI_COLORS } from '../ColorManager';
 import { IRasterizedGlyph, IBoundingBox, IRasterizedGlyphSet } from './Types';
-import { DEFAULT_ATTR } from '../../Buffer';
 import { FLAGS, IColor } from '../Types';
 import { is256Color } from '../atlas/CharAtlasUtils';
 import { clearColor } from '../atlas/CharAtlasGenerator';
+import { DEFAULT_ATTR } from '../../core/buffer/BufferLine';
+import { DEFAULT_COLOR } from '../../common/Types';
 
 // In practice we're probably never going to exhaust a texture this large. For debugging purposes,
 // however, it can be useful to set this to a really tiny value, to verify that LRU eviction works.

src/renderer/webgl/WebglRenderer.ts

@@ -15,12 +15,13 @@ import { acquireCharAtlas } from '../atlas/CharAtlasCache';
 import WebglCharAtlas from './WebglCharAtlas';
 import { ScreenDprMonitor } from '../../ui/ScreenDprMonitor';
 import { RectangleRenderer } from './RectangleRenderer';
-import { CHAR_DATA_ATTR_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_CHAR_INDEX, NULL_CELL_CODE } from '../../Buffer';
 import { IWebGL2RenderingContext } from './Types';
-import { INVERTED_DEFAULT_COLOR, DEFAULT_COLOR } from '../atlas/Types';
+import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
 import { RenderModel, COMBINED_CHAR_BIT_MASK } from './RenderModel';
 import { EventEmitter2, IEvent } from '../../common/EventEmitter2';
 import { Disposable } from '../../common/Lifecycle';
+import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_CODE_INDEX, CHAR_DATA_ATTR_INDEX, NULL_CELL_CODE } from '../../core/buffer/BufferLine';
+import { DEFAULT_COLOR } from '../../common/Types';
 
 export const INDICIES_PER_CELL = 4;