Skip to content

Commit b87c505

Browse files
committed
update web version
1 parent 34ab198 commit b87c505

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ path = "src/main.rs"
4242
serde = { version = "1.0.228", features = ["derive"] }
4343
cfg-if = "1.0.4"
4444
toml = "0.9.10"
45-
vga-emu = "0.8.3" # { path = "../vga-emu/" }
45+
vga-emu = "0.8.4" # { path = "../vga-emu/" }
4646
opl-emu = "0.4.2" # { path = "../opl-emu/" }
4747
web-time = "1.1.0" # std::time for web that needs an crate to be compatible :/
4848
tokio = { version = "1.48.0", default-features = false }

src/web.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub async fn iw_init(upload_id: &str) {
4141
iw_start_web(shareware_loader).expect("iw_start_web failed");
4242
}
4343

44-
async fn load_shareware_data(loader: &mut WebLoader) -> Result<(), JsValue> {
44+
pub async fn load_shareware_data(loader: &mut WebLoader) -> Result<(), JsValue> {
4545
let win = web_sys::window().unwrap();
4646

4747
let file_name = loader.file_name(assets::GRAPHIC_DICT);
@@ -124,6 +124,13 @@ pub struct WebLoader {
124124

125125
#[wasm_bindgen]
126126
impl WebLoader {
127+
pub fn new_shareware() -> WebLoader {
128+
WebLoader {
129+
variant: &assets::W3D1,
130+
files: HashMap::new(),
131+
}
132+
}
133+
127134
pub fn load(&mut self, file: String, data: Vec<u8>) {
128135
self.files.insert(file, data);
129136
}

web/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313

1414
async function run() {
1515
this.blur();
16+
document.getElementById("vga").focus();
1617
iw_init("upload");
1718
}
1819
document.getElementById("run_shareware").addEventListener("click", run);
1920
</script>
2021

21-
<canvas id="vga" style="border: 1px solid black;" width="640" height="400"></canvas>
22+
<canvas id="vga" style="border: 1px solid black;" width="640" height="400" tabindex="0"></canvas>
2223

2324
<div>
2425
<button id="run_shareware">Run shareware version</button>

0 commit comments

Comments
 (0)