diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..290dbd2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,349 @@ +-------------------------------------------------------------------------- + + Basilisk II + A 68k Macintosh emulator + + Copyright (C) 1997-2008 Christian Bauer et al. + +-------------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. \ No newline at end of file diff --git a/package.json b/package.json index f29ce70..69babab 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,14 @@ "productName": "macintosh", "version": "1.0.0", "description": "Macintosh's System 7 in an Electron app. I'm sorry.", - "main": "src/index.js", + "main": "src/main/index.js", "scripts": { "start": "electron-forge start", "package": "electron-forge package", "make": "electron-forge make", "publish": "electron-forge publish", - "lint": "echo \"No linting configured\"" + "lint": "npx prettier --check src/{main,renderer}/*.js", + "fix": "npx prettier --write src/{main,renderer}/*.js" }, "keywords": [], "author": { @@ -53,6 +54,6 @@ "@electron-forge/maker-rpm": "6.0.0-beta.52", "@electron-forge/maker-squirrel": "6.0.0-beta.52", "@electron-forge/maker-zip": "6.0.0-beta.52", - "electron": "9.1.0" + "electron": "10.0.0-beta.12" } } diff --git a/src/basilisk/BasiliskII-worker-boot.js b/src/basilisk/BasiliskII-worker-boot.js index 81c387a..ba172d7 100644 --- a/src/basilisk/BasiliskII-worker-boot.js +++ b/src/basilisk/BasiliskII-worker-boot.js @@ -1,5 +1,8 @@ -var memAllocSet = new Set(); -var memAllocSetPersistent = new Set(); +const fs = require('fs'); +const path = require('path'); + +const memAllocSet = new Set(); +const memAllocSetPersistent = new Set(); function memAllocAdd(addr) { if (memAllocSet.has(addr)) { @@ -88,8 +91,26 @@ var LockStates = { var Module = null; self.onmessage = function(msg) { - console.log('init worker'); - startEmulator(Object.assign({}, msg.data, {singleThreadedEmscripten: true})); + console.log('Worker message received', msg.data); + + // If it's a config object, start the show + if (msg && msg.data && msg.data.SCREEN_WIDTH) { + console.log('Start emulator worker'); + startEmulator(Object.assign({}, msg.data, {singleThreadedEmscripten: true})); + } + + if (msg && msg.data === 'save') { + const diskData = Module.FS.readFile('/disk'); + const diskPath = path.join(__dirname, 'disk'); + + fs.writeFile(diskPath, diskData, (error) => { + console.log(`Finished writing disk`); + + if (error) { + console.error(error); + } + }); + } }; function startEmulator(parentConfig) { @@ -196,7 +217,7 @@ function startEmulator(parentConfig) { var AudioBufferQueue = []; Module = { - autoloadFiles: ['system7.img', 'DCImage.img', 'disk1.img', 'Quadra-650.rom', 'prefs'], + autoloadFiles: ['disk', 'rom', 'prefs'], arguments: ['--config', 'prefs'], canvas: null, @@ -294,7 +315,12 @@ function startEmulator(parentConfig) { } }, - print: console.log.bind(console), + print: (message) => { + postMessage({ + type: 'TTY', + data: message + }); + }, printErr: console.warn.bind(console), diff --git a/src/basilisk/BasiliskII.js b/src/basilisk/BasiliskII.js index 5b9653b..d69fb7b 100644 --- a/src/basilisk/BasiliskII.js +++ b/src/basilisk/BasiliskII.js @@ -59,7 +59,6 @@ if (Module['ENVIRONMENT']) { ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER; } - if (ENVIRONMENT_IS_NODE) { // Expose functionality in the same simple way that the shells work // Note that we pollute the global namespace here, otherwise we break in node @@ -3963,7 +3962,7 @@ function copyTempDouble(ptr) { },createDefaultDirectories:function () { FS.mkdir('/tmp'); FS.mkdir('/home'); - FS.mkdir('/home/web_user'); + FS.mkdir('/home/electron'); },createDefaultDevices:function () { // create /dev FS.mkdir('/dev'); @@ -4093,6 +4092,15 @@ function copyTempDouble(ptr) { FS.createDefaultDevices(); FS.createSpecialDirectories(); + // Begin surgery + //if (ENVIRONMENT_IS_NODE) { var fs = require("fs"); var NODEJS_PATH = require("path"); NODEFS.staticInit(); }; + //FS.mount(NODEFS, { root: '.' }, '/home/electron'); + // onmessage(() => { + // console.log('Message received from main script'); + // }); + + // End surgery + FS.filesystems = { 'MEMFS': MEMFS, 'IDBFS': IDBFS, @@ -9033,9 +9041,8 @@ function copyTempDouble(ptr) { } var ___dso_handle=STATICTOP; STATICTOP += 16;; -FS.staticInit();__ATINIT__.unshift(function() { if (!Module["noFSInit"] && !FS.init.initialized) FS.init() });__ATMAIN__.push(function() { FS.ignorePermissions = false });__ATEXIT__.push(function() { FS.quit() });Module["FS_createFolder"] = FS.createFolder;Module["FS_createPath"] = FS.createPath;Module["FS_createDataFile"] = FS.createDataFile;Module["FS_createPreloadedFile"] = FS.createPreloadedFile;Module["FS_createLazyFile"] = FS.createLazyFile;Module["FS_createLink"] = FS.createLink;Module["FS_createDevice"] = FS.createDevice;Module["FS_unlink"] = FS.unlink;; +FS.staticInit();__ATINIT__.unshift(function() { if (!Module["noFSInit"] && !FS.init.initialized) FS.init() });__ATMAIN__.push(function() { FS.ignorePermissions = false });__ATEXIT__.push(function() { FS.quit() });Module["FS"]=FS;Module["FS_createFolder"] = FS.createFolder;Module["FS_createPath"] = FS.createPath;Module["FS_createDataFile"] = FS.createDataFile;Module["FS_createPreloadedFile"] = FS.createPreloadedFile;Module["FS_stat"] = FS.stat;Module["FS_createLazyFile"] = FS.createLazyFile;Module["FS_createLink"] = FS.createLink;Module["FS_createDevice"] = FS.createDevice;Module["FS_unlink"] = FS.unlink;; __ATINIT__.unshift(function() { TTY.init() });__ATEXIT__.push(function() { TTY.shutdown() });; -if (ENVIRONMENT_IS_NODE) { var fs = require("fs"); var NODEJS_PATH = require("path"); NODEFS.staticInit(); }; var GLctx; GL.init(); Module["requestFullScreen"] = function Module_requestFullScreen(lockPointer, resizeCanvas, vrDevice) { Module.printErr("Module.requestFullScreen is deprecated. Please call Module.requestFullscreen instead."); Module["requestFullScreen"] = Module["requestFullscreen"]; Browser.requestFullScreen(lockPointer, resizeCanvas, vrDevice) }; Module["requestFullscreen"] = function Module_requestFullscreen(lockPointer, resizeCanvas, vrDevice) { Browser.requestFullscreen(lockPointer, resizeCanvas, vrDevice) }; @@ -103992,9 +103999,10 @@ if (Module['noInitialRun']) { shouldRunNow = false; } - run(); + + // {{POST_RUN_ADDITIONS}} diff --git a/src/ipc.js b/src/ipc.js deleted file mode 100644 index 6394066..0000000 --- a/src/ipc.js +++ /dev/null @@ -1,9 +0,0 @@ -const { ipcMain, app } = require('electron'); - -function registerIpcHandlers() { - ipcMain.handle('quit', () => app.quit()) -} - -module.exports = { - registerIpcHandlers -} diff --git a/src/main/devmode.js b/src/main/devmode.js new file mode 100644 index 0000000..633870e --- /dev/null +++ b/src/main/devmode.js @@ -0,0 +1,5 @@ +const isDevMode = true; + +module.exports = { + isDevMode +} diff --git a/src/index.js b/src/main/index.js similarity index 51% rename from src/index.js rename to src/main/index.js index e82a314..d241ff7 100644 --- a/src/index.js +++ b/src/main/index.js @@ -1,38 +1,19 @@ -const { app, BrowserWindow } = require('electron'); -const path = require('path'); -const { registerIpcHandlers } = require('./ipc'); +const { app, BrowserWindow } = require("electron"); +const path = require("path"); + +const { registerIpcHandlers } = require("./ipc"); +const { createWindow } = require("./windows"); // Handle creating/removing shortcuts on Windows when installing/uninstalling. -if (require('electron-squirrel-startup')) { // eslint-disable-line global-require +if (require("electron-squirrel-startup")) { + // eslint-disable-line global-require app.quit(); } -const createWindow = () => { - // Create the browser window. - const mainWindow = new BrowserWindow({ - width: 900, - height: 730, - useContentSize: true, - frame: false, - transparent: true, - resizable: false, - webPreferences: { - nodeIntegration: true - } - }); - - // and load the index.html of the app. - mainWindow.loadFile(path.join(__dirname, 'renderer/index.html')); - - mainWindow.setMenu(null); - - mainWindow.webContents.toggleDevTools(); -}; - // This method will be called when Electron has finished // initialization and is ready to create browser windows. // Some APIs can only be used after this event occurs. -app.on('ready', () => { +app.on("ready", () => { registerIpcHandlers(); createWindow(); }); @@ -40,13 +21,13 @@ app.on('ready', () => { // Quit when all windows are closed, except on macOS. There, it's common // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q. -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { +app.on("window-all-closed", () => { + if (process.platform !== "darwin") { app.quit(); } }); -app.on('activate', () => { +app.on("activate", () => { // On OS X it's common to re-create a window in the app when the // dock icon is clicked and there are no other windows open. if (BrowserWindow.getAllWindows().length === 0) { diff --git a/src/main/ipc.js b/src/main/ipc.js new file mode 100644 index 0000000..8f014f1 --- /dev/null +++ b/src/main/ipc.js @@ -0,0 +1,13 @@ +const { ipcMain, app, BrowserWindow } = require("electron"); + +function registerIpcHandlers() { + ipcMain.handle("quit", () => app.quit()); + + ipcMain.handle("devtools", () => { + BrowserWindow.getAllWindows().forEach((w) => w.webContents.toggleDevTools()); + }); +} + +module.exports = { + registerIpcHandlers, +}; diff --git a/src/main/windows.js b/src/main/windows.js new file mode 100644 index 0000000..c22efa3 --- /dev/null +++ b/src/main/windows.js @@ -0,0 +1,89 @@ +const { app, BrowserWindow, shell } = require("electron"); +const path = require("path"); + +const { isDevMode } = require('./devmode') + +const windowList = {}; +let mainWindow; + +function handleNewWindow(event, url, frameName, disposition, options) { + // open window as modal + event.preventDefault(); + + // Don't open the same window multiple times + if (windowList[url]) { + windowList[url].focus(); + return; + } + + Object.assign(options, { + //modal: true, + parent: mainWindow, + width: 300, + height: 300, + frame: true, + transparent: false, + resizable: true, + webPreferences: { + nodeIntegration: false, + navigateOnDragDrop: false + }, + }); + + let newWindow = new BrowserWindow(options) + + newWindow.webContents.on('will-navigate', (event, url) => { + if (url.startsWith('http')) { + event.preventDefault(); + shell.openExternal(url); + } + }); + + event.newGuest = newWindow; + newWindow.setMenu(null); + windowList[url] = newWindow; + + if (isDevMode) { + newWindow.webContents.toggleDevTools(); + } + + newWindow.on('closed', () => { + delete windowList[url]; + }); +} + +function createWindow() { + // Create the browser window. + mainWindow = new BrowserWindow({ + width: 900, + height: 730, + useContentSize: true, + frame: false, + transparent: true, + resizable: false, + webPreferences: { + nodeIntegration: true, + nativeWindowOpen: true, + navigateOnDragDrop: false, + nodeIntegrationInWorker: true, + sandbox: false + }, + }); + + // and load the index.html of the app. + mainWindow.loadFile(path.join(__dirname, "../renderer/index.html")); + + // Disable menu + mainWindow.setMenu(null); + + // Ensure we create child windows with the correct settings + mainWindow.webContents.on("new-window", handleNewWindow); + + if (isDevMode) { + mainWindow.webContents.toggleDevTools(); + } +}; + +module.exports = { + createWindow +} diff --git a/src/renderer/atomics.js b/src/renderer/atomics.js index ecad9e0..06455c8 100644 --- a/src/renderer/atomics.js +++ b/src/renderer/atomics.js @@ -42,5 +42,5 @@ module.exports = { releaseTwoStateLock, acquireLock, releaseLock, - LockStates -} + LockStates, +}; diff --git a/src/renderer/audio.js b/src/renderer/audio.js index 1511e22..f0876b3 100644 --- a/src/renderer/audio.js +++ b/src/renderer/audio.js @@ -1,4 +1,4 @@ -const { LockStates } = require('./atomics'); +const { LockStates } = require("./atomics"); var audio = { channels: 1, @@ -62,7 +62,7 @@ function openAudio() { var sizeSamples = sizeBytes / audio.bytesPerSample; // How many samples fit in the callback buffer? var sizeSamplesPerChannel = sizeSamples / audio.channels; // How many samples per a single channel fit in the cb buffer? if (sizeSamplesPerChannel != audio.samples) { - throw 'Received mismatching audio buffer size!'; + throw "Received mismatching audio buffer size!"; } // Allocate new sound buffer to be played. var source = audioContext.createBufferSource(); @@ -88,11 +88,11 @@ function openAudio() { // assertion if (curtime > audio.nextPlayTime && audio.nextPlayTime != 0) { - console.log( - 'warning: Audio callback had starved sending audio by ' + - (curtime - audio.nextPlayTime) + - ' seconds.' - ); + // console.log( + // "warning: Audio callback had starved sending audio by " + + // (curtime - audio.nextPlayTime) + + // " seconds." + // ); } // Don't ever start buffer playbacks earlier from current time than a given constant 'audio.bufferingDelay', since a browser @@ -120,10 +120,10 @@ function openAudio() { audio.gotFirstBlock && Date.now() - getBlockBufferLastWarningTime > 5000 ) { - console.warn( - `UI thread tried to read audio data from worker-locked chunk ${getBlockBufferWarningCount} times` - ); - console.log('curChunkIndex', curChunkIndex); + // console.warn( + // `UI thread tried to read audio data from worker-locked chunk ${getBlockBufferWarningCount} times` + // ); + //console.log("curChunkIndex", curChunkIndex); // debugger getBlockBufferLastWarningTime = Date.now(); getBlockBufferWarningCount = 0; @@ -154,11 +154,13 @@ function openAudio() { for (var c = 0; c < audio.channels; ++c) { var channelData = dstAudioBuffer.getChannelData(c); if (channelData.length != blockSize) { - throw 'Web Audio output buffer length mismatch! Destination size: ' + - channelData.length + - ' samples vs expected ' + - blockSize + - ' samples!'; + throw ( + "Web Audio output buffer length mismatch! Destination size: " + + channelData.length + + " samples vs expected " + + blockSize + + " samples!" + ); } var blockBufferI16 = new Int16Array(blockBuffer.buffer); @@ -182,7 +184,7 @@ function openAudio() { if ( secsUntilNextPlayStart >= audio.bufferingDelay + - audio.bufferDurationSecs * audio.numSimultaneouslyQueuedBuffers + audio.bufferDurationSecs * audio.numSimultaneouslyQueuedBuffers ) return; @@ -234,5 +236,5 @@ module.exports = { audioContext, audioBlockChunkSize, AUDIO_DATA_BUFFER_SIZE, - openAudio -} + openAudio, +}; diff --git a/src/renderer/controls.js b/src/renderer/controls.js index 0045a99..988bced 100644 --- a/src/renderer/controls.js +++ b/src/renderer/controls.js @@ -1,9 +1,13 @@ -const { quit } = require("./ipc"); +const { quit, devtools } = require("./ipc"); function registerControls() { - document.querySelector('#close').addEventListener('click', () => { + document.querySelector("#close").addEventListener("click", () => { quit(); }); + + document.querySelector("#devtools").addEventListener("click", () => { + devtools(); + }); } registerControls(); diff --git a/src/renderer/credits.html b/src/renderer/credits.html new file mode 100644 index 0000000..40e0cf5 --- /dev/null +++ b/src/renderer/credits.html @@ -0,0 +1,34 @@ + + + + + + Credits + + + +

Credits

+

+ This app by Felix Rieseberg. The real work was done by the people below: + +

+ +

Emulator: Basilisk II, a 68k Macintosh emulator, by Christian Bauer et al, modified and compiled with Emscripten by James Friend. +

+ +

Installed software from vintage computing archives: WinWorldPC, Macintosh Garden, and Macintosh Repository. +

+ +

This software is not affiliated with nor authorized by Apple. It is + provided for educational purposes only and does not allow saving of + any state or files. + +

+

Licenses

+

+ The source code for this app can be found on GitHub, where it is available under the MIT License. +

+ +

Basilisk II and its components are released under the GNU GPL. See LICENSE for details.

+ + \ No newline at end of file diff --git a/src/renderer/emulator.js b/src/renderer/emulator.js index 1e3a17f..4ec9e6e 100644 --- a/src/renderer/emulator.js +++ b/src/renderer/emulator.js @@ -1,9 +1,7 @@ -const { drawScreen } = require('./screen'); -const { openAudio } = require('./audio'); -const { tryToSendInput } = require('./input'); -const { registerWorker } = require('./worker'); - -registerWorker(); +const { drawScreen } = require("./screen"); +const { openAudio } = require("./audio"); +const { tryToSendInput } = require("./input"); +const { registerWorker } = require("./worker"); function asyncLoop() { drawScreen(); @@ -12,6 +10,7 @@ function asyncLoop() { } function start() { + registerWorker(); openAudio(); asyncLoop(); } diff --git a/src/renderer/images/cat.png b/src/renderer/images/cat.png new file mode 100644 index 0000000..ca4bec0 Binary files /dev/null and b/src/renderer/images/cat.png differ diff --git a/src/renderer/index.html b/src/renderer/index.html index 4d51b1e..0ca36ca 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -3,15 +3,19 @@ Hello World! - +
- Quit - Credits + Quit + Credits + Dev
+
+
diff --git a/src/renderer/input.js b/src/renderer/input.js index ac4b016..6005f0d 100644 --- a/src/renderer/input.js +++ b/src/renderer/input.js @@ -1,4 +1,4 @@ -const { acquireLock, releaseLock } = require('./atomics'); +const { acquireLock, releaseLock } = require("./atomics"); const INPUT_BUFFER_SIZE = 100; const inputBuffer = new SharedArrayBuffer(INPUT_BUFFER_SIZE * 4); @@ -41,23 +41,23 @@ function tryToSendInput() { for (var i = 0; i < inputQueue.length; i++) { var inputEvent = inputQueue[i]; switch (inputEvent.type) { - case 'mousemove': + case "mousemove": hasMouseMove = true; mouseMoveX += inputEvent.dx; mouseMoveY += inputEvent.dy; break; - case 'mousedown': - case 'mouseup': - mouseButtonState = inputEvent.type === 'mousedown' ? 1 : 0; + case "mousedown": + case "mouseup": + mouseButtonState = inputEvent.type === "mousedown" ? 1 : 0; break; - case 'keydown': - case 'keyup': + case "keydown": + case "keyup": if (hasKeyEvent) { remainingKeyEvents.push(inputEvent); break; } hasKeyEvent = true; - keyState = inputEvent.type === 'keydown' ? 1 : 0; + keyState = inputEvent.type === "keydown" ? 1 : 0; keyCode = inputEvent.keyCode; break; } @@ -77,24 +77,24 @@ function tryToSendInput() { inputQueue = remainingKeyEvents; } -canvas.addEventListener('mousemove', function (event) { - inputQueue.push({ type: 'mousemove', dx: event.offsetX, dy: event.offsetY }); +canvas.addEventListener("mousemove", function (event) { + inputQueue.push({ type: "mousemove", dx: event.offsetX, dy: event.offsetY }); }); -canvas.addEventListener('mousedown', function (event) { - inputQueue.push({ type: 'mousedown' }); +canvas.addEventListener("mousedown", function (event) { + inputQueue.push({ type: "mousedown" }); }); -canvas.addEventListener('mouseup', function (event) { - inputQueue.push({ type: 'mouseup' }); +canvas.addEventListener("mouseup", function (event) { + inputQueue.push({ type: "mouseup" }); }); -window.addEventListener('keydown', function (event) { - inputQueue.push({ type: 'keydown', keyCode: event.keyCode }); +window.addEventListener("keydown", function (event) { + inputQueue.push({ type: "keydown", keyCode: event.keyCode }); }); -window.addEventListener('keyup', function (event) { - inputQueue.push({ type: 'keyup', keyCode: event.keyCode }); +window.addEventListener("keyup", function (event) { + inputQueue.push({ type: "keyup", keyCode: event.keyCode }); }); module.exports = { @@ -103,5 +103,5 @@ module.exports = { inputBufferView, InputBufferAddresses, inputQueue, - tryToSendInput -} + tryToSendInput, +}; diff --git a/src/renderer/ipc.js b/src/renderer/ipc.js index fffd8c3..bd50d4a 100644 --- a/src/renderer/ipc.js +++ b/src/renderer/ipc.js @@ -1,7 +1,11 @@ -const { ipcRenderer } = require('electron'); +const { ipcRenderer } = require("electron"); module.exports = { quit() { - ipcRenderer.invoke('quit'); + ipcRenderer.invoke("quit"); + }, + + devtools() { + ipcRenderer.invoke("devtools"); } -} +}; diff --git a/src/renderer/iso.js b/src/renderer/iso.js new file mode 100644 index 0000000..a7b3922 --- /dev/null +++ b/src/renderer/iso.js @@ -0,0 +1,34 @@ +const fs = require("fs"); +const path = require("path"); +const { runPowerShell } = require("./powershell"); + +async function createIsoWindows(options) { + const { source } = options; + const ps1Path = path.join(__dirname, `../script/iso.ps1`); + const target = path.join(__dirname, "../basilisk/test.iso"); + + if (!fs.existsSync(ps1Path)) { + throw new Error(`createIsoWindows: Could not find ${ps1Path}`); + } + + if (fs.existsSync(target)) { + console.warn(`createIsoWindows: Target file exists, removing`); + await fs.promises.unlink(target); + } + + const fn = `. ${path.join(__dirname, `../script/iso.ps1`)}`; + const cmd = `${fn}; $s = "${source}"; get-childitem "$s" | New-ISOFile -Media CDROM -path ${target}`; + + await runPowerShell(cmd); +} + +module.exports = { + createIsoWindows, +}; + +async function main() { + const source = `C:\\Users\\felix\\Desktop\\test`; + await createIsoWindows({ source }).catch(console.log); +} + +main(); diff --git a/src/renderer/powershell.js b/src/renderer/powershell.js new file mode 100644 index 0000000..9d8a2fb --- /dev/null +++ b/src/renderer/powershell.js @@ -0,0 +1,42 @@ +const { spawn } = require("child_process"); + +function runPowerShell(command) { + return new Promise((resolve) => { + let stdout = []; + let stderr = []; + let child; + + try { + child = spawn("powershell.exe", [ + "-ExecutionPolicy", + "Bypass", + "-NoProfile", + "-NoLogo", + command, + ]); + } catch (error) { + console.error(error); + // This is dirty, but the best way for us to try/catch right now + return reject(error); + } + + child.stdout.on("data", (data) => { + const str = data.toString(); + console.log(str); + stdout.push(str); + }); + child.stderr.on("data", (data) => { + const str = data.toString(); + console.log(str); + stderr.push(str); + }); + + child.on("exit", () => resolve({ stderr, stdout })); + + child.stdin.end(); + }); +} + +module.exports = { + runPowerShell, +}; diff --git a/src/renderer/screen.js b/src/renderer/screen.js index ca4e679..1b733fc 100644 --- a/src/renderer/screen.js +++ b/src/renderer/screen.js @@ -1,5 +1,5 @@ -const { videoModeBufferView } = require('./video'); -const { audioContext } = require('./audio'); +const { videoModeBufferView } = require("./video"); +const { audioContext } = require("./audio"); const SCREEN_WIDTH = 800; const SCREEN_HEIGHT = 600; @@ -11,7 +11,7 @@ const screenBufferView = new Uint8Array(screenBuffer); canvas.width = SCREEN_WIDTH; canvas.height = SCREEN_HEIGHT; -const canvasCtx = canvas.getContext('2d'); +const canvasCtx = canvas.getContext("2d"); const imageData = canvasCtx.createImageData(SCREEN_WIDTH, SCREEN_HEIGHT); function drawScreen() { @@ -38,7 +38,6 @@ function drawScreen() { } } - canvasCtx.putImageData(imageData, 0, 0); } @@ -48,5 +47,5 @@ module.exports = { SCREEN_BUFFER_SIZE, drawScreen, SCREEN_WIDTH, - SCREEN_HEIGHT -} + SCREEN_HEIGHT, +}; diff --git a/src/renderer/style/base.css b/src/renderer/style/base.css new file mode 100644 index 0000000..7bf75ea --- /dev/null +++ b/src/renderer/style/base.css @@ -0,0 +1,15 @@ +@font-face { + font-family: Garamond; + src: url(garamond.ttf); +} + +body { + font-family: Garamond, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; + margin: 0 auto; + padding: 0; +} + +:root { + --canvas-width: 800px; + --canvas-height: 600px; +} \ No newline at end of file diff --git a/src/renderer/style/credits.css b/src/renderer/style/credits.css new file mode 100644 index 0000000..a2ede5d --- /dev/null +++ b/src/renderer/style/credits.css @@ -0,0 +1,11 @@ +@import "base.css"; + +body { + background-image: url(../images/cat.png); + font-size: 16px; + margin: 15px; +} + +span { + background-color: #ffffffe3; +} diff --git a/src/renderer/garamond.ttf b/src/renderer/style/garamond.ttf similarity index 100% rename from src/renderer/garamond.ttf rename to src/renderer/style/garamond.ttf diff --git a/src/renderer/index.css b/src/renderer/style/index.css similarity index 64% rename from src/renderer/index.css rename to src/renderer/style/index.css index bdc3090..be332c0 100644 --- a/src/renderer/index.css +++ b/src/renderer/style/index.css @@ -1,13 +1,4 @@ -@font-face { - font-family: Garamond; - src: url(garamond.ttf); -} - -body { - font-family: Garamond, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; - margin: 0 auto; - padding: 0; -} +@import "base.css"; canvas { cursor: none; @@ -21,7 +12,7 @@ canvas { -webkit-app-region: drag; height: 24px; color: #020202; - background-image: url(images/tile_bg_end.png), url(images/tile_bg_end_right.png), url(images/tile_bg.png); + background-image: url(../images/tile_bg_end.png), url(../images/tile_bg_end_right.png), url(../images/tile_bg.png); background-position: left, right, center; background-repeat: no-repeat, no-repeat, repeat-x; background-size: contain; @@ -31,7 +22,7 @@ canvas { .controls .clear { display: inline-block; height: calc(100% - 3px); - background-image: url(images/tile_clear_bg.png); + background-image: url(../images/tile_clear_bg.png); background-repeat: repeat-x; background-size: contain; padding-top: 3px; @@ -49,3 +40,13 @@ canvas { .controls a:hover { text-decoration: underline; } + +#warning { + height: 150px; + width: 350px; + background: #ddd; + z-index: 100; + position: absolute; + top: 200px; + left: 225px +} \ No newline at end of file diff --git a/src/renderer/video.js b/src/renderer/video.js index 0e37f74..0bd439c 100644 --- a/src/renderer/video.js +++ b/src/renderer/video.js @@ -1,4 +1,4 @@ -const { releaseTwoStateLock } = require('./atomics') +const { releaseTwoStateLock } = require("./atomics"); const VIDEO_MODE_BUFFER_SIZE = 10; const videoModeBuffer = new SharedArrayBuffer(VIDEO_MODE_BUFFER_SIZE * 4); @@ -9,5 +9,5 @@ releaseTwoStateLock(videoModeBufferView, 9); module.exports = { VIDEO_MODE_BUFFER_SIZE, videoModeBuffer, - videoModeBufferView -} + videoModeBufferView, +}; diff --git a/src/renderer/worker.js b/src/renderer/worker.js index 954e06e..c0c590c 100644 --- a/src/renderer/worker.js +++ b/src/renderer/worker.js @@ -1,7 +1,17 @@ -const { inputBuffer, INPUT_BUFFER_SIZE } = require('./input') -const { videoModeBuffer, VIDEO_MODE_BUFFER_SIZE } = require('./video') -const { screenBuffer, SCREEN_BUFFER_SIZE, SCREEN_WIDTH, SCREEN_HEIGHT } = require('./screen') -const { audio, audioDataBuffer, audioBlockChunkSize, AUDIO_DATA_BUFFER_SIZE } = require('./audio') +const { inputBuffer, INPUT_BUFFER_SIZE } = require("./input"); +const { videoModeBuffer, VIDEO_MODE_BUFFER_SIZE } = require("./video"); +const { + screenBuffer, + SCREEN_BUFFER_SIZE, + SCREEN_WIDTH, + SCREEN_HEIGHT, +} = require("./screen"); +const { + audio, + audioDataBuffer, + audioBlockChunkSize, + AUDIO_DATA_BUFFER_SIZE, +} = require("./audio"); function registerWorker() { var workerConfig = { @@ -19,19 +29,17 @@ function registerWorker() { SCREEN_HEIGHT: SCREEN_HEIGHT, }; - var worker = new Worker('../basilisk/BasiliskII-worker-boot.js'); + var worker = window.emulatorWorker = new Worker("../basilisk/BasiliskII-worker-boot.js"); worker.postMessage(workerConfig); - worker.onmessage = function(e) { + worker.onmessage = function (e) { if ( - e.data.type === 'emulator_ready' || - e.data.type === 'emulator_loading' + e.data.type === "emulator_ready" || + e.data.type === "emulator_loading" ) { // document.body.className = // e.data.type === 'emulator_ready' ? '' : 'loading'; - // const progressElement = document.getElementById('progress'); - // if (progressElement && e.data.type === 'emulator_loading') { // progressElement.value = Math.max(10, e.data.completion * 100); // progressElement.max = 100; @@ -42,9 +50,24 @@ function registerWorker() { // progressElement.hidden = true; // } } + + if (e.data.type === 'TTY') { + // If we're shutting down, Basilisk II will send + // close_audio to TTY - our signal that we can + // save the disk image + if (e.data.message === 'close_audio') { + worker.postMessage('save'); + } + } }; } -module.exports = { - registerWorker +function saveDisk() { + + + worker.postMessage('save'); } + +module.exports = { + registerWorker, +}; diff --git a/yarn.lock b/yarn.lock index 75d8d89..21d254a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1009,10 +1009,10 @@ electron-winstaller@^4.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-9.1.0.tgz#ca77600c9e4cd591298c340e013384114d3d8d05" - integrity sha512-VRAF8KX1m0py9I9sf0kw1kWfeC87mlscfFcbcRdLBsNJ44/GrJhi3+E8rKbpHUeZNQxsPaVA5Zu5Lxb6dV/scQ== +electron@10.0.0-beta.13: + version "10.0.0-beta.12" + resolved "https://registry.yarnpkg.com/electron/-/electron-10.0.0-beta.12.tgz#93db286f96de03104a39fc693c25d0d4c0784813" + integrity sha512-cUYFrtGDD96aes4W+jCD1CwyC17HE4/wbok3yphL66z08ZQ+MIqgEe/pChujcSiMoK9SjvxTPPYGtszyXOrZKg== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12"