Merge branch 'main' of git.sr.ht:~mrms/tophat

cmd/emscripten_build.sh

@@ -2,7 +2,7 @@
 set -e
 
 # run make to do all the necessary embedding stuff
-# make
+make
 
 cc () {
 	echo EMCC $f

cmd/th_emscripten_link

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-_=${TH_DIR:=../th_wasm_data}
-
+TH_DIR=$(dirname $(readlink -f $0))/../
 echo Data directory: $TH_DIR
 
 mkdir -p $TH_DIR
@@ -28,7 +27,7 @@ echo Linking...
 emcc -O3 --sASYNCIFY -Wall -fno-strict-aliasing -Wno-format-security\
 	$TH_DIR/th_emscripten.a \
 	-s ALLOW_MEMORY_GROWTH=1 \
-	-s ASYNCIFY_STACK_SIZE=2000000 \
+	-s STACK_SIZE=2MB \
 	-lc \
 	-lm \
 	-sMIN_WEBGL_VERSION=2 \

etc/shell.html

@@ -42,6 +42,8 @@
         })(),
         canvas: (function() {
           var canvas = document.getElementById('canvas');
+          window.focus();
+          canvas.focus();
 
           canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
 
@@ -58,12 +60,19 @@
       };
       window.addEventListener("resize", (e) => {
         var canvas = document.getElementById('canvas')
+        window.focus();
+        canvas.focus();
         canvas.width = window.innerWidth;
         canvas.height = window.innerHeight;
       })
+      window.addEventListener("click", (e) => {
+        var canvas = document.getElementById('canvas')
+        window.focus();
+        canvas.focus();
+      })
       canvas.width = window.innerWidth;
       canvas.height = window.innerHeight;
-      
+
       Module.setStatus('Downloading...');
       window.onerror = function() {
         Module.setStatus('Exception thrown, see JavaScript console');