Commit 16716996 authored by Jakob Moser's avatar Jakob Moser
Browse files

Download new jslinux.js, reapply adjustments

parent 2370fd7b

LICENSE-3RD-PARTY.md

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ There is a downloadable JSLinux demo ZIP at https://bellard.org/tinyemu/. We sta 
  * Included missing `;`

* `static/lib/jslinux/js/jslinux.js`

  * Modified path to VM (call of `loadScript` function)

  * Modified paths to distro images

  * Modified paths to distro images (and re-introduced a default path that was lost during update)

* `static/lib/jslinux/distros/busybox/root-riscv64.cfg`

  * Modified path to hard drive file

* `static/lib/jslinux/distros/busybox/root-x86.cfg`

static/lib/jslinux/js/jslinux.js

+26 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */

"use strict";



var term, console_write1;

var term, console_write1, console_resize_event;

var graphic_display, display_key_event, display_mouse_event;

var net_state, net_write_packet, net_set_carrier;

var display_wheel_event;
@@ -505,6 +505,7 @@ function start_vm(user, pwd) 
    {

        /* C functions called from javascript */

        console_write1 = Module.cwrap('console_queue_char', null, ['number']);

        console_resize_event = Module.cwrap('console_resize_event', null, []);

        fs_import_file = Module.cwrap('fs_import_file', null, ['string', 'number', 'number']);

        display_key_event = Module.cwrap('display_key_event', null, ['number', 'number']);

        display_mouse_event = Module.cwrap('display_mouse_event', null, ['number', 'number', 'number']);
@@ -521,10 +522,23 @@ function start_vm(user, pwd) 
        pwd = null;

    }



    function term_wrap_onclick_handler()

    {

        var term_wrap_el, w, h, term_bar_el, bar_h;

        term_wrap_el = document.getElementById("term_wrap");

        term_bar_el = document.getElementById("term_bar");

        w = term_wrap_el.clientWidth;

        h = term_wrap_el.clientHeight;

        bar_h = term_bar_el.clientHeight;

        if (term.resizePixel(w, h - bar_h)) {

            console_resize_event();

        }

    }



    /* read the parameters */



    params = get_params();

    cpu = params["cpu"] || "riscv64";

    cpu = params["cpu"] || "x86";

    url = params["url"];

    if (!url) {

        if (cpu == "x86")
@@ -542,7 +556,7 @@ function start_vm(user, pwd) 
    width = (params["w"] | 0) || 1024;

    height = (params["h"] | 0) || 640;

    graphic_enable = params["graphic"] | 0;

    net_url = params["net_url"] || ""; /* empty string means no network */

    net_url = params["net_url"]; /* empty string means no network */

    if (typeof net_url == "undefined")

        net_url = "wss://relay.widgetry.org/";

    drive_url = params["drive_url"] || "";
@@ -556,13 +570,20 @@ function start_vm(user, pwd) 
    if (graphic_enable) {

        graphic_display = new GraphicDisplay(document.getElementById("term_container"), width, height);

    } else {

        var term_wrap_el;

        width = 0;

        height = 0;

        

        /* start the terminal */

        term = new Term(cols, rows, term_handler, 10000);

        term = new Term({ cols: cols, rows: rows, scrollback: 10000, fontSize: font_size });

        term.setKeyHandler(term_handler);

        term.open(document.getElementById("term_container"),

                  document.getElementById("term_paste"));

        term.term_el.style.fontSize = font_size + "px";



        term_wrap_el = document.getElementById("term_wrap")

        term_wrap_el.style.width = term.term_el.style.width;

        term_wrap_el.onclick = term_wrap_onclick_handler;

            

        term.write("Loading...\r\n");

    }