@@ -9,14 +9,23 @@
  * offered as-is, without any warranty.
  */
 
-#include <emscripten.h>
 #include <Python.h>
 PyMODINIT_FUNC initemscripten(void);
 
 int main(int argc, char**argv) {
-  Py_OptimizeFlag = 2;  // look for .pyo rather than .pyc
-  Py_InitializeEx(0);  // get rid of 'Calling stub instead of sigaction()'
+  Py_OptimizeFlag = 2; // look for .pyo rather than .pyc
+  Py_FrozenFlag   = 1; // drop <exec_prefix> warnings
+  Py_VerboseFlag  = 1; // trace modules loading
+  Py_InitializeEx(0);  // 0 = get rid of 'Calling stub instead of sigaction()'
   static struct _inittab builtins[] = { {"emscripten", initemscripten}, };
   PyImport_ExtendInittab(builtins);
   return 0;
 }
+
+// Run a line *and* display the result
+// PyRun_StringFlags only returns a non-None object with Py_eval_input (no 'print' support)
+// PyRun_InteractiveOne always reads stdin even with another 'fp', so we redirect stdin
+void pyruni() {
+  freopen("/tmp/input.py", "rb", stdin);
+  PyRun_InteractiveOne(stdin, "<stdin>");
+}
@@ -64,7 +64,7 @@
 
     <hr/>
     <textarea class="emscripten" id="output" rows="8"></textarea>
-    <input type="text" class="emscripten" id="input" name="text" value="print({'hello':'world'})"></input>
+    <input type="text" class="emscripten" id="input" name="text" value="{'hello':'world'}"></input>
     <hr>
 
     <script type='text/javascript'>
@@ -160,26 +160,29 @@
         if (ev.key === 'Enter') {
           Module.print('>>> ' + input.value);
 
-	  // Execute Python code
-          Module.cwrap('PyRun_SimpleString', 'number', ['string'])(input.value);
+          // Execute Python code
+          // Module.cwrap('PyRun_SimpleString', 'number', ['string'])(input.value);
           // or: Module.ccall('PyRun_SimpleString', 'number', ['string'], [input.value]);
+          FS.writeFile('/tmp/input.py', input.value + '\n')
+          Module.ccall('pyruni');
 
           hist[hist.length-1] = input.value;
-	  hist.push('');
-	  hist_index = hist.length - 1;
+          hist.push('');
+          hist_index = hist.length - 1;
           input.value = '';
         } else if (ev.key === 'ArrowUp') {
           hist[hist_index] = input.value;
-	  hist_index = (hist_index > 0) ? hist_index-1 : hist_index;
+          hist_index = (hist_index > 0) ? hist_index-1 : hist_index;
           input.value = hist[hist_index];
         } else if (ev.key === 'ArrowDown') {
           hist[hist_index] = input.value;
-	  hist_index = (hist_index < hist.length-1) ? hist_index+1 : hist_index;
+          hist_index = (hist_index < hist.length-1) ? hist_index+1 : hist_index;
           input.value = hist[hist_index];
         }
       };
       input.focus();
     </script>
+    <script type='text/javascript' src="pythonhome-data.js"></script>
 
     {{{ SCRIPT }}}
   </body>
 
@@ -19,13 +19,18 @@ mkdir -p $BUILD
 
 cython ../emscripten.pyx -o $BUILD/emscripten.c
 emcc $BUILD/emscripten.c -o $BUILD/emscripten.bc -I $INSTALLDIR/include/python2.7
+PREFIX=$INSTALLDIR OUTDIR=$BUILD ./package-pythonhome.sh
 emcc -o $BUILD/webprompt.html \
   webprompt-main.c $BUILD/emscripten.c \
   -I$INSTALLDIR/include/python2.7 -L$INSTALLDIR/lib -lpython2.7 \
   -s EMULATE_FUNCTION_POINTER_CASTS=1 \
   -s USE_ZLIB=1 \
   -s TOTAL_MEMORY=256MB \
-  --preload-file $INSTALLDIR/lib/python2.7@/lib/python2.7 \
+  -s FORCE_FILESYSTEM=1 \
   --shell-file webprompt-shell.html \
-  -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_Py_Initialize', '_PyRun_SimpleString']" \
+  -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_Py_Initialize', '_PyRun_SimpleString', '_pyruni']" \
   -s EXTRA_EXPORTED_RUNTIME_METHODS='["ccall", "cwrap"]'
+
+# cython ../mock/emscripten.pyx -o t/mock.c
+# gcc -g -I build/hostpython/include/python2.7 -L build/hostpython/lib/ t/mock.c webprompt-main.c -lpython2.7 -ldl -lm -lutil -lz
+# PYTHONHOME=build/hostpython/ ./a.out
@@ -11,6 +11,8 @@ Usage:
 
 See for instance [RenPyWeb](https://github.com/renpy/renpyweb).
 
+Web demo: <https://www.beuc.net/python-emscripten/demo/>
+
 Mirrors:
 
 - <https://gitlab.com/python-emscripten/python>