bbeef6d20e
All four editors (PCB / Footprint / Schematic / Symbol) are now runtime --frame
choices of a single kicad_editor.wasm (178 MB at -O1 vs 147+82 separate; shared
wx/common/boost linked once). One editor per page load, as before; frames pcb /
fpedit / sch / symedit.
- wasm/editor/: the merged executable target (single_top + both kiface library sets,
whole-archive pcbcommon) + the safety-net focus-walk Kiface() dispatch TU. Gated by
KICAD_WASM_MERGED_EDITOR (kicad submodule bump carries the fork side: per-engine
Kiface/getter binding + ODR renames + dual-kiface launcher).
- wasm/bindings/: per-editor collab entries renamed pcbCollab*/schCollab* (JS names
unchanged); duplicate kicadOpenFile/kicadCollabOnSave + shared-name registrations
guarded behind KICAD_MERGED_EMBIND; new kicad_editor_embind.cpp registers each
shared JS name once, dispatching on the live frame.
- Build: kicad_editor app (build wrapper, target case arms, 3-object embind compile
with the ABI-critical flags, STUB_APP=pcbnew); docker/build.sh "all" =
kicad_editor calculator pl_editor gerbview (pcbnew/eeschema stay as explicit debug
apps); scripts/kicad/audit-merged-symbols.sh = repeatable ODR-collision audit (run
on kicad bumps).
- Frontend: Bundle type (bundle ≠ tool); TOOL_BUNDLE maps all four editors to
kicad_editor; explicit --frame tokens for pcbnew (pcb) and eeschema (sch); publish
list = the 4 real bundles.
- Tests/CI: five harnesses load kicad_editor.js with explicit frame tokens;
PCBNEW_FAMILY_SPECS renamed BIG_MODULE_SPECS + the 8 eeschema-family specs (they
now boot the merged module — SpiderMonkey x86 CI OOM routing); frame-runtime spec
covers all four frames from the one bundle.
Validated so far: frame-runtime 4/4 (each frame boots with the right title, no
aborts, no duplicate embind registration); 24-spec merged-module regression green;
3D raytracer renders. Known pre-existing failure: 3d-viewer title-bar drag deadlock,
fixed on main by 7630c7e (2N+8 pthread pre-warm) — picked up by the follow-up rebase.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
220 lines
8 KiB
HTML
220 lines
8 KiB
HTML
<!DOCTYPE html>
|
|
<html lang="en-us">
|
|
<head>
|
|
<meta charset="utf-8">
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
|
<title>KiCad Eeschema WASM</title>
|
|
<style>
|
|
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
|
div.emscripten { text-align: center; }
|
|
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
|
canvas.emscripten { border: 0px none; }
|
|
|
|
#status {
|
|
position: fixed;
|
|
bottom: 10px;
|
|
left: 10px;
|
|
color: #fff;
|
|
font-family: monospace;
|
|
z-index: 1000;
|
|
background: rgba(0,0,0,0.7);
|
|
padding: 10px;
|
|
border-radius: 5px;
|
|
}
|
|
|
|
#progress {
|
|
width: 300px;
|
|
height: 20px;
|
|
background: #333;
|
|
margin-top: 5px;
|
|
}
|
|
|
|
#progress-bar {
|
|
height: 100%;
|
|
background: #4CAF50;
|
|
width: 0%;
|
|
transition: width 0.3s;
|
|
}
|
|
</style>
|
|
</head>
|
|
<body style="margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a2e;">
|
|
<div id="main-window" style="width: 100vw; height: 100vh; position: absolute; top: 0; left: 0;"></div>
|
|
|
|
<div id="status">
|
|
<div id="status-text">Initializing...</div>
|
|
<div id="progress"><div id="progress-bar"></div></div>
|
|
</div>
|
|
|
|
<div id="window-container"></div>
|
|
|
|
<script>
|
|
var mainWindow = document.getElementById('main-window');
|
|
var statusText = document.getElementById('status-text');
|
|
var progressBar = document.getElementById('progress-bar');
|
|
|
|
var showError = function(msg) {
|
|
console.error('[KICAD_ERROR] ' + msg);
|
|
statusText.textContent = 'Error: ' + msg;
|
|
statusText.style.color = 'red';
|
|
};
|
|
|
|
var createCanvas = function() {
|
|
var canvas = document.createElement('canvas');
|
|
canvas.id = 'canvas';
|
|
canvas.style.display = 'none';
|
|
// wx.js owns the backing-store size via setWindowRect(); keep the HTML
|
|
// shell responsible only for the CSS size.
|
|
var width = window.innerWidth;
|
|
var height = window.innerHeight;
|
|
canvas.style.width = width + 'px';
|
|
canvas.style.height = height + 'px';
|
|
canvas.oncontextmenu = function() { event.preventDefault(); };
|
|
canvas.addEventListener("webglcontextlost", function(e) {
|
|
showError('WebGL context lost. You will need to reload the page.');
|
|
e.preventDefault();
|
|
}, false);
|
|
|
|
mainWindow.appendChild(canvas);
|
|
Module.canvas = canvas;
|
|
|
|
console.log('[KICAD] preRun complete, canvas created: ' + width + 'x' + height);
|
|
};
|
|
|
|
var onRuntimeInitialized = function() {
|
|
console.log('[KICAD] Runtime initialized');
|
|
var canvas = Module.canvas;
|
|
canvas.style.display = 'block';
|
|
document.getElementById('status').style.display = 'none';
|
|
};
|
|
|
|
// Pre-fetched resource data (fetched before eeschema.js loads)
|
|
var resourceData = null;
|
|
|
|
// Start fetching images.tar.gz immediately (runs in parallel with WASM loading)
|
|
fetch('images.tar.gz')
|
|
.then(function(response) {
|
|
if (!response.ok) throw new Error('HTTP ' + response.status);
|
|
return response.arrayBuffer();
|
|
})
|
|
.then(function(buffer) {
|
|
resourceData = new Uint8Array(buffer);
|
|
console.log('[KICAD] Prefetched images.tar.gz (' + resourceData.length + ' bytes)');
|
|
})
|
|
.catch(function(err) {
|
|
console.warn('[KICAD] Could not prefetch images.tar.gz:', err.message);
|
|
});
|
|
|
|
// Write pre-fetched resources to FS (called in preRun after FS is available)
|
|
var writeResources = function() {
|
|
// Create directory structure matching KiCad's compiled-in KICAD_DATA path
|
|
// This path is baked in during CMake configuration
|
|
var resourcePath = '/workspace/build-wasm/sysroot/share/kicad/resources';
|
|
FS.mkdirTree(resourcePath);
|
|
|
|
// Write pre-fetched data if available
|
|
if (resourceData) {
|
|
FS.writeFile(resourcePath + '/images.tar.gz', resourceData);
|
|
console.log('[KICAD] Wrote images.tar.gz to ' + resourcePath);
|
|
} else {
|
|
console.warn('[KICAD] images.tar.gz not ready yet (WASM loaded faster than fetch)');
|
|
}
|
|
};
|
|
|
|
// KiCad's standalone entry (single_top.cpp) runs STARTWIZARD on launch: a
|
|
// modal first-run "Setup" wizard shown whenever the settings dir lacks a
|
|
// kicad_common.json or valid global library tables. In this ephemeral MEMFS
|
|
// that is EVERY load, and the wizard's modal event loop crashes Asyncify
|
|
// (func is not a function). Seed a minimal default config before main() so
|
|
// all three providers report NeedsUserInput()==false — equivalent to the
|
|
// wizard's "use defaults" path — and it never opens. Settings dir matches
|
|
// PATHS::GetUserSettingsPath() for this build.
|
|
var seedKicadConfig = function() {
|
|
var cfgDir = '/home/kicad/.config/kicad/kicad/9.99';
|
|
FS.mkdirTree(cfgDir);
|
|
|
|
var writeIfAbsent = function(path, contents) {
|
|
try { FS.stat(path); return; } catch (e) { /* absent — seed it */ }
|
|
FS.writeFile(path, contents);
|
|
console.log('[KICAD] Seeded ' + path);
|
|
};
|
|
|
|
// SETTINGS provider: settings dir is "valid" once kicad_common.json exists.
|
|
// PRIVACY provider: both prompts must be flagged do-not-show-again.
|
|
writeIfAbsent(cfgDir + '/kicad_common.json', JSON.stringify({
|
|
do_not_show_again: { update_check_prompt: true, data_collection_prompt: true }
|
|
}, null, 2));
|
|
|
|
// LIBRARIES provider: needs valid global symbol/footprint/design-block
|
|
// tables. Empty (zero-row) tables parse fine and satisfy GlobalTablesValid().
|
|
writeIfAbsent(cfgDir + '/sym-lib-table', '(sym_lib_table\n (version 7)\n)\n');
|
|
writeIfAbsent(cfgDir + '/fp-lib-table', '(fp_lib_table\n (version 7)\n)\n');
|
|
writeIfAbsent(cfgDir + '/design-block-lib-table', '(design_block_lib_table\n (version 7)\n)\n');
|
|
};
|
|
|
|
var Module = {
|
|
thisProgram: '/usr/bin/eeschema', // Fake absolute path for argv[0] (KiCad DEBUG check)
|
|
|
|
// The schematic editor is served by the merged kicad_editor bundle (editor-
|
|
// unification Part 2): load kicad_editor.js below and select FRAME_SCH at
|
|
// runtime.
|
|
arguments: ['--frame=sch'],
|
|
|
|
preRun: [createCanvas, writeResources, seedKicadConfig],
|
|
postRun: [],
|
|
|
|
print: function(text) {
|
|
if (arguments.length > 1)
|
|
text = Array.prototype.slice.call(arguments).join(' ');
|
|
console.log('[KICAD_OUT] ' + text);
|
|
},
|
|
|
|
printErr: function(text) {
|
|
if (arguments.length > 1)
|
|
text = Array.prototype.slice.call(arguments).join(' ');
|
|
console.error('[KICAD_ERR] ' + text);
|
|
},
|
|
|
|
setStatus: function(text) {
|
|
console.log('[KICAD_STATUS] ' + text);
|
|
statusText.textContent = text;
|
|
|
|
// Parse progress from status text
|
|
var match = text.match(/(\d+)\/(\d+)/);
|
|
if (match) {
|
|
var pct = (parseInt(match[1]) / parseInt(match[2])) * 100;
|
|
progressBar.style.width = pct + '%';
|
|
}
|
|
},
|
|
|
|
totalDependencies: 0,
|
|
monitorRunDependencies: function(left) {
|
|
this.totalDependencies = Math.max(this.totalDependencies, left);
|
|
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
|
},
|
|
|
|
onRuntimeInitialized: onRuntimeInitialized,
|
|
|
|
// Required for locating .wasm and .worker.js files
|
|
locateFile: function(path) {
|
|
return path;
|
|
}
|
|
};
|
|
|
|
Module.setStatus('Downloading...');
|
|
|
|
window.onerror = function(msg, url, line) {
|
|
showError(msg + ' at ' + url + ':' + line);
|
|
Module.setStatus = function(text) {
|
|
if (text) Module.printErr('[post-exception status] ' + text);
|
|
};
|
|
return false;
|
|
};
|
|
</script>
|
|
|
|
<!-- wxWidgets WASM glue code (defines getConfigEntryLength, etc.) -->
|
|
<script src="wx.js"></script>
|
|
<script src="wx-dom.js"></script>
|
|
<!-- Schematic editor = merged kicad_editor bundle + --frame=sch (editor-unification Part 2). -->
|
|
<script async src="kicad_editor.js"></script>
|
|
</body>
|
|
</html>
|