jsbeeb 1.17.1 → 1.19.0

package/src/main.js

@@ -12,7 +12,7 @@ import * as utils_atom from "./utils_atom.js";
 import { LoadSD } from "./mmc.js";
 import { Cmos, localStoragePersistence } from "./cmos.js";
 import { StairwayToHell } from "./sth.js";
-import { BbcDiscArchive, describe as describeHfe } from "./bbcdiscs.js";
+import { BbcDiscArchive, Provenance, describe as describeHfe, matches, provenancesIn } from "./bbcdiscs.js";
 import { GamePad } from "./gamepads.js";
 import * as disc from "./fdc.js";
 import { loadTapeFromData } from "./tapes.js";
@@ -374,6 +374,10 @@ let tryGl = true;
 if (parsedQuery.glEnabled !== undefined) {
     tryGl = parsedQuery.glEnabled === "true";
 }
+let lowLatency = true;
+if (parsedQuery.lowLatency !== undefined) {
+    lowLatency = parsedQuery.lowLatency === "true";
+}
 const screenCanvas = document.getElementById("screen");
 
 const errorDialog = document.getElementById("error-dialog");
@@ -397,6 +401,24 @@ function showError(context, error) {
 
 const errorText = (error) => error?.message ?? `${error}`;
 
+function reportLoadFailure(description, error) {
+    console.error(`Error loading ${description}:`, error);
+    toast(`Could not load ${description}: ${errorText(error)}`, { title: "Loading" });
+}
+
+function reportIgnoredFiles(name, ignored) {
+    if (!ignored.length) return;
+    toast(`Loaded ${name}. The archive also holds ${ignored.join(", ")}, and only one file is loaded from it.`, {
+        title: "Archive",
+    });
+}
+
+async function unzipAndReport(data) {
+    const unzipped = await utils.unzipDiscImage(data);
+    reportIgnoredFiles(unzipped.name, unzipped.ignored);
+    return unzipped;
+}
+
 function showNotice(event) {
     const { message, title, quietKey } = event.detail;
     toast(message, { title, quietKey });
@@ -471,59 +493,59 @@ function noteDriveTracks(driveIndex, discName) {
     });
 }
 
