update to pygbag 0.9.3

Author: bntre

!run_pygbag.bat

@@ -1,6 +1,9 @@
+@rem  See: https://pygame-web.github.io/wiki/pygbag/
+@rem       https://pygame-web.github.io/wiki/publishing/itch.io/
 
 
-set DEST=visual-lambda-2.0
+
+set DEST=visual-lambda-2.1
 @rem  It will be also the name of .apk file
 
 
@@ -12,8 +15,10 @@ xcopy *.py %DEST%\
 xcopy config.cfg %DEST%\
 xcopy library.txt %DEST%\
 xcopy toolbar_icons.png %DEST%\
-xcopy workspaces\library_demo.xml %DEST%\workspaces\
-xcopy workspaces\clear.xml %DEST%\workspaces\
+xcopy workspaces\default_workspace.xml   %DEST%\workspaces\
+xcopy workspaces\clear.xml               %DEST%\workspaces\
+xcopy workspaces\library_demo.xml        %DEST%\workspaces\
+xcopy workspaces\predecessors.xml        %DEST%\workspaces\
 
 
-python -m pygbag --app_name VisualLambda --package bntr.visuallambda --title "Visual Lambda" --template pygbag_index_html.tmpl --icon favicon.png --archive %DEST%
+python -m pygbag --app_name VisualLambda --package bntr.visuallambda --title "Visual Lambda" --template pygbag_0.9.3_index_html.tmpl --icon favicon.png --archive %DEST%

config.py

@@ -7,7 +7,7 @@
 # Platform
 
 IS_WEB_PLATFORM = sys.platform == 'emscripten'
-#IS_WEB_PLATFORM = True  # to test web mode
+#IS_WEB_PLATFORM = True  # to test web mode locally
 
 ALLOW_SYSTEM_CONSOLE = not IS_WEB_PLATFORM
 
@@ -40,7 +40,7 @@ def readCfg():
 
     else:
         # Read config.cfg
-        parser.readfp( f )
+        parser.read_file( f )
 
         # Get Configuration dict
         cfg = dict( parser.items('Visual Lambda') )

events.py

@@ -23,10 +23,6 @@
 SYSTEMCONSOLE_TIMEREVENT = pygame.USEREVENT + 5
 
 
-LOCALSTORAGE_TIMEREVENT = pygame.USEREVENT + 6
-
-
-
 class Enduring:      # ?? move class to another module
     """
     Enduring Event.

kgrind.py

@@ -242,9 +242,8 @@ def __init__( self, caption ):
             pygame.time.set_timer(SYSTEMCONSOLE_TIMEREVENT, 100)
 
         if config.IS_WEB_PLATFORM:
-            pygame.time.set_timer(LOCALSTORAGE_TIMEREVENT, 500)
-        
-    
+            self._next_localstorage_poll_ms = 0
+
         #-----------------------------------------------------
         # Prepare toolbars
 
@@ -301,12 +300,20 @@ def __init__( self, caption ):
 
     async def run( self ):
 
-        sleepSec = 0.02
+        sleepSec = 0.01
         if config.IS_WEB_PLATFORM:
             sleepSec = 0  # pygbag asked for 0
 
         while True:
-        
+            
+            if config.IS_WEB_PLATFORM:
+                # set_timer is not implemented on WASM yet.
+                now_ms = pygame.time.get_ticks()
+
+                if now_ms >= self._next_localstorage_poll_ms:
+                    self.handleLocalStorageCommands()
+                    self._next_localstorage_poll_ms = now_ms + 500
+
             for e in pygame.event.get():
                 self.handleEvent( e )
                 if e.type == pygame.QUIT:
@@ -815,14 +822,6 @@ def handleEvent( self, event ):
                 self.postEvent( e )
             self.invalidate()
 
-        if config.IS_WEB_PLATFORM:
-            if event.type == LOCALSTORAGE_TIMEREVENT:
-                # Check if user has called a browser console command, e.g. addItem('\\x. x x')
-                localstorage.handle_storage('addItem', self.onInputItem, "|")
-                localstorage.handle_storage('clearWorkspace', self.onClearWorkspace)
-                localstorage.handle_storage('saveWorkspace', self.onSaveWorkspaceName)
-                localstorage.handle_storage('loadWorkspace', self.onLoadWorkspaceName)
-        
         if config.ALLOW_SYSTEM_CONSOLE:
             if event.type == SYSTEMCONSOLE_TIMEREVENT:
                 self.consoleCheck()  # it calls console input callbacks, e.g. self.onLoadWorkspaceFileName
@@ -998,6 +997,13 @@ def onSaveWorkspaceFileName( self, workspaceName ):
 
     if config.IS_WEB_PLATFORM:  # Save to/Load from localStorage
 
+        def handleLocalStorageCommands( self ):
+            # Check if user has called a browser console command, e.g. addItem('\\x. x x')
+            localstorage.handle_storage('addItem',          self.onInputItem, "|")
+            localstorage.handle_storage('clearWorkspace',   self.onClearWorkspace)
+            localstorage.handle_storage('saveWorkspace',    self.onSaveWorkspaceName)
+            localstorage.handle_storage('loadWorkspace',    self.onLoadWorkspaceName)
+
         def onClearWorkspace( self, _ ):
             if saving.load_from_file( self, "clear.xml" ):
                 self.invalidate()
@@ -1307,7 +1313,12 @@ def pickToolbarItem( self, pos ):
 
 
 
-asyncio.run(
-    Manipulator('Visual Lambda').run()
-)
+def main():
+    asyncio.run(
+        Manipulator('Visual Lambda').run()
+    )
+
+
+if __name__ == '__main__':
+    main()
 

main.py

@@ -1,4 +1,6 @@
-<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="python{{cookiecutter.PYBUILD}}" data-LINES=42 data-COLUMNS=132 data-os="vtx,snd,gui" async defer>#<!--
+<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="python{{cookiecutter.PYBUILD}}" data-LINES=42 data-COLUMNS=132 data-os="vtx,gui" async defer>#<!--
+
+# The template is based on https://github.com/pygame-web/pygbag/blob/main/static/default.tmpl
 
 print("""
 Loading {{cookiecutter.title}} from {{cookiecutter.archive}}.apk
