transfer changes from 0.4.3

This commit is contained in:
Jörg Breitbart
2023-08-01 16:43:14 +02:00
parent e8a925b6af
commit fe838726b0
7 changed files with 80 additions and 44 deletions
+14 -9
View File
@@ -177,8 +177,7 @@ export class ImageStorage implements IDisposable {
const spec = this._images.get(id);
this._images.delete(id);
// FIXME: really ugly workaround to get bitmaps deallocated :(
const win = this._terminal._core._coreBrowserService.window;
if (spec && win.ImageBitmap && spec.orig instanceof ImageBitmap) {
if (spec && window.ImageBitmap && spec.orig instanceof ImageBitmap) {
spec.orig.close();
}
}
@@ -224,7 +223,7 @@ export class ImageStorage implements IDisposable {
/**
* Method to add an image to the storage.
*/
public addImage(img: HTMLCanvasElement): void {
public addImage(img: HTMLCanvasElement | ImageBitmap): void {
// never allow storage to exceed memory limit
this._evictOldest(img.width * img.height);
@@ -327,9 +326,13 @@ export class ImageStorage implements IDisposable {
*/
// TODO: Should we move this to the ImageRenderer?
public render(range: { start: number, end: number }): void {
// exit early if we dont have a canvas
if (!this._renderer.canvas) {
return;
// setup image canvas in case we have none yet, but have images in store
if (!this._renderer.canvas && this._images.size) {
this._renderer.insertLayerToDom();
// safety measure - in case we cannot spawn a canvas at all, just exit
if (!this._renderer.canvas) {
return;
}
}
// rescale if needed
this._renderer.rescaleCanvas();
@@ -340,6 +343,9 @@ export class ImageStorage implements IDisposable {
this._fullyCleared = true;
this._needsFullClear = false;
}
if (this._renderer.canvas) {
this._renderer.removeLayerFromDom();
}
return;
}
@@ -472,9 +478,8 @@ export class ImageStorage implements IDisposable {
const e: IExtendedAttrsImage = line._extendedAttrs[x] || EMPTY_ATTRS;
if (e.imageId && e.imageId !== -1) {
const orig = this._images.get(e.imageId)?.orig;
const win = this._terminal._core._coreBrowserService.window;
if (win.ImageBitmap && orig instanceof ImageBitmap) {
const canvas = ImageRenderer.createCanvas(win, orig.width, orig.height);
if (window.ImageBitmap && orig instanceof ImageBitmap) {
const canvas = ImageRenderer.createCanvas(window.document, orig.width, orig.height);
canvas.getContext('2d')?.drawImage(orig, 0, 0, orig.width, orig.height);
return canvas;
}