Rename setting customGlyphs

addons/xterm-addon-webgl/src/atlas/CharAtlasUtils.ts

@@ -28,7 +28,7 @@ export function generateConfig(scaledCellWidth: number, scaledCellHeight: number
     contrastCache: colors.contrastCache
   };
   return {
-    customBlockAndBoxCharacters: terminal.getOption('customBlockAndBoxCharacters'),
+    customGlyphs: terminal.getOption('customGlyphs'),
     devicePixelRatio: window.devicePixelRatio,
     letterSpacing: terminal.getOption('letterSpacing'),
     lineHeight: terminal.getOption('lineHeight'),
@@ -54,7 +54,7 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
     }
   }
   return a.devicePixelRatio === b.devicePixelRatio &&
-      a.customBlockAndBoxCharacters === b.customBlockAndBoxCharacters &&
+      a.customGlyphs === b.customGlyphs &&
       a.lineHeight === b.lineHeight &&
       a.letterSpacing === b.letterSpacing &&
       a.fontFamily === b.fontFamily &&

addons/xterm-addon-webgl/src/atlas/Types.d.ts

@@ -17,7 +17,7 @@ export interface IGlyphIdentifier {
 }
 
 export interface ICharAtlasConfig {
-  customBlockAndBoxCharacters: boolean;
+  customGlyphs: boolean;
   devicePixelRatio: number;
   letterSpacing: number;
   lineHeight: number;

addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts

@@ -393,7 +393,7 @@ export class WebglCharAtlas implements IDisposable {
 
     // Draw custom characters if applicable
     let drawSuccess = false;
-    if (this._config.customBlockAndBoxCharacters !== false) {
+    if (this._config.customGlyphs !== false) {
       drawSuccess = tryDrawCustomChar(this._tmpCtx, chars, TMP_CANVAS_GLYPH_PADDING, TMP_CANVAS_GLYPH_PADDING, this._config.scaledCellWidth, this._config.scaledCellHeight);
     }
 

src/browser/Terminal.ts

@@ -224,7 +224,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
         // The DOM renderer needs a row refresh to update the cursor styles
         this.refresh(this.buffer.y, this.buffer.y);
         break;
-      case 'customBlockAndBoxCharacters':
+      case 'customGlyphs':
       case 'drawBoldTextInBrightColors':
       case 'letterSpacing':
       case 'lineHeight':

src/browser/renderer/BaseRenderLayer.ts

@@ -263,7 +263,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
 
     // Draw custom characters if applicable
     let drawSuccess = false;
-    if (this._optionsService.options.customBlockAndBoxCharacters !== false) {
+    if (this._optionsService.options.customGlyphs !== false) {
       drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
     }
 
@@ -387,7 +387,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
 
     // Draw custom characters if applicable
     let drawSuccess = false;
-    if (this._optionsService.options.customBlockAndBoxCharacters !== false) {
+    if (this._optionsService.options.customGlyphs !== false) {
       drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
     }
 

src/common/services/OptionsService.ts

@@ -21,7 +21,7 @@ export const DEFAULT_OPTIONS: ITerminalOptions = Object.freeze({
   cursorBlink: false,
   cursorStyle: 'block',
   cursorWidth: 1,
-  customBlockAndBoxCharacters: true,
+  customGlyphs: true,
   bellSound:  DEFAULT_BELL_SOUND,
   bellStyle: 'none',
   drawBoldTextInBrightColors: true,

src/common/services/Services.ts

@@ -244,7 +244,7 @@ export interface ITerminalOptions {
   cursorBlink: boolean;
   cursorStyle: 'block' | 'underline' | 'bar';
   cursorWidth: number;
-  customBlockAndBoxCharacters: boolean;
+  customGlyphs: boolean;
   disableStdin: boolean;
   drawBoldTextInBrightColors: boolean;
   fastScrollModifier: 'alt' | 'ctrl' | 'shift' | undefined;

typings/xterm-headless.d.ts

@@ -79,12 +79,12 @@ declare module 'xterm-headless' {
     cursorWidth?: number;
 
     /**
-     * Whether to draw custom block element and box drawing characters instead of using the font.
-     * This should typically result in better rendering with continuous lines. Note that this
-     * doesn't work with the DOM renderer which renders all characters using the font. The default
-     * is true.
+     * Whether to draw custom glyphs for block element and box drawing characters instead of using
+     * the font. This should typically result in better rendering with continuous lines, even when
+     * line height and letter spacing is used. Note that this doesn't work with the DOM renderer
+     * which renders all characters using the font. The default is true.
      */
-    customBlockAndBoxCharacters?: boolean;
+     customGlyphs?: boolean;
 
     /**
      * Whether input should be disabled.

typings/xterm.d.ts

@@ -91,12 +91,12 @@ declare module 'xterm' {
     cursorWidth?: number;
 
     /**
-     * Whether to draw custom block element and box drawing characters instead of using the font.
-     * This should typically result in better rendering with continuous lines. Note that this
-     * doesn't work with the DOM renderer which renders all characters using the font. The default
-     * is true.
+     * Whether to draw custom glyphs for block element and box drawing characters instead of using
+     * the font. This should typically result in better rendering with continuous lines, even when
+     * line height and letter spacing is used. Note that this doesn't work with the DOM renderer
+     * which renders all characters using the font. The default is true.
      */
-    customBlockAndBoxCharacters?: boolean;
+    customGlyphs?: boolean;
 
     /**
      * Whether input should be disabled.