eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

make font variant positions explicit with const enum

Browse Source
This commit is contained in:
Jörg Breitbart
2023-08-01 18:35:48 +02:00
parent 32a852c0bf
commit b56bc77dcc
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/renderer/dom/WidthCache.ts
+16 -8
View File
@@ -17,6 +17,14 @@ export const enum WidthCacheSettings {
} }
const enum FontVariant {
REGULAR = 0,
BOLD = 1,
ITALIC = 2,
BOLD_ITALIC = 3
}
export class WidthCache implements IDisposable { export class WidthCache implements IDisposable {
// flat cache for regular variant up to CacheSettings.FLAT_SIZE // flat cache for regular variant up to CacheSettings.FLAT_SIZE
// NOTE: ~4x faster access than holey (serving >>80% of terminal content) // NOTE: ~4x faster access than holey (serving >>80% of terminal content)
@@ -59,7 +67,7 @@ export class WidthCache implements IDisposable {
boldItalic.style.fontWeight = 'bold'; boldItalic.style.fontWeight = 'bold';
boldItalic.style.fontStyle = 'italic'; boldItalic.style.fontStyle = 'italic';
// note: must be in order of variant in _measure // NOTE: must be in order of FontVariant
this._measureElements = [regular, bold, italic, boldItalic]; this._measureElements = [regular, bold, italic, boldItalic];
this._container.appendChild(regular); this._container.appendChild(regular);
this._container.appendChild(bold); this._container.appendChild(bold);
@@ -108,10 +116,10 @@ export class WidthCache implements IDisposable {
this._container.style.fontFamily = this._font; this._container.style.fontFamily = this._font;
this._container.style.fontSize = `${this._fontSize}px`; this._container.style.fontSize = `${this._fontSize}px`;
this._measureElements[0].style.fontWeight = `${weight}`; // regular this._measureElements[FontVariant.REGULAR].style.fontWeight = `${weight}`;
this._measureElements[1].style.fontWeight = `${weightBold}`; // bold this._measureElements[FontVariant.BOLD].style.fontWeight = `${weightBold}`;
this._measureElements[2].style.fontWeight = `${weight}`; // italic this._measureElements[FontVariant.ITALIC].style.fontWeight = `${weight}`;
this._measureElements[3].style.fontWeight = `${weightBold}`; // boldItalic this._measureElements[FontVariant.BOLD_ITALIC].style.fontWeight = `${weightBold}`;
this.clear(); this.clear();
} }
@@ -133,15 +141,15 @@ export class WidthCache implements IDisposable {
let width = this._holey!.get(key); let width = this._holey!.get(key);
if (width === undefined) { if (width === undefined) {
let variant = 0; let variant = 0;
if (bold) variant |= 1; if (bold) variant |= FontVariant.BOLD;
if (italic) variant |= 2; if (italic) variant |= FontVariant.ITALIC;
width = this._measure(c, variant); width = this._measure(c, variant);
this._holey!.set(key, width); this._holey!.set(key, width);
} }
return width; return width;
} }
protected _measure(c: string, variant: number): number { protected _measure(c: string, variant: FontVariant): number {
const el = this._measureElements[variant]; const el = this._measureElements[variant];
el.textContent = c.repeat(WidthCacheSettings.REPEAT); el.textContent = c.repeat(WidthCacheSettings.REPEAT);
return el.getBoundingClientRect().width / WidthCacheSettings.REPEAT; return el.getBoundingClientRect().width / WidthCacheSettings.REPEAT;