Merge pull request #3624 from Tyriar/3617_clear_on_buffer_change

Ensure the glyph vertices are cleared when switching buffers
xtermjs · Feb 3, 2022 · a63890e · a63890e
2 parents b557ebe + 904b491
commit a63890e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/addons/xterm-addon-webgl/src/GlyphRenderer.ts b/addons/xterm-addon-webgl/src/GlyphRenderer.ts
@@ -299,32 +299,37 @@ export class GlyphRenderer {
  return this._colors.ansi[idx];
  }
 
- public onResize(): void {
+ public clear(force?: boolean): void {
  const terminal = this._terminal;
- const gl = this._gl;
-
- gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
-
- // Update vertices
  const newCount = terminal.cols * terminal.rows * INDICES_PER_CELL;
- if (this._vertices.count !== newCount) {
- this._vertices.count = newCount;
- this._vertices.attributes = new Float32Array(newCount);
- for (let i = 0; i < this._vertices.attributesBuffers.length; i++) {
- this._vertices.attributesBuffers[i] = new Float32Array(newCount);
- }
 
- let i = 0;
- for (let y = 0; y < terminal.rows; y++) {
- for (let x = 0; x < terminal.cols; x++) {
- this._vertices.attributes[i + 8] = x / terminal.cols;
- this._vertices.attributes[i + 9] = y / terminal.rows;
- i += INDICES_PER_CELL;
- }
+ // Don't clear if not forced and the array length is correct
+ if (!force && this._vertices.count === newCount) {
+ return;
+ }
+
+ // Clear vertices
+ this._vertices.count = newCount;
+ this._vertices.attributes = new Float32Array(newCount);
+ for (let i = 0; i < this._vertices.attributesBuffers.length; i++) {
+ this._vertices.attributesBuffers[i] = new Float32Array(newCount);
+ }
+ let i = 0;
+ for (let y = 0; y < terminal.rows; y++) {
+ for (let x = 0; x < terminal.cols; x++) {
+ this._vertices.attributes[i + 8] = x / terminal.cols;
+ this._vertices.attributes[i + 9] = y / terminal.rows;
+ i += INDICES_PER_CELL;
  }
  }
  }
 
+ public onResize(): void {
+ const gl = this._gl;
+ gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
+ this.clear();
+ }
+
  public setColors(): void {
  }
 

diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.ts b/addons/xterm-addon-webgl/src/WebglRenderer.ts
@@ -247,6 +247,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
  }
 
  public clear(): void {
+ this._model.clear();
+ this._glyphRenderer.clear(true);
  for (const l of this._renderLayers) {
  l.reset(this._terminal);
  }

diff --git a/src/browser/services/RenderService.ts b/src/browser/services/RenderService.ts
@@ -65,7 +65,8 @@ export class RenderService extends Disposable implements IRenderService {
  this._screenDprMonitor.setListener(() => this.onDevicePixelRatioChange());
  this.register(this._screenDprMonitor);
 
- this.register(bufferService.onResize(e => this._fullRefresh()));
+ this.register(bufferService.onResize(() => this._fullRefresh()));
+ this.register(bufferService.buffers.onBufferActivate(() => this._renderer?.clear()));
  this.register(optionsService.onOptionChange(() => this._renderer.onOptionsChanged()));
  this.register(this._charSizeService.onCharSizeChange(() => this.onCharSizeChanged()));
 

diff --git a/src/common/InputHandler.ts b/src/common/InputHandler.ts
@@ -546,7 +546,7 @@ export class InputHandler extends Disposable implements IInputHandler {
 
  // Log debug data, the log level gate is to prevent extra work in this hot path
  if (this._logService.logLevel <= LogLevelEnum.DEBUG) {
- this._logService.debug(`parsing data${typeof data === 'string' ? ` "${data}"` : ''}`, typeof data === 'string'
+ this._logService.debug(`parsing data${typeof data === 'string' ? ` "${data}"` : ` "${Array.prototype.map.call(data, e => String.fromCharCode(e)).join('')}"`}`, typeof data === 'string'
  ? data.split('').map(e => e.charCodeAt(0))
  : data
  );