-function createCanvasForFilter(filterClass) {
+// Test which filter is actually in use, not merely whether we got WebGL: a
+// filter can decline a context that works perfectly well for other modes, in
+// which case we are quietly left with an unfiltered display.
+function reportAnyFallback(displayCanvas, filterClass) {
+    if (displayCanvas.filterClass === filterClass) return;
+    const reason = displayCanvas.fallbackReason ? ` (${displayCanvas.fallbackReason})` : "";
+    const { name } = filterClass.getDisplayConfig();
+    toast(`${name} is not available on this device, so the standard display is in use${reason}.`, {
+        title: "Display",
+        quietKey: "quietDisplayFallback",
+    });
+}
+
+function sizeCanvasFor(filterClass) {
     // Not `config`: that is the emulator's live configuration object, declared
     // at module scope and used throughout this file.
     const displayConfig = filterClass.getDisplayConfig();
-    // Each mode says how many pixels it wants to draw into. Set this before
-    // creating the context, which fixes its initial viewport.
+    if (screenCanvas.width === displayConfig.canvasWidth && screenCanvas.height === displayConfig.canvasHeight) return;
     screenCanvas.width = displayConfig.canvasWidth;
     screenCanvas.height = displayConfig.canvasHeight;
+}
 
-    const newCanvas = tryGl ? canvasLib.bestCanvas(screenCanvas, filterClass) : new canvasLib.Canvas(screenCanvas);
-
-    // Test which filter was actually built, not merely whether we got WebGL: a
-    // filter can decline a context that works perfectly well for other modes,
-    // in which case bestCanvas quietly gives us an unfiltered GL canvas.
-    if (newCanvas.filterClass !== filterClass) {
-        const reason = newCanvas.fallbackReason ? ` (${newCanvas.fallbackReason})` : "";
-        toast(`${displayConfig.name} is not available on this device, so the standard display is in use${reason}.`, {
-            title: "Display",
-            quietKey: "quietDisplayFallback",
-        });
-    }
+function createCanvasForFilter(filterClass) {
+    // Each mode says how many pixels it wants to draw into. Set this before
+    // creating the context, which fixes its initial viewport.
+    sizeCanvasFor(filterClass);
 
+    const newCanvas = tryGl
+        ? canvasLib.bestCanvas(screenCanvas, filterClass, lowLatency)
+        : new canvasLib.Canvas(screenCanvas, lowLatency);
+    reportAnyFallback(newCanvas, filterClass);
     return newCanvas;
 }
 
 let displayModeFilter = canvasLib.getFilterForMode(parsedQuery.displayMode || "rgb");
 function swapCanvas(newFilterClass) {
-    const oldCanvas = canvas;
-    const newCanvas = createCanvasForFilter(newFilterClass);
-    // Carry the picture over; the buffers differ in height, so copy what fits.
-    newCanvas.fb32.set(oldCanvas.fb32.subarray(0, newCanvas.fb32.length));
-    // Only once the replacement exists, so a failure to build it leaves the
-    // display we already had. The two share a GL context but no GL objects.
-    oldCanvas.dispose();
-    video.fb32 = newCanvas.fb32;
-    video.paint_ext = function paint(minx, miny, maxx, maxy) {
-        frames++;
-        if (frames < frameSkip) return;
-        frames = 0;
-        newCanvas.paint(minx, miny, maxx, maxy, { frameCount: this.frameCount, lineGrid: this.lineGrid });
-    };
-    canvas = newCanvas;
+    // Everything but the filter is the same whatever the mode: the framebuffer
+    // texture, the vertex buffers and fb32 all carry over untouched.
+    canvasLib.useBestFilter(canvas, newFilterClass);
+    reportAnyFallback(canvas, newFilterClass);
     // Follow the filter we ended up with, not the one we asked for: everything
-    // downstream — the monitor picture, the canvas geometry, how large a
-    // drawing buffer to ask for — comes from its display config.
-    displayModeFilter = newCanvas.filterClass;
+    // downstream (the monitor picture, the canvas geometry, how large a drawing
+    // buffer to ask for) comes from its display config.
+    displayModeFilter = canvas.filterClass;
+    // Back to the mode's own size, undoing any scaling the last one asked for.
+    sizeCanvasFor(displayModeFilter);
     // Nothing else will redraw: the mode is changed from a modal, which stops
     // the emulator.
     video.paint();
     window.setTimeout(() => window.dispatchEvent(new Event("resize")), 1);
 }
 
-let canvas = createCanvasForFilter(displayModeFilter);
+const canvas = createCanvasForFilter(displayModeFilter);
 displayModeFilter = canvas.filterClass;
 
 video = new Video(
@@ -641,14 +663,19 @@ pastetext.addEventListener("dragover", function (event) {
 pastetext.addEventListener("drop", async function (event) {
     utils.noteEvent("local", "drop");
     const file = event.dataTransfer.files[0];
-    const arrayBuffer = await file.arrayBuffer();
-    if (isSnapshotFile(file.name, arrayBuffer)) {
-        await loadStateFromFile(file, arrayBuffer);
-    } else if (file.name.toLowerCase().endsWith(".uef")) {
-        // Regular UEF tape image (not a BeebEm save state)
-        setProcessorTape(await loadTapeFromData(file.name, new Uint8Array(arrayBuffer), model));
-    } else {
-        await loadHTMLFile(file);
+    if (!file) return;
+    try {
+        const arrayBuffer = await file.arrayBuffer();
+        if (isSnapshotFile(file.name, arrayBuffer)) {
+            await loadStateFromFile(file, arrayBuffer);
+        } else if (file.name.toLowerCase().endsWith(".uef")) {
+            // Regular UEF tape image (not a BeebEm save state)
+            setProcessorTape(await loadTapeFromData(file.name, new Uint8Array(arrayBuffer), model));
+        } else {
+            await loadHTMLFile(file);
+        }
+    } catch (error) {
+        reportLoadFailure(file.name, error);
     }
 });
 
@@ -1211,13 +1238,15 @@ function hfeOnCat(catalogue) {
     const list = document.getElementById("hfe-list");
     document.querySelector("#hfe .loading").style.display = "none";
     const template = list.querySelector(".template");
+    showProvenanceChoices(catalogue, onHfeFilter);
 
     const addSome = (remaining) => {
         if (ticket !== hfeRender) return;
         const MaxAtATime = 100;
         const Delay = 30;
-        // Read per batch: the filter can be typed into while this is still going.
+        // Read per batch: both can be changed while this is still going.
         const filter = document.getElementById("hfe-filter").value.toLowerCase();
+        const shown = shownProvenances();
         for (const file of remaining.slice(0, MaxAtATime)) {
             const { title, publisher, detail } = describeHfe(file);
             const row = template.cloneNode(true);
@@ -1225,6 +1254,8 @@ function hfeOnCat(catalogue) {
             row.querySelector(".name").textContent = title;
             row.querySelector(".publisher").textContent = publisher;
             row.querySelector(".detail").textContent = detail;
+            row.querySelector(".provenance").textContent =
+                file.provenance === Provenance.Reconstructed ? "reconstructed" : "";
             if (file.notes) row.title = file.notes;
             // The row is an anchor, and letting it navigate to "#" would push a
             // history entry of its own on top of the one updateUrl pushes.
@@ -1233,8 +1264,9 @@ function hfeOnCat(catalogue) {
                 hfeClick(file);
                 $hfeModal.hide();
             });
-            row.style.display = row.textContent.toLowerCase().includes(filter) ? "" : "none";
+            row.hfeFile = file;
             list.appendChild(row);
+            showHfeRow(row, file, filter, shown);
         }
         if (remaining.length > MaxAtATime) setTimeout(() => addSome(remaining.slice(MaxAtATime)), Delay);
     };
@@ -1248,7 +1280,53 @@ document.getElementById("hfe").addEventListener("shown.bs.modal", () => {
 document.getElementById("hfe").addEventListener("show.bs.modal", () => hfeArchive.populate());
 
 const hfeFilter = document.getElementById("hfe-filter");
-const onHfeFilter = () => filterArchiveList("hfe-list", hfeFilter.value);
+const hfeProvenance = document.getElementById("hfe-provenance");
+
+const HfeProvenanceLabels = {
+    [Provenance.Captured]: ["Captured", "Direct from disc"],
+    [Provenance.Reconstructed]: ["Reconstructed", "Rebuilt from a sector dump"],
+};
+
+/** Which provenances the picker is showing, or null when it is not offering the choice. */
+const shownProvenances = () => {
+    const boxes = [...hfeProvenance.querySelectorAll("input")];
+    return boxes.length ? new Set(boxes.filter((box) => box.checked).map((box) => box.value)) : null;
+};
+
+// Offer one tick per provenance the archive actually holds, rather than naming
+// them here: a source added later should appear without this having to change.
+function showProvenanceChoices(catalogue, onChange) {
+    const present = provenancesIn(catalogue);
+    // Nothing to choose between: no ticks, and shownProvenances says "all".
+    if (present.length < 2) {
+        hfeProvenance.replaceChildren();
+        return;
+    }
+    const wasShown = shownProvenances();
+    hfeProvenance.replaceChildren(
+        ...present.map((provenance) => {
+            const [text, why] = HfeProvenanceLabels[provenance] ?? [provenance, ""];
+            const label = document.createElement("label");
+            label.title = why;
+            const box = document.createElement("input");
+            box.type = "checkbox";
+            box.value = provenance;
+            box.checked = !wasShown || wasShown.has(provenance);
+            box.addEventListener("change", onChange);
+            label.append(box, text);
+            return label;
+        }),
+    );
+}
+
+const showHfeRow = (row, file, filter, shown) => (row.style.display = matches(file, filter, shown) ? "" : "none");
+
+const onHfeFilter = () => {
+    const filter = hfeFilter.value.toLowerCase();
+    const shown = shownProvenances();
+    for (const row of document.querySelectorAll("#hfe-list li:not(.template)"))
+        showHfeRow(row, row.hfeFile, filter, shown);
+};
 hfeFilter.addEventListener("change", onHfeFilter);
 hfeFilter.addEventListener("keyup", onHfeFilter);
 
@@ -1385,7 +1463,8 @@ async function loadDiscImage(discImage, layout = DiscLayout.auto) {
     switch (schema) {
         case "|":
         case "sth": {
-            const { name, data } = await discSth.fetch(discImage);
+            const { name, data, ignored } = await discSth.fetch(discImage);
+            reportIgnoredFiles(name, ignored);
             return disc.discFor(processor.fdc, name, data, undefined, layout);
         }
 
@@ -1406,7 +1485,7 @@ async function loadDiscImage(discImage, layout = DiscLayout.auto) {
 
         case "data": {
             const arr = Array.prototype.map.call(atob(discImage), (x) => x.charCodeAt(0));
-            const { name, data } = await utils.unzipDiscImage(arr);
+            const { name, data } = await unzipAndReport(arr);
             return disc.discFor(processor.fdc, name, data, undefined, layout);
         }
         case "http":
@@ -1417,7 +1496,7 @@ async function loadDiscImage(discImage, layout = DiscLayout.auto) {
             discImage = new URL(asUrl).pathname;
             let discData = await utils.loadData(asUrl);
             if (/\.zip/i.test(discImage)) {
-                const unzipped = await utils.unzipDiscImage(discData);
+                const unzipped = await unzipAndReport(discData);
                 discData = unzipped.data;
                 discImage = unzipped.name;
             }
@@ -1436,13 +1515,14 @@ async function loadTapeImage(tapeImage) {
     switch (schema) {
         case "|":
         case "sth": {
-            const { name, data } = await tapeSth.fetch(tapeImage);
+            const { name, data, ignored } = await tapeSth.fetch(tapeImage);
+            reportIgnoredFiles(name, ignored);
             return await loadTapeFromData(name, data, model);
         }
 
         case "data": {
             const arr = Array.prototype.map.call(atob(tapeImage), (x) => x.charCodeAt(0));
-            const { name, data } = await utils.unzipDiscImage(arr);
+            const { name, data } = await unzipAndReport(arr);
             return await loadTapeFromData(name, data, model);
         }
 
@@ -1454,7 +1534,7 @@ async function loadTapeImage(tapeImage) {
             tapeImage = new URL(asUrl).pathname;
             let tapeData = await utils.loadData(asUrl);
             if (/\.zip/i.test(tapeImage)) {
-                const unzipped = await utils.unzipDiscImage(tapeData);
+                const unzipped = await unzipAndReport(tapeData);
                 tapeData = unzipped.data;
                 tapeImage = unzipped.name;
             }
@@ -1466,7 +1546,7 @@ async function loadTapeImage(tapeImage) {
             let tapeData = await utils.loadData(tapePath);
             let tapeName = tapeImage;
             if (/\.zip/i.test(tapeName)) {
-                const unzipped = await utils.unzipDiscImage(tapeData);
+                const unzipped = await unzipAndReport(tapeData);
                 tapeData = unzipped.data;
                 tapeName = unzipped.name;
             }
@@ -1479,7 +1559,11 @@ document.getElementById("disc_load").addEventListener("change", async function (
     if (evt.target.files.length === 0) return;
     utils.noteEvent("local", "click"); // NB no filename here
     const file = evt.target.files[0];
-    await loadHTMLFile(file);
+    try {
+        await loadHTMLFile(file);
+    } catch (error) {
+        reportLoadFailure(file.name, error);
+    }
     evt.target.value = ""; // clear so if the user picks the same file again after a reset we get a "change"
 });
 
@@ -1487,7 +1571,11 @@ document.getElementById("fs_load").addEventListener("change", async function (ev
     if (evt.target.files.length === 0) return;
     utils.noteEvent("local", "click"); // NB no filename here
     const file = evt.target.files[0];
-    await loadSCSIFile(file);
+    try {
+        await loadSCSIFile(file);
+    } catch (error) {
+        reportLoadFailure(file.name, error);
+    }
     evt.target.value = ""; // clear so if the user picks the same file again after a reset we get a "change"
 });
 
@@ -1496,17 +1584,21 @@ document.getElementById("tape_load").addEventListener("change", async function (
     const file = evt.target.files[0];
     utils.noteEvent("local", "clickTape"); // NB no filename here
 
-    let tapeData = await readFileAsBinaryString(file);
-    let tapeName = file.name;
-    if (/\.zip/i.test(tapeName)) {
-        const unzipped = await utils.unzipDiscImage(utils.stringToUint8Array(tapeData));
-        tapeData = unzipped.data;
-        tapeName = unzipped.name;
+    try {
+        let tapeData = await readFileAsBinaryString(file);
+        let tapeName = file.name;
+        if (/\.zip/i.test(tapeName)) {
+            const unzipped = await unzipAndReport(utils.stringToUint8Array(tapeData));
+            tapeData = unzipped.data;
+            tapeName = unzipped.name;
+        }
+        setProcessorTape(await loadTapeFromData(tapeName, tapeData, model));
+        delete parsedQuery.tape;
+        updateUrl();
+        bootstrap.Modal.getInstance(document.getElementById("tapes"))?.hide();
+    } catch (error) {
+        reportLoadFailure(file.name, error);
     }
-    setProcessorTape(await loadTapeFromData(tapeName, tapeData, model));
-    delete parsedQuery.tape;
-    updateUrl();
-    bootstrap.Modal.getInstance(document.getElementById("tapes"))?.hide();
 
     evt.target.value = ""; // clear so if the user picks the same file again after a reset we get a "change"
 });
@@ -1623,7 +1715,14 @@ googleDriveEl.addEventListener("show.bs.modal", async function () {
     gdLoading.textContent = "Loading...";
     gdLoading.style.display = "";
     for (const el of googleDriveEl.querySelectorAll("li:not(.template)")) el.remove();
-    const cat = await googleDrive.listFiles();
+    let cat;
+    try {
+        cat = await googleDrive.listFiles();
+    } catch (error) {
+        console.error("Error listing Google Drive files:", error);
+        gdLoading.textContent = `Unable to list your Google Drive files: ${errorText(error)}`;
+        return;
+    }
     const dbList = googleDriveEl.querySelector(".list");
     gdLoading.style.display = "none";
     const template = dbList.querySelector(".template");
@@ -1653,7 +1752,11 @@ for (const image of availableImages) {
         utils.noteEvent("images", "click", image.file);
         setDisc1Image(image.file);
         $discsModal.hide();
-        putDiscIn(0, await loadDiscImage(parsedQuery.disc1, layoutForDrive(0)));
+        try {
+            putDiscIn(0, await loadDiscImage(parsedQuery.disc1, layoutForDrive(0)));
+        } catch (error) {
+            reportLoadFailure(`${image.name} (${image.file})`, error);
+        }
     });
 }
 
@@ -1946,8 +2049,7 @@ const startPromise = (async () => {
             try {
                 await load();
             } catch (error) {
-                console.error(`Error loading ${description}:`, error);
-                toast(`Could not load ${description}: ${error?.message ?? error}`, { title: "Loading" });
+                reportLoadFailure(description, error);
             }
         })();
         imageLoads.push(loading);

package/src/snapshot-helpers.js

@@ -139,7 +139,6 @@ export function buildVideoState(ulaControl, ulaPalette, crtcRegs, nulaCollook, c
             wasDbl: false,
             gfx: false,
             flash: false,
-            flashOn: false,
             flashTime: 0,
             heldChar: 0,
             holdChar: false,

package/src/teletext.js

@@ -11,7 +11,8 @@ export class Teletext {
         this.sep = false;
         this.dbl = this.oldDbl = this.secondHalfOfDouble = this.wasDbl = false;
         this.gfx = false;
-        this.flash = this.flashOn = false;
+        this.conceal = false;
+        this.flash = false;
         this.flashTime = 0;
         this.heldChar = 0;
         this.holdChar = false;
@@ -172,8 +173,8 @@ export class Teletext {
             secondHalfOfDouble: this.secondHalfOfDouble,
             wasDbl: this.wasDbl,
             gfx: this.gfx,
+            conceal: this.conceal,
             flash: this.flash,
-            flashOn: this.flashOn,
             flashTime: this.flashTime,
             heldChar: this.heldChar,
             holdChar: this.holdChar,
@@ -198,8 +199,8 @@ export class Teletext {
         this.secondHalfOfDouble = state.secondHalfOfDouble;
         this.wasDbl = state.wasDbl;
         this.gfx = state.gfx;
+        this.conceal = state.conceal ?? false;
         this.flash = state.flash;
-        this.flashOn = state.flashOn;
         this.flashTime = state.flashTime;
         this.heldChar = state.heldChar;
         this.holdChar = state.holdChar;
@@ -245,6 +246,7 @@ export class Teletext {
             case 7:
                 this.gfx = false;
                 this.col = data;
+                this.conceal = false;
                 this.setNextChars();
                 break;
             case 8:
@@ -267,10 +269,11 @@ export class Teletext {
             case 23:
                 this.gfx = true;
                 this.col = data & 7;
+                this.conceal = false;
                 this.setNextChars();
                 break;
             case 24:
-                this.col = this.prevCol = this.bg;
+                this.conceal = true;
                 break;
             case 25:
                 this.sep = false;
@@ -295,7 +298,6 @@ export class Teletext {
         }
         if (wasGfx && (wasHoldChar || this.holdChar) && this.dbl === this.oldDbl) {
             data = this.heldChar;
-            if (data >= 0x40 && data < 0x60) data = 0x20;
             this.curGlyphs = this.heldGlyphs;
         } else {
             this.heldChar = 0x20;
@@ -328,13 +330,14 @@ export class Teletext {
 
         // 3:1 flash ratio.
         if (++this.flashTime === 64) this.flashTime = 0;
-        // Flashing text starts off in sync with a slow cursor, extinguished
-        // together.  Multiple MODE changes gradually desynchronise the
-        // frame counters.
-        // TODO: this point is being reached a MOS-dependent number of times
-        // before Video.frameCount rises.  The next line achieves initial
-        // sync under MOS 1.20 only.
-        this.flashOn = this.flashTime < 16;
+    }
+
+    // Flashing text starts off in sync with a slow cursor, extinguished together. Multiple MODE
+    // changes gradually desynchronise the frame counters.
+    // TODO: setDEW is reached a MOS-dependent number of times before Video.frameCount rises, so
+    // the initial sync here holds under MOS 1.20 only.
+    get hideFlashing() {
+        return this.flashTime < 16;
     }
 
     setDISPTMG(level) {
@@ -358,6 +361,7 @@ export class Teletext {
         this.flash = false;
         this.sep = false;
         this.gfx = false;
+        this.conceal = false;
         this.dbl = false;
 
         this.scanlineCounter++;
@@ -396,6 +400,7 @@ export class Teletext {
         this.curGlyphs = this.nextGlyphs;
 
         let flashThisCell = this.flash;
+        let concealThisCell = this.conceal;
         if (data < 0x20) {
             data = this.handleControlCode(data);
         } else if (this.gfx) {
@@ -419,7 +424,10 @@ export class Teletext {
         // Steady (code 9) is "Set At" — update so this cell stops flashing immediately.
         if (flashThisCell && !this.flash) flashThisCell = false;
 
-        if ((flashThisCell && this.flashOn) || (this.secondHalfOfDouble && !this.dbl)) {
+        // Conceal (code 24) is "Set At", and a colour code only reveals from the cell after itself.
+        if (this.conceal) concealThisCell = true;
+
+        if (concealThisCell || (flashThisCell && this.hideFlashing) || (this.secondHalfOfDouble && !this.dbl)) {
             const backgroundColour = this.colour[(this.bg & 7) << 5];
             for (let i = 0; i < 16; ++i) {
                 buf[offset++] = backgroundColour;

package/src/teletext_adaptor.js

@@ -94,6 +94,45 @@ export class TeletextAdaptor extends EventTarget {
         this.currentFrame = 0;
     }
 
+    updateIrq() {
+        if (this.teletextInts && this.teletextStatus & 0x80) {
+            this.cpu.interrupt |= 1 << TELETEXT_IRQ;
+        } else {
+            this.cpu.interrupt &= ~(1 << TELETEXT_IRQ);
+        }
+    }
+
+    snapshotState() {
+        return {
+            teletextStatus: this.teletextStatus,
+            teletextInts: this.teletextInts,
+            teletextEnable: this.teletextEnable,
+            channel: this.channel,
+            currentFrame: this.currentFrame,
+            rowPtr: this.rowPtr,
+            colPtr: this.colPtr,
+            pollCount: this.pollCount,
+            frameBuffer: this.frameBuffer.map((row) => row.slice()),
+        };
+    }
+
+    restoreState(state) {
+        this.teletextStatus = state.teletextStatus;
+        this.teletextInts = state.teletextInts;
+        this.teletextEnable = state.teletextEnable;
+        this.currentFrame = state.currentFrame;
+        this.rowPtr = state.rowPtr;
+        this.colPtr = state.colPtr;
+        this.pollCount = state.pollCount;
+        this.frameBuffer = state.frameBuffer.map((row) => row.slice());
+        this.updateIrq();
+        // Refetching the multi-megabyte stream on every restore would be ruinous for rewind.
+        if (this.channel !== state.channel) {
+            this.channel = state.channel;
+            this.loadChannelStream(this.channel);
+        }
+    }
+
     read(addr) {
         let data = 0x00;
 
@@ -120,11 +159,7 @@ export class TeletextAdaptor extends EventTarget {
             case 0x00:
                 // Status register
                 this.teletextInts = (value & 0x08) === 0x08;
-                if (this.teletextInts && this.teletextStatus & 0x80) {
-                    this.cpu.interrupt |= 1 << TELETEXT_IRQ; // Interrupt if INT and interrupts enabled
-                } else {
-                    this.cpu.interrupt &= ~(1 << TELETEXT_IRQ); // Clear interrupt
-                }
+                this.updateIrq();
                 this.teletextEnable = (value & 0x04) === 0x04;
                 if ((value & 0x03) !== this.channel && this.teletextEnable) {
                     this.channel = value & 0x03;

package/src/touchscreen.js

@@ -13,11 +13,32 @@ export class TouchScreen {
     constructor(scheduler, cyclesPerSecond) {
         this.scheduler = scheduler;
         this.pollCycles = cyclesPerSecond / PollHz;
-        this.mouse = { x: 0, y: 0, button: 0 };
         this.outBuffer = new utils.Fifo(16);
-        this.delay = 0;
-        this.mode = 0;
         this.pollTask = this.scheduler.newTask(() => this.poll());
+        this.reset();
+    }
+
+    reset() {
+        this.mouse = { x: 0, y: 0, button: 0 };
+        this.mode = 0;
+        this.outBuffer.clear();
+        this.pollTask.cancel();
+    }
+
+    snapshotState() {
+        return {
+            mode: this.mode,
+            outBuffer: this.outBuffer.toArray(),
+            pollTaskOffset: this.pollTask.scheduled() ? this.pollTask.expireEpoch - this.scheduler.epoch : null,
+        };
+    }
+
+    restoreState(state) {
+        this.mode = state.mode;
+        this.outBuffer.clear();
+        for (const byte of state.outBuffer) this.store(byte);
+        this.pollTask.cancel();
+        if (state.pollTaskOffset !== null) this.pollTask.schedule(state.pollTaskOffset);
     }
 
     tryReceive(rts) {