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

Merge branch 'master' into fix_4642

Browse Source
This commit is contained in:
jerch
2023-08-10 00:24:03 +02:00
committed by GitHub
parent 2b79b7b29f 02243173c2
commit 0366aa2217
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/xterm-addon-canvas/src/BaseRenderLayer.ts
+2 -2
View File
@@ -375,9 +375,9 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer
let glyph: IRasterizedGlyph; let glyph: IRasterizedGlyph;
if (chars && chars.length > 1) { if (chars && chars.length > 1) {
glyph = this._charAtlas.getRasterizedGlyphCombinedChar(chars, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext); glyph = this._charAtlas.getRasterizedGlyphCombinedChar(chars, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext, true);
} else { } else {
glyph = this._charAtlas.getRasterizedGlyph(cell.getCode() || WHITESPACE_CELL_CODE, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext); glyph = this._charAtlas.getRasterizedGlyph(cell.getCode() || WHITESPACE_CELL_CODE, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext, true);
} }
if (!glyph.size.x || !glyph.size.y) { if (!glyph.size.x || !glyph.size.y) {
return; return;
addons/xterm-addon-webgl/src/GlyphRenderer.ts
+2 -2
View File
@@ -236,9 +236,9 @@ export class GlyphRenderer extends Disposable {
// Get the glyph // Get the glyph
if (chars && chars.length > 1) { if (chars && chars.length > 1) {
$glyph = this._atlas.getRasterizedGlyphCombinedChar(chars, bg, fg, ext); $glyph = this._atlas.getRasterizedGlyphCombinedChar(chars, bg, fg, ext, false);
} else { } else {
$glyph = this._atlas.getRasterizedGlyph(code, bg, fg, ext); $glyph = this._atlas.getRasterizedGlyph(code, bg, fg, ext, false);
} }
$leftCellPadding = Math.floor((this._dimensions.device.cell.width - this._dimensions.device.char.width) / 2); $leftCellPadding = Math.floor((this._dimensions.device.cell.width - this._dimensions.device.char.width) / 2);
src/browser/renderer/shared/TextureAtlas.ts
+20 -11
View File
@@ -242,12 +242,12 @@ export class TextureAtlas implements ITextureAtlas {
} }
} }
public getRasterizedGlyphCombinedChar(chars: string, bg: number, fg: number, ext: number): IRasterizedGlyph { public getRasterizedGlyphCombinedChar(chars: string, bg: number, fg: number, ext: number, restrictToCellHeight: boolean): IRasterizedGlyph {
return this._getFromCacheMap(this._cacheMapCombined, chars, bg, fg, ext); return this._getFromCacheMap(this._cacheMapCombined, chars, bg, fg, ext, restrictToCellHeight);
} }
public getRasterizedGlyph(code: number, bg: number, fg: number, ext: number): IRasterizedGlyph { public getRasterizedGlyph(code: number, bg: number, fg: number, ext: number, restrictToCellHeight: boolean): IRasterizedGlyph {
return this._getFromCacheMap(this._cacheMap, code, bg, fg, ext); return this._getFromCacheMap(this._cacheMap, code, bg, fg, ext, restrictToCellHeight);
} }
/** /**
@@ -258,11 +258,12 @@ export class TextureAtlas implements ITextureAtlas {
key: string | number, key: string | number,
bg: number, bg: number,
fg: number, fg: number,
ext: number ext: number,
restrictToCellHeight: boolean = false
): IRasterizedGlyph { ): IRasterizedGlyph {
$glyph = cacheMap.get(key, bg, fg, ext); $glyph = cacheMap.get(key, bg, fg, ext);
if (!$glyph) { if (!$glyph) {
$glyph = this._drawToCache(key, bg, fg, ext); $glyph = this._drawToCache(key, bg, fg, ext, restrictToCellHeight);
cacheMap.set(key, bg, fg, ext, $glyph); cacheMap.set(key, bg, fg, ext, $glyph);
} }
return $glyph; return $glyph;
@@ -414,7 +415,7 @@ export class TextureAtlas implements ITextureAtlas {
return color; return color;
} }
private _drawToCache(codeOrChars: number | string, bg: number, fg: number, ext: number): IRasterizedGlyph { private _drawToCache(codeOrChars: number | string, bg: number, fg: number, ext: number, restrictToCellHeight: boolean = false): IRasterizedGlyph {
const chars = typeof codeOrChars === 'number' ? String.fromCharCode(codeOrChars) : codeOrChars; const chars = typeof codeOrChars === 'number' ? String.fromCharCode(codeOrChars) : codeOrChars;
// Uncomment for debugging // Uncomment for debugging
@@ -534,6 +535,7 @@ export class TextureAtlas implements ITextureAtlas {
const yTop = Math.ceil(padding + this._config.deviceCharHeight) - yOffset; const yTop = Math.ceil(padding + this._config.deviceCharHeight) - yOffset;
const yMid = padding + this._config.deviceCharHeight + lineWidth - yOffset; const yMid = padding + this._config.deviceCharHeight + lineWidth - yOffset;
const yBot = Math.ceil(padding + this._config.deviceCharHeight + lineWidth * 2) - yOffset; const yBot = Math.ceil(padding + this._config.deviceCharHeight + lineWidth * 2) - yOffset;
const ySpace = lineWidth * 2;
for (let i = 0; i < chWidth; i++) { for (let i = 0; i < chWidth; i++) {
this._tmpCtx.save(); this._tmpCtx.save();
@@ -542,10 +544,17 @@ export class TextureAtlas implements ITextureAtlas {
const xChMid = xChLeft + this._config.deviceCellWidth / 2; const xChMid = xChLeft + this._config.deviceCellWidth / 2;
switch (this._workAttributeData.extended.underlineStyle) { switch (this._workAttributeData.extended.underlineStyle) {
case UnderlineStyle.DOUBLE: case UnderlineStyle.DOUBLE:
this._tmpCtx.moveTo(xChLeft, yTop); if (restrictToCellHeight) {
this._tmpCtx.lineTo(xChRight, yTop); this._tmpCtx.moveTo(xChLeft, yTop - ySpace);
this._tmpCtx.moveTo(xChLeft, yBot); this._tmpCtx.lineTo(xChRight, yTop - ySpace);
this._tmpCtx.lineTo(xChRight, yBot); this._tmpCtx.moveTo(xChLeft, yTop);
this._tmpCtx.lineTo(xChRight, yTop);
} else {
this._tmpCtx.moveTo(xChLeft, yTop);
this._tmpCtx.lineTo(xChRight, yTop);
this._tmpCtx.moveTo(xChLeft, yBot);
this._tmpCtx.lineTo(xChRight, yBot);
}
break; break;
case UnderlineStyle.CURLY: case UnderlineStyle.CURLY:
// Choose the bezier top and bottom based on the device pixel ratio, the curly line is // Choose the bezier top and bottom based on the device pixel ratio, the curly line is
src/browser/renderer/shared/Types.d.ts
Vendored
+2 -2
View File
@@ -107,8 +107,8 @@ export interface ITextureAtlas extends IDisposable {
* Clear all glyphs from the texture atlas. * Clear all glyphs from the texture atlas.
*/ */
clearTexture(): void; clearTexture(): void;
getRasterizedGlyph(code: number, bg: number, fg: number, ext: number): IRasterizedGlyph; getRasterizedGlyph(code: number, bg: number, fg: number, ext: number, restrictToCellHeight: boolean): IRasterizedGlyph;
getRasterizedGlyphCombinedChar(chars: string, bg: number, fg: number, ext: number): IRasterizedGlyph; getRasterizedGlyphCombinedChar(chars: string, bg: number, fg: number, ext: number, restrictToCellHeight: boolean): IRasterizedGlyph;
} }
/** /**