jsbeeb 1.13.1 → 1.14.0

package/src/config.js

@@ -2,30 +2,85 @@
 import { allModels, findModel } from "./models.js";
 import { getFilterForMode } from "./canvas.js";
 
+/**
+ * The sideways ROMs the optional fittings need, in the order they claim banks.
+ *
+ * @param {{model: object, hasEconet: boolean, hasMusic5000: boolean, hasTeletextAdaptor: boolean}} settings
+ * @returns {string[]}
+ */
+export function fittedRoms({ model, hasEconet, hasMusic5000, hasTeletextAdaptor }) {
+    return [
+        ...(hasEconet && model.isMaster ? ["master/anfs-4.25.rom"] : []),
+        ...(hasMusic5000 ? ["ample.rom"] : []),
+        ...(hasTeletextAdaptor ? ["ats-3.0.rom"] : []),
+    ];
+}
+
+/** The settings the dialog presents as checkboxes. `enables` names a control only usable while ticked. */
+export const CheckboxSettings = [
+    { id: "65c02", field: "coProcessor", restartRequired: true, enables: "tubeCpuMultiplier" },
+    { id: "hasTeletextAdaptor", field: "hasTeletextAdaptor", restartRequired: true },
+    { id: "hasEconet", field: "hasEconet", restartRequired: true },
+    { id: "hasMusic5000", field: "hasMusic5000", restartRequired: true },
+    { id: "mouseJoystickEnabled", field: "mouseJoystickEnabled" },
+    { id: "speechOutput", field: "speechOutput" },
+];
+
+/** The model is not a checkbox, but changing it needs a restart just the same. */
+const RestartRequiredFields = [
+    "model",
+    ...CheckboxSettings.filter((setting) => setting.restartRequired).map((setting) => setting.field),
+];
+
+/** @returns {boolean} whether any of the changed settings only take effect on a freshly built machine. */
+export function needsRestart(changed) {
+    return RestartRequiredFields.some((field) => field in changed);
+}
+
+/** @returns {boolean} whether the saved settings differ from those the running machine was built with. */
+export function restartPending(settings, running) {
+    return RestartRequiredFields.some((field) => settings[field] !== running[field]);
+}
+
 export class Config extends EventTarget {
-    constructor(onChange, onClose) {
+    /**
+     * @param {function(object)} onChange called as soon as a setting the emulator can follow live changes
+     * @param {function(object)} onClose called with the settings to apply and persist
+     * @param {function()} onRestartRequired called after the settings have been saved, when some of them
+     *     will only take effect once the machine is rebuilt
+     */
+    constructor(onChange, onClose, onRestartRequired) {
         super();
         this.onChange = onChange;
         this.onClose = onClose;
+        this.onRestartRequired = onRestartRequired;
         this.changed = {};
         this.model = null;
-        this.coProcessor = null;
+        for (const { field } of CheckboxSettings) this[field] = false;
+        this.runningSettings = null;
         const configuration = document.getElementById("configuration");
         configuration.addEventListener("show.bs.modal", () => {
             this.changed = {};
+            // The startup settings are pushed in after construction, so what the running machine was
+            // built with is only knowable from the first time the dialog is opened.
+            if (!this.runningSettings) this.runningSettings = this.proposedSettings();
             this.setDropdownText(this.model.name);
-            this.set65c02(this.model.tube);
             this.setTubeCpuMultiplier(this.tubeCpuMultiplier);
-            this.setTeletext(this.model.hasTeletextAdaptor);
-            this.setMusic5000(this.model.hasMusic5000);
-            this.setEconet(this.model.hasEconet);
+            this.setCheckboxes(this);
+            this.showRestartPending();
         });
 
         configuration.addEventListener("hide.bs.modal", () => {
-            this.onClose(this.changed);
-            if (Object.keys(this.changed).length > 0) {
-                this.dispatchEvent(new CustomEvent("settings-changed", { detail: this.changed }));
-            }
+            const changed = this.changed;
+            // Not setModel: that also renames the machine in the title bar, which has not changed yet.
+            if (changed.model !== undefined) this.model = findModel(changed.model);
+            this.setCheckboxes(changed);
+            this.onClose(changed);
+            if (Object.keys(changed).length === 0) return;
+            this.dispatchEvent(new CustomEvent("settings-changed", { detail: changed }));
+            // changed records which controls were touched, so a value in it can be what is already running.
+            if (needsRestart(changed) && restartPending(this.proposedSettings(), this.runningSettings))
+                this.onRestartRequired();
         });
 
         const modelMenu = document.querySelector(".model-menu");
@@ -45,12 +100,17 @@ export class Config extends EventTarget {
             if (!link) return;
             this.changed.model = link.dataset.target;
             this.setDropdownText(link.textContent);
+            this.showRestartPending();
         });
 
-        document.getElementById("65c02").addEventListener("click", () => {
-            this.changed.coProcessor = document.getElementById("65c02").checked;
-            document.getElementById("tubeCpuMultiplier").disabled = !document.getElementById("65c02").checked;
-        });
+        for (const { id, field, enables } of CheckboxSettings) {
+            document.getElementById(id).addEventListener("click", () => {
+                const checked = document.getElementById(id).checked;
+                this.changed[field] = checked;
+                if (enables) document.getElementById(enables).disabled = !checked;
+                this.showRestartPending();
+            });
+        }
 
         document.getElementById("tubeCpuMultiplier").addEventListener("input", () => {
             const val = parseInt(document.getElementById("tubeCpuMultiplier").value, 10);
@@ -58,18 +118,6 @@ export class Config extends EventTarget {
             this.changed.tubeCpuMultiplier = val;
         });
 
-        document.getElementById("hasTeletextAdaptor").addEventListener("click", () => {
-            this.changed.hasTeletextAdaptor = document.getElementById("hasTeletextAdaptor").checked;
-        });
-
-        document.getElementById("hasEconet").addEventListener("click", () => {
-            this.changed.hasEconet = document.getElementById("hasEconet").checked;
-        });
-
-        document.getElementById("hasMusic5000").addEventListener("click", () => {
-            this.changed.hasMusic5000 = document.getElementById("hasMusic5000").checked;
-        });
-
         for (const link of document.querySelectorAll(".keyboard-menu a")) {
             link.addEventListener("click", (e) => {
                 const keyLayout = e.target.dataset.target;
@@ -87,14 +135,6 @@ export class Config extends EventTarget {
             });
         }
 
-        document.getElementById("mouseJoystickEnabled").addEventListener("click", () => {
-            this.changed.mouseJoystickEnabled = document.getElementById("mouseJoystickEnabled").checked;
-        });
-
-        document.getElementById("speechOutput").addEventListener("click", () => {
-            this.changed.speechOutput = document.getElementById("speechOutput").checked;
-        });
-
         for (const option of document.querySelectorAll(".display-mode-option")) {
             option.addEventListener("click", (e) => {
                 const mode = e.target.dataset.mode;
@@ -105,17 +145,34 @@ export class Config extends EventTarget {
         }
     }
 
-    setMicrophoneChannel(channel) {
-        const text = channel !== undefined ? `Channel ${channel}` : "Disabled";
-        for (const el of document.querySelectorAll(".mic-channel-text")) el.textContent = text;
+    /**
+     * The restart-required settings as they would be saved if the dialog were closed now, in the form the
+     * menu and the URL use: the model by synonym rather than resolved, the fittings as booleans.
+     */
+    proposedSettings() {
+        const saved = (field) => (field === "model" ? this.model.synonyms[0] : this[field]);
+        return Object.fromEntries(RestartRequiredFields.map((field) => [field, this.changed[field] ?? saved(field)]));
     }
 
-    setMouseJoystickEnabled(enabled) {
-        document.getElementById("mouseJoystickEnabled").checked = !!enabled;
+    showRestartPending() {
+        const pending = restartPending(this.proposedSettings(), this.runningSettings);
+        document.getElementById("restart-pending").classList.toggle("d-none", !pending);
+    }
+
+    /** Ticks the boxes named in `values` and adopts them, leaving any the object does not mention alone. */
+    setCheckboxes(values) {
+        for (const { id, field, enables } of CheckboxSettings) {
+            if (values[field] === undefined) continue;
+            const checked = !!values[field];
+            document.getElementById(id).checked = checked;
+            this[field] = checked;
+            if (enables) document.getElementById(enables).disabled = !checked;
+        }
     }
 
-    setSpeechOutput(enabled) {
-        document.getElementById("speechOutput").checked = !!enabled;
+    setMicrophoneChannel(channel) {
+        const text = channel !== undefined ? `Channel ${channel}` : "Disabled";
+        for (const el of document.querySelectorAll(".mic-channel-text")) el.textContent = text;
     }
 
     setDisplayMode(mode) {
@@ -133,57 +190,19 @@ export class Config extends EventTarget {
         for (const el of document.querySelectorAll(".keyboard-layout")) el.textContent = text;
     }
 
-    set65c02(enabled) {
-        enabled = !!enabled;
-        document.getElementById("65c02").checked = enabled;
-        this.model.tube = enabled ? findModel("Tube65c02") : null;
-        document.getElementById("tubeCpuMultiplier").disabled = !enabled;
-    }
-
     setTubeCpuMultiplier(value) {
         this.tubeCpuMultiplier = value;
         document.getElementById("tubeCpuMultiplier").value = value;
         document.getElementById("tubeCpuMultiplierValue").textContent = value;
     }
 
-    setEconet(enabled) {
-        enabled = !!enabled;
-        document.getElementById("hasEconet").checked = enabled;
-        this.model.hasEconet = enabled;
-
-        if (enabled && this.model.isMaster) {
-            this.addRemoveROM("master/anfs-4.25.rom", true);
-        }
-    }
-
-    setMusic5000(enabled) {
-        enabled = !!enabled;
-        document.getElementById("hasMusic5000").checked = enabled;
-        this.model.hasMusic5000 = enabled;
-        this.addRemoveROM("ample.rom", enabled);
-    }
-
-    setTeletext(enabled) {
-        enabled = !!enabled;
-        document.getElementById("hasTeletextAdaptor").checked = enabled;
-        this.model.hasTeletextAdaptor = enabled;
-        this.addRemoveROM("ats-3.0.rom", enabled);
-    }
-
     setDropdownText(modelName) {
         const el = document.querySelector("#bbc-model-dropdown .bbc-model");
         if (el) el.textContent = modelName;
     }
 
-    addRemoveROM(romName, required) {
-        if (required && !this.model.os.includes(romName)) {
-            this.model.os.push(romName);
-        } else {
-            let pos = this.model.os.indexOf(romName);
-            if (pos !== -1) {
-                this.model.os.splice(pos, 1);
-            }
-        }
+    get extraRoms() {
+        return fittedRoms(this);
     }
 
     mapLegacyModels(parsedQuery) {

package/src/fake6502.js

@@ -3,7 +3,7 @@
 
 import { FakeVideo } from "./video.js";
 import { FakeSoundChip } from "./soundchip.js";
-import { findModel, TEST_6502, TEST_65C02, TEST_65C12 } from "./models.js";
+import { TEST_6502, TEST_65C02, TEST_65C12, TubeModel } from "./models.js";
 import { FakeDdNoise } from "./ddnoise.js";
 import { FakeRelayNoise } from "./relaynoise.js";
 import { Cpu6502, AtomCpu6502 } from "./6502.js";
@@ -19,7 +19,6 @@ const dbgr = {
 export function fake6502(model, opts) {
     opts = opts || {};
     model = model || TEST_6502;
-    if (opts.tube) model.tube = findModel("Tube65c02");
     const CpuClass = model.isAtom ? AtomCpu6502 : Cpu6502;
     return new CpuClass(model, {
         dbgr,
@@ -30,6 +29,12 @@ export function fake6502(model, opts) {
         music5000: new FakeMusic5000(),
         cmos: new Cmos(),
         cycleAccurate: opts.cycleAccurate,
+        config: {
+            tube: opts.tube ? TubeModel : null,
+            tubeCpuMultiplier: opts.tubeCpuMultiplier,
+            cpuMultiplier: opts.cpuMultiplier,
+            hasTeletextAdaptor: opts.hasTeletextAdaptor,
+        },
     });
 }
 

package/src/keyboard.js

@@ -341,8 +341,9 @@ export class Keyboard extends EventTarget {
         if (this.isPasting) this.cancelPaste();
 
         this.keyInterface.disableKeyboard();
-        this._pasteClocksPerMs =
-            Math.floor(this.processor.cpuMultiplier * this.processor.peripheralCyclesPerSecond) / 1000;
+        // The paste task lives on the processor's scheduler, which is polled with peripheral
+        // cycles, so paste delays stay in real time whatever the CPU multiplier is.
+        this._pasteClocksPerMs = this.processor.peripheralCyclesPerSecond / 1000;
 
         if (checkCapsAndShiftLocks) {
             let toggleKey = null;

package/src/machine-session.js

@@ -30,6 +30,9 @@ export class MachineSession {
      * @param {string} modelName - e.g. "B-DFS1.2", "Master"
      * @param {Object} [opts]
      * @param {string} [opts.discImage] - path to an .ssd or .dsd disc image to load on boot
+     * @param {boolean} [opts.tube] - attach a 65C02 second processor (Tube co-processor)
+     * @param {number} [opts.cpuMultiplier] - run the CPU this many times faster than the peripherals
+     * @param {boolean} [opts.hasTeletextAdaptor] - fit the Acorn teletext adaptor
      */
     constructor(modelName = "B-DFS1.2", opts = {}) {
         this.modelName = modelName;
@@ -65,8 +68,14 @@ export class MachineSession {
         // toneGenerator); FakeSoundChip provides compatible no-op stubs for headless mode.
         this._soundChip = modelObj.isAtom ? new FakeSoundChip() : new InstrumentedSoundChip();
 
-        // TestMachine forwards opts.video and opts.soundChip to fake6502
-        this._machine = new TestMachine(modelName, { video: this._video, soundChip: this._soundChip });
+        // TestMachine forwards these to fake6502
+        this._machine = new TestMachine(modelName, {
+            video: this._video,
+            soundChip: this._soundChip,
+            tube: opts.tube,
+            cpuMultiplier: opts.cpuMultiplier,
+            hasTeletextAdaptor: opts.hasTeletextAdaptor,
+        });
 
         // Accumulated VDU text output — drained by callers
         this._pendingOutput = [];

package/src/main.js

@@ -7,7 +7,7 @@ import "./jsbeeb.css";
 import * as utils from "./utils.js";
 import { FakeVideo, Video } from "./video.js";
 import { Debugger } from "./web/debug.js";
-import { Cpu6502, AtomCpu6502 } from "./6502.js";
+import { Cpu6502, AtomCpu6502, DefaultTubeCpuMultiplier } from "./6502.js";
 import * as utils_atom from "./utils_atom.js";
 import { LoadSD } from "./mmc.js";
 import { Cmos } from "./cmos.js";
@@ -19,6 +19,7 @@ import { GoogleDriveLoader } from "./google-drive.js";
 import * as tokeniser from "./basic-tokenise.js";
 import * as canvasLib from "./canvas.js";
 import { Config } from "./config.js";
+import { TubeModel } from "./models.js";
 import { initialise as electron } from "./app/electron.js";
 import { AudioHandler } from "./web/audio-handler.js";
 import { Econet } from "./econet.js";
@@ -29,8 +30,16 @@ import { GamepadSource } from "./gamepad-source.js";
 import { MicrophoneInput } from "./microphone-input.js";
 import { SpeechOutput } from "./speech-output.js";
 import { MouseJoystickSource } from "./mouse-joystick-source.js";
+import { calculateMouseCoordinates } from "./mouse-coordinates.js";
 import { getFilterForMode } from "./canvas.js";
-import { createSnapshot, restoreSnapshot, snapshotToJSON, snapshotFromJSON, isSameModel } from "./snapshot.js";
+import {
+    createSnapshot,
+    restoreSnapshot,
+    snapshotToJSON,
+    snapshotFromJSON,
+    isSameModel,
+    hasCoProcessor,
+} from "./snapshot.js";
 import { isBemSnapshot, parseBemSnapshot } from "./bem-snapshot.js";
 import { isUefSnapshot, parseUefSnapshot } from "./uef-snapshot.js";
 import { RewindBuffer } from "./rewind.js";
@@ -151,7 +160,7 @@ let keyLayout = window.localStorage.keyLayout || "physical";
 
 const BBC = utils.BBC;
 const keyCodes = utils.keyCodes;
-let cpuMultiplier = 1;
+const cpuMultiplier = parsedQuery.cpuMultiplier ?? 1;
 let fastAsPossible = false;
 let fastTape = false;
 let noSeek;
@@ -217,27 +226,8 @@ const userPort = {
     },
 };
 
-const emulationConfig = {
-    keyLayout: keyLayout,
-    coProcessor: parsedQuery.coProcessor,
-    cpuMultiplier: cpuMultiplier,
-    tubeCpuMultiplier: parsedQuery.tubeCpuMultiplier || 2,
-    videoCyclesBatch: parsedQuery.videoCyclesBatch,
-    extraRoms: extraRoms,
-    userPort: userPort,
-    printerPort: printerPort,
-    getGamepads: function () {
-        // Gamepads are only available in secure contexts. If e.g. loading from http:// urls they aren't there.
-        return navigator.getGamepads ? navigator.getGamepads() : [];
-    },
-    debugFlags: {
-        logFdcCommands: parsedQuery.logFdcCommands !== undefined,
-        logFdcStateChanges: parsedQuery.logFdcStateChanges !== undefined,
-    },
-};
-
 // Speech output: initialised from URL param; can be toggled at runtime via the Settings panel.
-// Must be created before Config so the onClose callback and setSpeechOutput() call can reference it.
+// Must be created before Config so the onClose callback and the initial checkbox state can reference it.
 const speechOutput = new SpeechOutput();
 speechOutput.enabled = !!parsedQuery.speechOutput;
 
@@ -253,23 +243,6 @@ const config = new Config(
     },
     function onClose(changed) {
         parsedQuery = Object.assign(parsedQuery, changed);
-        if (
-            changed.model ||
-            changed.coProcessor !== undefined ||
-            changed.hasMusic5000 !== undefined ||
-            changed.hasTeletextAdaptor !== undefined ||
-            changed.hasEconet !== undefined
-        ) {
-            areYouSure(
-                "Changing model requires a restart of the emulator. Restart now?",
-                "Yes, restart now",
-                "No, thanks",
-                function () {
-                    updateUrl();
-                    window.location.reload();
-                },
-            );
-        }
         if (changed.keyLayout) {
             window.localStorage.keyLayout = changed.keyLayout;
             emulationConfig.keyLayout = changed.keyLayout;
@@ -288,12 +261,22 @@ const config = new Config(
         if (changed.tubeCpuMultiplier !== undefined) {
             emulationConfig.tubeCpuMultiplier = changed.tubeCpuMultiplier;
             config.setTubeCpuMultiplier(changed.tubeCpuMultiplier);
-            if (processor.tube && processor.tube.cpuMultiplier !== undefined) {
+            if (processor.hasTube) {
                 processor.tube.cpuMultiplier = changed.tubeCpuMultiplier;
             }
         }
         updateUrl();
     },
+    function onRestartRequired() {
+        areYouSure(
+            "Your change is saved, but only takes effect when the emulator restarts. Restart now?",
+            "Restart now",
+            "Later",
+            function () {
+                window.location.reload();
+            },
+        );
+    },
 );
 
 // Perform mapping of legacy models to the new format
@@ -301,19 +284,45 @@ config.mapLegacyModels(parsedQuery);
 
 config.setModel(parsedQuery.model || guessModelFromHostname(window.location.hostname));
 config.setKeyLayout(keyLayout);
-config.set65c02(parsedQuery.coProcessor);
-config.setTubeCpuMultiplier(parsedQuery.tubeCpuMultiplier || 2);
-config.setEconet(parsedQuery.hasEconet);
-config.setMusic5000(parsedQuery.hasMusic5000);
-config.setTeletext(parsedQuery.hasTeletextAdaptor);
+config.setTubeCpuMultiplier(parsedQuery.tubeCpuMultiplier || DefaultTubeCpuMultiplier);
 config.setMicrophoneChannel(parsedQuery.microphoneChannel);
-config.setMouseJoystickEnabled(parsedQuery.mouseJoystickEnabled);
-config.setSpeechOutput(speechOutput.enabled);
+config.setCheckboxes({
+    coProcessor: !!parsedQuery.coProcessor,
+    hasEconet: !!parsedQuery.hasEconet,
+    hasMusic5000: !!parsedQuery.hasMusic5000,
+    hasTeletextAdaptor: !!parsedQuery.hasTeletextAdaptor,
+    mouseJoystickEnabled: !!parsedQuery.mouseJoystickEnabled,
+    speechOutput: speechOutput.enabled,
+});
 let displayMode = parsedQuery.displayMode || "rgb";
 config.setDisplayMode(displayMode);
 
 model = config.model;
 
+// Depends on the config.setX calls above having applied the URL parameters.
+const emulationConfig = {
+    keyLayout,
+    cpuMultiplier,
+    tubeCpuMultiplier: config.tubeCpuMultiplier,
+    videoCyclesBatch: parsedQuery.videoCyclesBatch,
+    tube: config.coProcessor ? TubeModel : null,
+    hasMusic5000: config.hasMusic5000,
+    hasTeletextAdaptor: config.hasTeletextAdaptor,
+    // ROM order determines sideways bank allocation, and the fittings' ROMs claim banks
+    // before any the user asked for with ?rom=.
+    extraRoms: [...config.extraRoms, ...extraRoms],
+    userPort,
+    printerPort,
+    getGamepads: function () {
+        // Gamepads are only available in secure contexts. If e.g. loading from http:// urls they aren't there.
+        return navigator.getGamepads ? navigator.getGamepads() : [];
+    },
+    debugFlags: {
+        logFdcCommands: parsedQuery.logFdcCommands !== undefined,
+        logFdcStateChanges: parsedQuery.logFdcStateChanges !== undefined,
+    },
+};
+
 function sbBind(div, url, onload) {
     const img = div.querySelector("img");
     img.style.display = "none";
@@ -335,10 +344,7 @@ sbBind(document.querySelector(".sidebar.bottom"), parsedQuery.sbBottom, function
     div.style.bottom = -img.naturalHeight + "px";
 });
 
-if (parsedQuery.cpuMultiplier !== undefined) {
-    cpuMultiplier = parsedQuery.cpuMultiplier;
-    console.log("CPU multiplier set to " + cpuMultiplier);
-}
+if (cpuMultiplier !== 1) console.log(`CPU multiplier set to ${cpuMultiplier}`);
 const cpuSpeed = model.isAtom ? 1 * 1000 * 1000 : 2 * 1000 * 1000;
 const clocksPerSecond = (cpuMultiplier * cpuSpeed) | 0;
 const MaxCyclesPerFrame = clocksPerSecond / 10;
@@ -536,10 +542,8 @@ const cubMonitor = document.getElementById("cub-monitor");
 function onCubMouseEvent(evt) {
     audioHandler.tryResume();
     if (document.activeElement !== document.body) document.activeElement.blur();
-    const cubRect = cubMonitor.getBoundingClientRect();
     const screenRect = screenCanvas.getBoundingClientRect();
-    const x = (evt.offsetX - cubRect.left + screenRect.left) / screenCanvas.offsetWidth;
-    const y = (evt.offsetY - cubRect.top + screenRect.top) / screenCanvas.offsetHeight;
+    const { x, y } = calculateMouseCoordinates(evt, screenRect);
 
     // Handle touchscreen
     if (processor.touchScreen) processor.touchScreen.onMouse(x, y, evt.buttons);
@@ -613,7 +617,7 @@ window.addEventListener("beforeunload", function (event) {
     }
 });
 
-if (model.hasEconet) {
+if (config.hasEconet) {
     econet = new Econet(stationId);
 } else {
     document.getElementById("fsmenuitem").style.display = "none";
@@ -657,7 +661,7 @@ processor = new CpuClass(model, {
     soundChip: audioHandler.soundChip,
     ddNoise: audioHandler.ddNoise,
     relayNoise: audioHandler.relayNoise,
-    music5000: model.hasMusic5000 ? audioHandler.music5000 : null,
+    music5000: config.hasMusic5000 ? audioHandler.music5000 : null,
     cmos,
     config: emulationConfig,
     econet,
@@ -1570,10 +1574,10 @@ async function loadStateFromFile(file, preReadBuffer) {
             }
             snapshot = snapshotFromJSON(text);
         }
-        if (!isSameModel(snapshot.model, model.name)) {
-            // Model mismatch: stash state and reload with correct model
+        if (!isSameModel(snapshot.model, model.name) || hasCoProcessor(snapshot) !== processor.hasTube) {
+            // Model or co-processor mismatch: stash state and reload with a matching machine
             sessionStorage.setItem("jsbeeb-pending-state", snapshotToJSON(snapshot));
-            const newQuery = { ...parsedQuery, model: snapshot.model };
+            const newQuery = { ...parsedQuery, model: snapshot.model, coProcessor: hasCoProcessor(snapshot) };
             const baseUrl = window.location.origin + window.location.pathname;
             window.location.href = buildUrlFromParams(baseUrl, newQuery, paramTypes);
             return;
@@ -1691,7 +1695,7 @@ syncLights = function () {
         drive0.update(processor.fdc.motorOn[0]);
         drive1.update(processor.fdc.motorOn[1]);
         cassette.update(processor.acia.motorOn);
-        if (model.hasEconet) {
+        if (processor.econet) {
             network.update(processor.econet.activityLight());
         }
     }
@@ -1849,14 +1853,22 @@ const aysEl = document.getElementById("are-you-sure");
 const aysModal = new bootstrap.Modal(aysEl);
 
 function areYouSure(message, yesText, noText, yesFunc) {
+    const yesButton = aysEl.querySelector(".ays-yes");
     aysEl.querySelector(".context").textContent = message;
-    aysEl.querySelector(".ays-yes").textContent = yesText;
     aysEl.querySelector(".ays-no").textContent = noText;
-    aysEl.querySelector(".ays-yes").addEventListener(
-        "click",
-        function () {
-            aysModal.hide();
-            yesFunc();
+    yesButton.textContent = yesText;
+    let confirmed = false;
+    const onYes = () => {
+        confirmed = true;
+        aysModal.hide();
+    };
+    yesButton.addEventListener("click", onYes, { once: true });
+    // The "no" button, Escape and a click outside raise no event of their own: they only hide the modal.
+    aysEl.addEventListener(
+        "hidden.bs.modal",
+        () => {
+            yesButton.removeEventListener("click", onYes);
+            if (confirmed) yesFunc();
         },
         { once: true },
     );

package/src/models.js

@@ -10,8 +10,16 @@ const CpuModel = Object.freeze({
     CMOS65C12: 2,
 });
 
+/**
+ * Describes what a machine *is*: which CPU, which ROMs, which disc controller.
+ * Anything a user can turn on and off for a session (second processor, Econet,
+ * Music 5000, teletext adaptor) belongs in the emulation config passed to Cpu6502.
+ *
+ * Instances are shared process-wide via `allModels` and frozen, so they can be handed
+ * to any number of machines without one session's settings leaking into the next.
+ */
 class Model {
-    constructor({ name, synonyms, os, cpuModel, isMaster, isAtom, swram, fdc, tube, cmosOverride, banks } = {}) {
+    constructor({ name, synonyms, os, cpuModel, isMaster, isAtom, swram, fdc, cmosOverride, banks } = {}) {
         this.name = name;
         this.synonyms = synonyms;
         this.os = os;
@@ -22,10 +30,7 @@ class Model {
         this.Fdc = fdc;
         this.swram = swram;
         this.isTest = false;
-        this.tube = tube;
         this.cmosOverride = cmosOverride;
-        this.hasEconet = false;
-        this.hasMusic5000 = false;
     }
 
     get nmos() {
@@ -267,3 +272,18 @@ export const basicOnly = new Model({
     swram: masterSwram,
     fdc: NoiseAwareWdFdc,
 });
+
+/**
+ * The only second processor jsbeeb emulates. Machine-building code passes this as the
+ * emulation config's `tube`, so that 6502.js needn't import this module and close an
+ * import cycle via the FDC modules.
+ */
+export const TubeModel = findModel("Tube65C02");
+
+// After the isTest assignments above, so those still apply.
+for (const model of [...allModels, TEST_6502, TEST_65C02, TEST_65C12, basicOnly]) {
+    Object.freeze(model.os);
+    Object.freeze(model.synonyms);
+    Object.freeze(model);
+}
+Object.freeze(allModels);

package/src/mouse-coordinates.js

@@ -0,0 +1,16 @@
+/**
+ * Calculate normalized mouse coordinates relative to the screen canvas.
+ *
+ * Uses clientX/clientY against the canvas bounding rect so that coordinates
+ * are correct even when the canvas is inset within a monitor image (e.g.
+ * display filters with non-zero canvasLeft/canvasTop).
+ *
+ * @param {MouseEvent} evt - The mouse event
+ * @param {DOMRect} screenRect - Bounding client rect of the screen canvas
+ * @returns {{x: number, y: number}} Normalized coordinates in [0, 1]
+ */
+export function calculateMouseCoordinates(evt, screenRect) {
+    const x = (evt.clientX - screenRect.left) / screenRect.width;
+    const y = (evt.clientY - screenRect.top) / screenRect.height;
+    return { x, y };
+}