@@ -59,25 +61,6 @@ async def custom_site():
 
     main = appdir / "assets" / "main.py"
 
-    # TODO: test for window.webkitAudioContext and block aio loop until gesture if accessing media manager play
-    # before a gesture is recorded ( touch or click )
-
-    # test/wait user media interaction
-    if not platform.window.MM.UME:
-
-        # now that apk is mounted we have access to font cache
-        # but we need to fill __file__ that is not yet set
-        __import__(__name__).__file__ = main
-
-        # now make a prompt
-        print("Ready to start !")
-
-        print("""
-        * Waiting for media user engagement : please click/touch page *
-    """)
-        while not platform.window.MM.UME:
-            await asyncio.sleep(.1)
-
     # start async top level machinery if not started and add a console in any case if requested.
     await TopLevel_async_handler.start_toplevel(platform.shell, console=window.python.config.debug)
 
@@ -143,7 +126,7 @@ asyncio.run( custom_site() )
 config = {
     xtermjs : "{{cookiecutter.xtermjs}}" ,
     _sdl2 : "canvas",
-    user_canvas : 0,
+    user_canvas : 1,
     user_canvas_managed : 0,
     gui_divider : 2,
     ume_block : {{cookiecutter.ume_block}},
@@ -353,6 +336,8 @@ frameborder="1"
         // make your js customization here
         console.log(__FILE__, "custom_onload")
 
+        //debug_hidden = false //!!! use this for debug
+
         pyconsole.hidden = debug_hidden
         system.hidden = debug_hidden
         transfer.hidden = debug_hidden
@@ -401,6 +386,72 @@ frameborder="1"
         window.frames["iframe"].location = url;
     }
 
+
+
+
+    // Visual Lambda stuff
+    // localStorage exchange
+    function setStorageValue(name, newValue, separator = undefined) {
+        let key = "storage_" + name;
+        let value = undefined;
+        if (separator) {
+            value = window.localStorage.getItem(key);
+            if (value) {
+                value += separator + newValue;
+            } else {
+                value = newValue;
+            }
+        } else {
+            value = newValue;
+        }
+        window.localStorage.setItem(key, value);
+    }
+    
+    function addItem(expression) {
+        setStorageValue("addItem", expression, "|");
+    }
+    function clearWorkspace() {
+        setStorageValue("clearWorkspace", "1");
+    }
+    function saveWorkspace(workspaceName) {
+        setStorageValue("saveWorkspace", workspaceName);
+    }
+    function loadWorkspace(workspaceName) {
+        setStorageValue("loadWorkspace", workspaceName);
+    }
+    function help() {
+        console.log("addItem(expression) - add an item by expression, e.g. addItem('\\x. x x')");
+        console.log("clearWorkspace() - clear the workspace");
+        console.log("saveWorkspace(workspaceName) - save current workspace to localStorage, e.g. saveWorkspace('combinators3')");
+        console.log("loadWorkspace(workspaceName) - load a workspace from localStorage, e.g. loadWorkspace('combinators3')");
+    }
+
+    // Allow using browser console through an iframe on itch.io
+    window.addEventListener('message', event => {
+        //console.log(event);
+        if (event.origin !== "https://bntr.itch.io") return;
+        const method = event.data[0];
+        if (method === "addItem") {
+            addItem(event.data[1]);
+        } else if (method === "clearWorkspace") {
+            clearWorkspace();
+        } else if (method === "saveWorkspace") {
+            saveWorkspace(event.data[1])
+        } else if (method === "loadWorkspace") {
+            loadWorkspace(event.data[1]);
+        }
+    });
+    
+    // Then in browser console:
+    //> function vl(...args) { document.getElementById("game_drop").contentWindow.postMessage(args, "*") }
+    //> vl('addItem','MULT 2 (\\f x. f (f x))')
+    //> vl('clearWorkspace')
+    //> vl('saveWorkspace', 'combinators3')
+    //> vl('loadWorkspace', 'combinators3')
+
+
+
+
     </script>
 
 </body>