Merge remote-tracking branch 'origin/main' into mg/uint8ing

mattgodbolt · Dec 31, 2024 · b030bc7 · b030bc7
2 parents d3e0ada + 038f5ad
commit b030bc7
Show file tree

Hide file tree

Showing 177 changed files with 6,749 additions and 8,507 deletions.
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -58,4 +58,4 @@ jobs:
           AWS_S3_BUCKET: bbc.xania.org
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          SOURCE_DIR: "out/dist"
+          SOURCE_DIR: "dist"
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@
 /perf.data
 .eslintcache
 **/.DS_Store
+coverage
+/dist
diff --git a/.husky/.gitignore b/.husky/.gitignore
@@ -1 +1,3 @@
 _
+
+coverage
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,2 +1 @@
-npx lint-staged
-npm run test:unit
+npm run pre-commit
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,4 @@
-out
+dist
 tests/6502_65C02_functional_tests
 tests/integration/dp111_6502Timing
 package-lock.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,7 +4,7 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Debug a running webpack dev server",
+      "name": "Debug a running dev server",
       "url": "http://localhost:8080?logFdcStateChanges&logFdcCommands&model=MasterADFS&disc=CodenameDroid-ADFS_E.adf",
       "webRoot": "${workspaceFolder}",
       "sourceMaps": true,

diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ dist: npm
 
 .PHONY: clean
 clean:
-	@rm -rf out
+	@rm -rf dist out
 
 .PHONY: spotless
 spotless: clean

diff --git a/README.md b/README.md
diff --git a/bitstream.js b/bitstream.js
diff --git a/build/icon.ico b/build/icon.ico
diff --git a/build/icon.png b/build/icon.png
diff --git a/eslint.config.js b/eslint.config.js
@@ -4,11 +4,13 @@ import js from "@eslint/js";
 import globals from "globals";
 
 export default [
+    {
+        ignores: ["lib/", "out/", "dist/"],
+    },
     js.configs.recommended,
     eslintConfigPrettier,
     {
         plugins: { prettier },
-        ignores: ["lib/", "out/"],
         languageOptions: {
             parserOptions: {
                 ecmaVersion: 2020,

diff --git a/index.html b/index.html
@@ -22,6 +22,7 @@
     />
     <title>jsbeeb - Javascript BBC Micro emulator</title>
     <link rel="shortcut icon" href="/favicon.ico" />
+    <script type="module" src="/src/main.js"></script>
   </head>
 
   <body>
@@ -442,8 +443,8 @@ <h5 class="modal-title" id="helpModalLabel">Help</h5>
           </div>
           <div class="modal-body">
             <div>
-              This is an emulator for the <a href="https://en.wikipedia.org/wiki/Bbc_micro">BBC Micro</a>
-              Model B, a popular home computer in the UK in the 1980s.
+              This is an emulator for the <a href="https://en.wikipedia.org/wiki/Bbc_micro">BBC Micro</a>, a popular
+              home computer in the UK in the 1980s. It emulates the BBC B &amp; Master version of the computer.
             </div>
             <div>
               The default disc image is Elite - a pioneering 3D space trading game. To boot discs on the BBC, one would
@@ -478,15 +479,33 @@ <h5>Handy key mappings</h5>
                   <td>
                     <div class="dbl key">*<br />:</div>
                   </td>
-                  <td>TODO</td>
-                  <td>TODO</td>
+                  <td>
+                    <div class="dbl key">"<br />'</div>
+                  </td>
+                  <td>
+                    <div class="dbl key">"<br />'</div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <div class="dbl key">CAPS<br />LOCK</div>
+                  </td>
+                  <td class="key">CAPSLOCK</td>
+                  <td>See notes</td>
                 </tr>
                 <tr>
                   <td>Debug</td>
                   <td><span class="key">Ctrl-Home</span></td>
-                  <td>TODO</td>
+                  <td><span class="key">Ctrl-Home</span></td>
                 </tr>
               </table>
+              <div>
+                Note that caps lock doesn't work well on OS X because browsers don't give proper key down and key up
+                events for that key. That means jsbeeb can't know when you've released the physical key; it just guesses
+                that you tapped the key whenever it notices the caps lock state changes. That's fine for typing but
+                means that some games that use caps lock for left or fire, don't work. Consult the main documentation
+                for details on how to map keys.
+              </div>
             </div>
           </div>
           <div class="modal-footer">