diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96191a1..7da7e18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ if (NOT EMSCRIPTEN)
src/options.c
src/emulator.c
src/host.c
+ src/host-input.c
src/host-gl.c
src/host-ui-simple.c
src/joypad.c
@@ -71,6 +72,7 @@ if (NOT EMSCRIPTEN)
src/options.c
src/emulator-debug.c
src/host.c
+ src/host-input.c
src/host-gl.c
src/host-ui-imgui.cc
src/joypad.c
diff --git a/README.md b/README.md
index 1fa2b81..bf31341 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ A simple GB/GBC emulator.
* **Rewind** and seek to specific cycle
* Disable/enable each audio channel
* Disable/enable BG, Window and Sprite layers
+* **PS/2 keyboard** over link port emulation
* Convenient Python test harness using hashes to validate
* (WIP) **Debugger** with various visualizations (see below)
@@ -62,6 +63,8 @@ A simple GB/GBC emulator.
Copy the folowing files to your webserver:
* `docs/binjgb.js`
* `docs/binjgb.wasm`
+* `docs/keyboard.js`
+* `docs/binjgb.ini`
* `docs/simple.html`
* `docs/simple.js`
* `docs/simple.css`
@@ -199,6 +202,12 @@ Keys:
| Pause | Space |
| Step one frame | N |
+Keys not reserved for the joypad or the shortcuts above are sent to an
+emulated PS/2 keyboard attached to the link port. Each scan code is sent
+as two externally-clocked serial bytes holding the 11-bit PS/2 frame.
+
+Use `--no-ps2-keyboard` to disconnect the keyboard.
+
## INI file
Binjgb tries to read from `binjgb.ini` on startup for configuration. The
@@ -252,11 +261,54 @@ random-seed=0
# 0=Don't display SGB border
# 1=Display SGB border, even if it doesn't exist.
sgb-border=0
+
+# Connect an emulated PS/2 keyboard to the serial port.
+# 0=Disable
+# 1=Enable
+ps2-keyboard=1
+
+# Which unreserved keys may be sent to PS/2: all, none, or a comma-separated
+# list of physical key names (e.g. A,B,C,SPACE,RETURN).
+ps2-keys=all
```
The INI file is loaded before parsing the command line flags, so you can use
the command line to override the values in the INI file.
+### Keyboard routing
+
+Keyboard input can only go to one destination. Emulator shortcut are mapped first,
+followed by keyboard joypad binding, then PS/2 (if connected and allowed by `ps2-keys`).
+Each binding accepts `none`, or a comma-separated list of key names.
+Names are case-insensitive and use SDL scancode tokens without the `SDL_SCANCODE_` prefix:
+
+`A` through `Z`, `0` through `9`, `KP_0` through `KP_9`, `F1` through `F12`,
+`UP`, `DOWN`, `LEFT`, `RIGHT`, `RETURN`, `ESCAPE`,
+`BACKSPACE`, `TAB`, `SPACE`, `LSHIFT`, `RSHIFT`, `LCTRL`, `RCTRL`, `LALT`,
+`RALT`, `LGUI`, `RGUI`, `APPLICATION`, `CAPSLOCK`, `NUMLOCKCLEAR`, `SCROLLLOCK`,
+`INSERT`, `DELETE`, `HOME`, `END`, `PAGEUP`, `PAGEDOWN`, `MINUS`, `EQUALS`,
+`LEFTBRACKET`, `RIGHTBRACKET`, `BACKSLASH`, `SEMICOLON`, `APOSTROPHE`, `GRAVE`,
+`COMMA`, `PERIOD`, `SLASH`, `KP_PERIOD`, `KP_MULTIPLY`,
+`KP_MINUS`, `KP_PLUS`, `KP_DIVIDE`, and `KP_ENTER`.
+
+| Setting | Default |
+| --- | --- |
+| `joypad-up`, `joypad-down`, `joypad-left`, `joypad-right` | `UP`, `DOWN`, `LEFT`, `RIGHT` |
+| `joypad-b`, `joypad-a`, `joypad-start`, `joypad-select` | `Z`, `X`, `RETURN`, `TAB` |
+| `shortcut-quit` | `ESCAPE` |
+| `shortcut-save-state`, `shortcut-load-state` | `F6`, `F9` |
+| `shortcut-fullscreen` | `F11` |
+| `shortcut-audio-1` through `shortcut-audio-4` | `1` through `4` |
+| `shortcut-bg`, `shortcut-window`, `shortcut-obj` | `B`, `W`, `O` |
+| `shortcut-fast-forward`, `shortcut-rewind` | `LSHIFT`, `BACKSPACE` |
+| `shortcut-pause`, `shortcut-step` | `SPACE`, `N` |
+| `shortcut-volume-down`, `shortcut-volume-up` | `MINUS`, `EQUALS` |
+| `shortcut-palette-prev`, `shortcut-palette-next` | `LEFTBRACKET`, `RIGHTBRACKET` |
+
+Use `joypad=none` or `shortcuts=none` to clear a whole group before assigning
+individual bindings. `joypad=default` and `shortcuts=default` restore the
+respective defaults.
+
## Running tests
Run `scripts/build_tests.py` to download and build the necessary testsuites.
diff --git a/docs/binjgb.ini b/docs/binjgb.ini
new file mode 100644
index 0000000..27fbf28
--- /dev/null
+++ b/docs/binjgb.ini
@@ -0,0 +1,19 @@
+# Keyboard configuration shared by index.html and simple.html.
+# Reload the page after editing. Physical key names match the native INI.
+ps2-keyboard=1
+ps2-keys=all
+
+# Defaults preserve each page's existing joypad and shortcut bindings.
+# For a typing profile, uncomment the following block. Physical controllers
+# and the simple page's touch controls remain available.
+# joypad=none
+# shortcuts=none
+# shortcut-pause=F5
+# shortcut-save-state=F6
+# shortcut-rewind=F8
+# shortcut-load-state=F9
+# shortcut-fullscreen=F11
+
+# Leave Ctrl/Alt/Meta combinations to the browser by default. Set to 1 to
+# forward supported combinations to the emulator instead.
+capture-browser-shortcuts=0
diff --git a/docs/binjgb.js b/docs/binjgb.js
index 5cdd583..12564ec 100644
--- a/docs/binjgb.js
+++ b/docs/binjgb.js
@@ -1,2 +1,21 @@
-var Binjgb=(()=>{var _scriptName=globalThis.document?.currentScript?.src;return async function(moduleArg={}){var Module=moduleArg;var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var programArgs=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var readAsync,readBinary;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;var EXITSTATUS;class EmscriptenEH{}class EmscriptenSjLj extends EmscriptenEH{}var runtimeInitialized=false;function updateMemoryViews(){var b=wasmMemory.buffer;Module["HEAP8"]=HEAP8=new Int8Array(b);Module["HEAP16"]=HEAP16=new Int16Array(b);Module["HEAPU8"]=HEAPU8=new Uint8Array(b);Module["HEAPU16"]=HEAPU16=new Uint16Array(b);Module["HEAP32"]=HEAP32=new Int32Array(b);Module["HEAPU32"]=HEAPU32=new Uint32Array(b);Module["HEAPF32"]=HEAPF32=new Float32Array(b);Module["HEAPF64"]=HEAPF64=new Float64Array(b);HEAP64=new BigInt64Array(b);HEAPU64=new BigUint64Array(b)}function preRun(){var preRun=Module["preRun"];if(preRun){if(typeof preRun=="function")preRun=[preRun];onPreRuns.push(...preRun)}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["e"]()}function postRun(){var postRun=Module["postRun"];if(postRun){if(typeof postRun=="function")postRun=[postRun];onPostRuns.push(...postRun)}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what=`Aborted(${what})`;err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var wasmBinaryFile;function findWasmBinary(){return locateFile("binjgb.wasm")}function getBinarySync(file){if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}async function getWasmBinary(binaryFile){if(!wasmBinary){try{var response=await readAsync(binaryFile);return new Uint8Array(response)}catch{}}return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){if(!binary){try{var response=fetch(binaryFile,{credentials:"same-origin"});var instantiationResult=await WebAssembly.instantiateStreaming(response,imports);return instantiationResult}catch(reason){err(`wasm streaming compile failed: ${reason}`);err("falling back to ArrayBuffer instantiation")}}return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={a:wasmImports};return imports}async function createWasm(){function receiveInstance(instance){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();var instantiateWasm=Module["instantiateWasm"];if(instantiateWasm){return new Promise(resolve=>{instantiateWasm(info,inst=>resolve(receiveInstance(inst)))})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var HEAP16;var HEAP32;var HEAP64;var HEAP8;var HEAPF32;var HEAPF64;var HEAPU16;var HEAPU32;var HEAPU64;var HEAPU8;var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var onPreRuns=[];var noExitRuntime=true;var abortOnCannotGrowMemory=requestedSize=>{abort("OOM")};var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;abortOnCannotGrowMemory(requestedSize)};var runtimeKeepaliveCounter=0;var keepRuntimeAlive=()=>noExitRuntime||runtimeKeepaliveCounter>0;var _proc_exit=code=>{EXITSTATUS=code;if(!keepRuntimeAlive()){Module["onExit"]?.(code);ABORT=true}quit_(code,new ExitStatus(code))};var exitJS=(status,implicit)=>{EXITSTATUS=status;_proc_exit(status)};var _exit=exitJS;var printCharBuffers=[null,[],[]];var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx>10,56320|ch&1023)}}return str};var printChar=(stream,curr)=>{var buffer=printCharBuffers[stream];if(curr===0||curr===10){(stream===1?out:err)(UTF8ArrayToString(buffer));buffer.length=0}else{buffer.push(curr)}};var _fd_write=(fd,iov,iovcnt,pnum)=>{var num=0;for(var i=0;i>2];var len=HEAPU32[iov+4>>2];iov+=8;for(var j=0;j>2]=num;return 0};{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["arguments"])programArgs=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];var preInit=Module["preInit"];if(preInit){if(typeof preInit=="function")Module["preInit"]=preInit=[preInit];while(preInit.length>0){preInit.shift()()}}}var _malloc,_file_data_delete,_free,_emulator_set_builtin_palette,_emulator_was_ext_ram_updated,_emulator_read_state,_emulator_write_state,_emulator_read_ext_ram,_emulator_write_ext_ram,_emulator_delete,_emulator_get_PC,_emulator_get_A,_emulator_get_BC,_emulator_get_DE,_emulator_get_HL,_emulator_get_F,_emulator_get_SP,_emulator_set_PC,_emulator_get_wram_ptr,_emulator_get_hram_ptr,_emulator_read_mem,_emulator_write_mem,_emulator_set_breakpoint,_emulator_clear_breakpoints,_emulator_render_vram,_emulator_render_background,_emulator_get_banked_PC,_set_audio_channel_mute,_joypad_new,_joypad_delete,_rewind_append,_rewind_delete,_emulator_new_simple,_emulator_get_ticks_f64,_emulator_run_until_f64,_rewind_get_newest_ticks_f64,_rewind_get_oldest_ticks_f64,_emulator_set_default_joypad_callback,_emulator_set_bw_palette_simple,_rewind_new_simple,_rewind_begin,_emulator_set_rewind_joypad_callback,_rewind_to_ticks_wrapper,_rewind_end,_set_joyp_up,_set_joyp_down,_set_joyp_left,_set_joyp_right,_set_joyp_B,_set_joyp_A,_set_joyp_start,_set_joyp_select,_get_frame_buffer_ptr,_get_frame_buffer_size,_get_sgb_frame_buffer_ptr,_get_sgb_frame_buffer_size,_get_audio_buffer_ptr,_get_audio_buffer_capacity,_ext_ram_file_data_new,_state_file_data_new,_get_file_data_ptr,_get_file_data_size,_set_log_apu_writes,_get_apu_log_data_size,_get_apu_log_data_ptr,_reset_apu_log,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_malloc=Module["_malloc"]=wasmExports["f"];_file_data_delete=Module["_file_data_delete"]=wasmExports["g"];_free=Module["_free"]=wasmExports["h"];_emulator_set_builtin_palette=Module["_emulator_set_builtin_palette"]=wasmExports["i"];_emulator_was_ext_ram_updated=Module["_emulator_was_ext_ram_updated"]=wasmExports["j"];_emulator_read_state=Module["_emulator_read_state"]=wasmExports["k"];_emulator_write_state=Module["_emulator_write_state"]=wasmExports["l"];_emulator_read_ext_ram=Module["_emulator_read_ext_ram"]=wasmExports["m"];_emulator_write_ext_ram=Module["_emulator_write_ext_ram"]=wasmExports["n"];_emulator_delete=Module["_emulator_delete"]=wasmExports["o"];_emulator_get_PC=Module["_emulator_get_PC"]=wasmExports["p"];_emulator_get_A=Module["_emulator_get_A"]=wasmExports["q"];_emulator_get_BC=Module["_emulator_get_BC"]=wasmExports["r"];_emulator_get_DE=Module["_emulator_get_DE"]=wasmExports["s"];_emulator_get_HL=Module["_emulator_get_HL"]=wasmExports["t"];_emulator_get_F=Module["_emulator_get_F"]=wasmExports["u"];_emulator_get_SP=Module["_emulator_get_SP"]=wasmExports["v"];_emulator_set_PC=Module["_emulator_set_PC"]=wasmExports["w"];_emulator_get_wram_ptr=Module["_emulator_get_wram_ptr"]=wasmExports["x"];_emulator_get_hram_ptr=Module["_emulator_get_hram_ptr"]=wasmExports["y"];_emulator_read_mem=Module["_emulator_read_mem"]=wasmExports["z"];_emulator_write_mem=Module["_emulator_write_mem"]=wasmExports["A"];_emulator_set_breakpoint=Module["_emulator_set_breakpoint"]=wasmExports["B"];_emulator_clear_breakpoints=Module["_emulator_clear_breakpoints"]=wasmExports["C"];_emulator_render_vram=Module["_emulator_render_vram"]=wasmExports["D"];_emulator_render_background=Module["_emulator_render_background"]=wasmExports["E"];_emulator_get_banked_PC=Module["_emulator_get_banked_PC"]=wasmExports["F"];_set_audio_channel_mute=Module["_set_audio_channel_mute"]=wasmExports["G"];_joypad_new=Module["_joypad_new"]=wasmExports["H"];_joypad_delete=Module["_joypad_delete"]=wasmExports["I"];_rewind_append=Module["_rewind_append"]=wasmExports["J"];_rewind_delete=Module["_rewind_delete"]=wasmExports["K"];_emulator_new_simple=Module["_emulator_new_simple"]=wasmExports["L"];_emulator_get_ticks_f64=Module["_emulator_get_ticks_f64"]=wasmExports["M"];_emulator_run_until_f64=Module["_emulator_run_until_f64"]=wasmExports["N"];_rewind_get_newest_ticks_f64=Module["_rewind_get_newest_ticks_f64"]=wasmExports["O"];_rewind_get_oldest_ticks_f64=Module["_rewind_get_oldest_ticks_f64"]=wasmExports["P"];_emulator_set_default_joypad_callback=Module["_emulator_set_default_joypad_callback"]=wasmExports["Q"];_emulator_set_bw_palette_simple=Module["_emulator_set_bw_palette_simple"]=wasmExports["R"];_rewind_new_simple=Module["_rewind_new_simple"]=wasmExports["S"];_rewind_begin=Module["_rewind_begin"]=wasmExports["T"];_emulator_set_rewind_joypad_callback=Module["_emulator_set_rewind_joypad_callback"]=wasmExports["U"];_rewind_to_ticks_wrapper=Module["_rewind_to_ticks_wrapper"]=wasmExports["V"];_rewind_end=Module["_rewind_end"]=wasmExports["W"];_set_joyp_up=Module["_set_joyp_up"]=wasmExports["X"];_set_joyp_down=Module["_set_joyp_down"]=wasmExports["Y"];_set_joyp_left=Module["_set_joyp_left"]=wasmExports["Z"];_set_joyp_right=Module["_set_joyp_right"]=wasmExports["_"];_set_joyp_B=Module["_set_joyp_B"]=wasmExports["$"];_set_joyp_A=Module["_set_joyp_A"]=wasmExports["aa"];_set_joyp_start=Module["_set_joyp_start"]=wasmExports["ba"];_set_joyp_select=Module["_set_joyp_select"]=wasmExports["ca"];_get_frame_buffer_ptr=Module["_get_frame_buffer_ptr"]=wasmExports["da"];_get_frame_buffer_size=Module["_get_frame_buffer_size"]=wasmExports["ea"];_get_sgb_frame_buffer_ptr=Module["_get_sgb_frame_buffer_ptr"]=wasmExports["fa"];_get_sgb_frame_buffer_size=Module["_get_sgb_frame_buffer_size"]=wasmExports["ga"];_get_audio_buffer_ptr=Module["_get_audio_buffer_ptr"]=wasmExports["ha"];_get_audio_buffer_capacity=Module["_get_audio_buffer_capacity"]=wasmExports["ia"];_ext_ram_file_data_new=Module["_ext_ram_file_data_new"]=wasmExports["ja"];_state_file_data_new=Module["_state_file_data_new"]=wasmExports["ka"];_get_file_data_ptr=Module["_get_file_data_ptr"]=wasmExports["la"];_get_file_data_size=Module["_get_file_data_size"]=wasmExports["ma"];_set_log_apu_writes=Module["_set_log_apu_writes"]=wasmExports["na"];_get_apu_log_data_size=Module["_get_apu_log_data_size"]=wasmExports["oa"];_get_apu_log_data_ptr=Module["_get_apu_log_data_ptr"]=wasmExports["pa"];_reset_apu_log=Module["_reset_apu_log"]=wasmExports["qa"];memory=wasmMemory=wasmExports["d"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={c:_emscripten_resize_heap,b:_exit,a:_fd_write};async function run(){preRun();var setStatus=Module["setStatus"];if(setStatus){setStatus("Running...");await new Promise(resolve=>setTimeout(resolve,1));setTimeout(setStatus,1,"")}if(ABORT)return;initRuntime();Module["onRuntimeInitialized"]?.();postRun()}var wasmExports;wasmExports=await createWasm();await run();
-;return Module}})();if(typeof exports==="object"&&typeof module==="object"){module.exports=Binjgb;module.exports.default=Binjgb}else if(typeof define==="function"&&define["amd"])define([],()=>Binjgb);
+
+var Binjgb = (() => {
+ var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined;
+
+ return (
+function(Binjgb) {
+ Binjgb = Binjgb || {};
+
+var Module=typeof Binjgb!="undefined"?Binjgb:{};var readyPromiseResolve,readyPromiseReject;Module["ready"]=new Promise(function(resolve,reject){readyPromiseResolve=resolve;readyPromiseReject=reject});var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var read_,readAsync,readBinary,setWindowTitle;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(_scriptDir){scriptDirectory=_scriptDir}if(scriptDirectory.indexOf("blob:")!==0){scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}else{scriptDirectory=""}{read_=(url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText});if(ENVIRONMENT_IS_WORKER){readBinary=(url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)})}readAsync=((url,onload,onerror)=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=(()=>{if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response);return}onerror()});xhr.onerror=onerror;xhr.send(null)})}setWindowTitle=(title=>document.title=title)}else{}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.warn.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["quit"])quit_=Module["quit"];var wasmBinary;if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];var noExitRuntime=Module["noExitRuntime"]||true;if(typeof WebAssembly!="object"){abort("no native wasm support detected")}var wasmMemory;var ABORT=false;var EXITSTATUS;var UTF8Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf8"):undefined;function UTF8ArrayToString(heap,idx,maxBytesToRead){var endIdx=idx+maxBytesToRead;var endPtr=idx;while(heap[endPtr]&&!(endPtr>=endIdx))++endPtr;if(endPtr-idx>16&&heap.subarray&&UTF8Decoder){return UTF8Decoder.decode(heap.subarray(idx,endPtr))}else{var str="";while(idx>10,56320|ch&1023)}}}return str}function UTF8ToString(ptr,maxBytesToRead){return ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead):""}var buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferAndViews(buf){buffer=buf;Module["HEAP8"]=HEAP8=new Int8Array(buf);Module["HEAP16"]=HEAP16=new Int16Array(buf);Module["HEAP32"]=HEAP32=new Int32Array(buf);Module["HEAPU8"]=HEAPU8=new Uint8Array(buf);Module["HEAPU16"]=HEAPU16=new Uint16Array(buf);Module["HEAPU32"]=HEAPU32=new Uint32Array(buf);Module["HEAPF32"]=HEAPF32=new Float32Array(buf);Module["HEAPF64"]=HEAPF64=new Float64Array(buf)}var INITIAL_MEMORY=Module["INITIAL_MEMORY"]||16777216;var wasmTable;var __ATPRERUN__=[];var __ATINIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;var runtimeExited=false;var runtimeKeepaliveCounter=0;function keepRuntimeAlive(){return noExitRuntime||runtimeKeepaliveCounter>0}function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function initRuntime(){runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function exitRuntime(){runtimeExited=true}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}function addOnInit(cb){__ATINIT__.unshift(cb)}function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}Module["preloadedImages"]={};Module["preloadedAudios"]={};function abort(what){{if(Module["onAbort"]){Module["onAbort"](what)}}what="Aborted("+what+")";err(what);ABORT=true;EXITSTATUS=1;what+=". Build with -s ASSERTIONS=1 for more info.";var e=new WebAssembly.RuntimeError(what);readyPromiseReject(e);throw e}var dataURIPrefix="data:application/octet-stream;base64,";function isDataURI(filename){return filename.startsWith(dataURIPrefix)}var wasmBinaryFile;wasmBinaryFile="binjgb.wasm";if(!isDataURI(wasmBinaryFile)){wasmBinaryFile=locateFile(wasmBinaryFile)}function getBinary(file){try{if(file==wasmBinaryFile&&wasmBinary){return new Uint8Array(wasmBinary)}if(readBinary){return readBinary(file)}else{throw"both async and sync fetching of the wasm failed"}}catch(err){abort(err)}}function getBinaryPromise(){if(!wasmBinary&&(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER)){if(typeof fetch=="function"){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){if(!response["ok"]){throw"failed to load wasm binary file at '"+wasmBinaryFile+"'"}return response["arrayBuffer"]()}).catch(function(){return getBinary(wasmBinaryFile)})}}return Promise.resolve().then(function(){return getBinary(wasmBinaryFile)})}function createWasm(){var info={"a":asmLibraryArg};function receiveInstance(instance,module){var exports=instance.exports;Module["asm"]=exports;wasmMemory=Module["asm"]["g"];updateGlobalBufferAndViews(wasmMemory.buffer);wasmTable=Module["asm"]["O"];addOnInit(Module["asm"]["h"]);removeRunDependency("wasm-instantiate")}addRunDependency("wasm-instantiate");function receiveInstantiationResult(result){receiveInstance(result["instance"])}function instantiateArrayBuffer(receiver){return getBinaryPromise().then(function(binary){return WebAssembly.instantiate(binary,info)}).then(function(instance){return instance}).then(receiver,function(reason){err("failed to asynchronously prepare wasm: "+reason);abort(reason)})}function instantiateAsync(){if(!wasmBinary&&typeof WebAssembly.instantiateStreaming=="function"&&!isDataURI(wasmBinaryFile)&&typeof fetch=="function"){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){var result=WebAssembly.instantiateStreaming(response,info);return result.then(receiveInstantiationResult,function(reason){err("wasm streaming compile failed: "+reason);err("falling back to ArrayBuffer instantiation");return instantiateArrayBuffer(receiveInstantiationResult)})})}else{return instantiateArrayBuffer(receiveInstantiationResult)}}if(Module["instantiateWasm"]){try{var exports=Module["instantiateWasm"](info,receiveInstance);return exports}catch(e){err("Module.instantiateWasm callback failed with error: "+e);return false}}instantiateAsync().catch(readyPromiseReject);return{}}function callRuntimeCallbacks(callbacks){while(callbacks.length>0){var callback=callbacks.shift();if(typeof callback=="function"){callback(Module);continue}var func=callback.func;if(typeof func=="number"){if(callback.arg===undefined){getWasmTableEntry(func)()}else{getWasmTableEntry(func)(callback.arg)}}else{func(callback.arg===undefined?null:callback.arg)}}}var wasmTableMirror=[];function getWasmTableEntry(funcPtr){var func=wasmTableMirror[funcPtr];if(!func){if(funcPtr>=wasmTableMirror.length)wasmTableMirror.length=funcPtr+1;wasmTableMirror[funcPtr]=func=wasmTable.get(funcPtr)}return func}function _emscripten_memcpy_big(dest,src,num){HEAPU8.copyWithin(dest,src,src+num)}function abortOnCannotGrowMemory(requestedSize){abort("OOM")}function _emscripten_resize_heap(requestedSize){var oldSize=HEAPU8.length;requestedSize=requestedSize>>>0;abortOnCannotGrowMemory(requestedSize)}function _exit(status){exit(status)}var SYSCALLS={buffers:[null,[],[]],printChar:function(stream,curr){var buffer=SYSCALLS.buffers[stream];if(curr===0||curr===10){(stream===1?out:err)(UTF8ArrayToString(buffer,0));buffer.length=0}else{buffer.push(curr)}},varargs:undefined,get:function(){SYSCALLS.varargs+=4;var ret=HEAP32[SYSCALLS.varargs-4>>2];return ret},getStr:function(ptr){var ret=UTF8ToString(ptr);return ret},get64:function(low,high){return low}};function _fd_close(fd){return 0}function _fd_seek(fd,offset_low,offset_high,whence,newOffset){}function _fd_write(fd,iov,iovcnt,pnum){var num=0;for(var i=0;i>2];var len=HEAP32[iov+4>>2];iov+=8;for(var j=0;j>2]=num;return 0}var asmLibraryArg={"f":_emscripten_memcpy_big,"d":_emscripten_resize_heap,"b":_exit,"e":_fd_close,"c":_fd_seek,"a":_fd_write};var asm=createWasm();var ___wasm_call_ctors=Module["___wasm_call_ctors"]=function(){return(___wasm_call_ctors=Module["___wasm_call_ctors"]=Module["asm"]["h"]).apply(null,arguments)};var _malloc=Module["_malloc"]=function(){return(_malloc=Module["_malloc"]=Module["asm"]["i"]).apply(null,arguments)};var _file_data_delete=Module["_file_data_delete"]=function(){return(_file_data_delete=Module["_file_data_delete"]=Module["asm"]["j"]).apply(null,arguments)};var _free=Module["_free"]=function(){return(_free=Module["_free"]=Module["asm"]["k"]).apply(null,arguments)};var _emulator_set_builtin_palette=Module["_emulator_set_builtin_palette"]=function(){return(_emulator_set_builtin_palette=Module["_emulator_set_builtin_palette"]=Module["asm"]["l"]).apply(null,arguments)};var _emulator_was_ext_ram_updated=Module["_emulator_was_ext_ram_updated"]=function(){return(_emulator_was_ext_ram_updated=Module["_emulator_was_ext_ram_updated"]=Module["asm"]["m"]).apply(null,arguments)};var _emulator_read_state=Module["_emulator_read_state"]=function(){return(_emulator_read_state=Module["_emulator_read_state"]=Module["asm"]["n"]).apply(null,arguments)};var _emulator_write_state=Module["_emulator_write_state"]=function(){return(_emulator_write_state=Module["_emulator_write_state"]=Module["asm"]["o"]).apply(null,arguments)};var _emulator_read_ext_ram=Module["_emulator_read_ext_ram"]=function(){return(_emulator_read_ext_ram=Module["_emulator_read_ext_ram"]=Module["asm"]["p"]).apply(null,arguments)};var _emulator_write_ext_ram=Module["_emulator_write_ext_ram"]=function(){return(_emulator_write_ext_ram=Module["_emulator_write_ext_ram"]=Module["asm"]["q"]).apply(null,arguments)};var _emulator_delete=Module["_emulator_delete"]=function(){return(_emulator_delete=Module["_emulator_delete"]=Module["asm"]["r"]).apply(null,arguments)};var _emulator_queue_ps2_scan_code=Module["_emulator_queue_ps2_scan_code"]=function(){return(_emulator_queue_ps2_scan_code=Module["_emulator_queue_ps2_scan_code"]=Module["asm"]["s"]).apply(null,arguments)};var _emulator_clear_ps2_queue=Module["_emulator_clear_ps2_queue"]=function(){return(_emulator_clear_ps2_queue=Module["_emulator_clear_ps2_queue"]=Module["asm"]["t"]).apply(null,arguments)};var _emulator_set_ps2_keyboard_connected=Module["_emulator_set_ps2_keyboard_connected"]=function(){return(_emulator_set_ps2_keyboard_connected=Module["_emulator_set_ps2_keyboard_connected"]=Module["asm"]["u"]).apply(null,arguments)};var _emulator_get_ps2_keyboard_connected=Module["_emulator_get_ps2_keyboard_connected"]=function(){return(_emulator_get_ps2_keyboard_connected=Module["_emulator_get_ps2_keyboard_connected"]=Module["asm"]["v"]).apply(null,arguments)};var _emulator_get_PC=Module["_emulator_get_PC"]=function(){return(_emulator_get_PC=Module["_emulator_get_PC"]=Module["asm"]["w"]).apply(null,arguments)};var _emulator_get_A=Module["_emulator_get_A"]=function(){return(_emulator_get_A=Module["_emulator_get_A"]=Module["asm"]["x"]).apply(null,arguments)};var _emulator_get_BC=Module["_emulator_get_BC"]=function(){return(_emulator_get_BC=Module["_emulator_get_BC"]=Module["asm"]["y"]).apply(null,arguments)};var _emulator_get_DE=Module["_emulator_get_DE"]=function(){return(_emulator_get_DE=Module["_emulator_get_DE"]=Module["asm"]["z"]).apply(null,arguments)};var _emulator_get_HL=Module["_emulator_get_HL"]=function(){return(_emulator_get_HL=Module["_emulator_get_HL"]=Module["asm"]["A"]).apply(null,arguments)};var _emulator_get_F=Module["_emulator_get_F"]=function(){return(_emulator_get_F=Module["_emulator_get_F"]=Module["asm"]["B"]).apply(null,arguments)};var _emulator_get_SP=Module["_emulator_get_SP"]=function(){return(_emulator_get_SP=Module["_emulator_get_SP"]=Module["asm"]["C"]).apply(null,arguments)};var _emulator_set_PC=Module["_emulator_set_PC"]=function(){return(_emulator_set_PC=Module["_emulator_set_PC"]=Module["asm"]["D"]).apply(null,arguments)};var _emulator_get_wram_ptr=Module["_emulator_get_wram_ptr"]=function(){return(_emulator_get_wram_ptr=Module["_emulator_get_wram_ptr"]=Module["asm"]["E"]).apply(null,arguments)};var _emulator_get_hram_ptr=Module["_emulator_get_hram_ptr"]=function(){return(_emulator_get_hram_ptr=Module["_emulator_get_hram_ptr"]=Module["asm"]["F"]).apply(null,arguments)};var _emulator_read_mem=Module["_emulator_read_mem"]=function(){return(_emulator_read_mem=Module["_emulator_read_mem"]=Module["asm"]["G"]).apply(null,arguments)};var _emulator_write_mem=Module["_emulator_write_mem"]=function(){return(_emulator_write_mem=Module["_emulator_write_mem"]=Module["asm"]["H"]).apply(null,arguments)};var _emulator_set_breakpoint=Module["_emulator_set_breakpoint"]=function(){return(_emulator_set_breakpoint=Module["_emulator_set_breakpoint"]=Module["asm"]["I"]).apply(null,arguments)};var _emulator_clear_breakpoints=Module["_emulator_clear_breakpoints"]=function(){return(_emulator_clear_breakpoints=Module["_emulator_clear_breakpoints"]=Module["asm"]["J"]).apply(null,arguments)};var _emulator_render_vram=Module["_emulator_render_vram"]=function(){return(_emulator_render_vram=Module["_emulator_render_vram"]=Module["asm"]["K"]).apply(null,arguments)};var _emulator_render_background=Module["_emulator_render_background"]=function(){return(_emulator_render_background=Module["_emulator_render_background"]=Module["asm"]["L"]).apply(null,arguments)};var _emulator_get_banked_PC=Module["_emulator_get_banked_PC"]=function(){return(_emulator_get_banked_PC=Module["_emulator_get_banked_PC"]=Module["asm"]["M"]).apply(null,arguments)};var _set_audio_channel_mute=Module["_set_audio_channel_mute"]=function(){return(_set_audio_channel_mute=Module["_set_audio_channel_mute"]=Module["asm"]["N"]).apply(null,arguments)};var _joypad_new=Module["_joypad_new"]=function(){return(_joypad_new=Module["_joypad_new"]=Module["asm"]["P"]).apply(null,arguments)};var _joypad_delete=Module["_joypad_delete"]=function(){return(_joypad_delete=Module["_joypad_delete"]=Module["asm"]["Q"]).apply(null,arguments)};var _rewind_append=Module["_rewind_append"]=function(){return(_rewind_append=Module["_rewind_append"]=Module["asm"]["R"]).apply(null,arguments)};var _rewind_delete=Module["_rewind_delete"]=function(){return(_rewind_delete=Module["_rewind_delete"]=Module["asm"]["S"]).apply(null,arguments)};var _emulator_new_simple=Module["_emulator_new_simple"]=function(){return(_emulator_new_simple=Module["_emulator_new_simple"]=Module["asm"]["T"]).apply(null,arguments)};var _emulator_get_ticks_f64=Module["_emulator_get_ticks_f64"]=function(){return(_emulator_get_ticks_f64=Module["_emulator_get_ticks_f64"]=Module["asm"]["U"]).apply(null,arguments)};var _emulator_run_until_f64=Module["_emulator_run_until_f64"]=function(){return(_emulator_run_until_f64=Module["_emulator_run_until_f64"]=Module["asm"]["V"]).apply(null,arguments)};var _rewind_get_newest_ticks_f64=Module["_rewind_get_newest_ticks_f64"]=function(){return(_rewind_get_newest_ticks_f64=Module["_rewind_get_newest_ticks_f64"]=Module["asm"]["W"]).apply(null,arguments)};var _rewind_get_oldest_ticks_f64=Module["_rewind_get_oldest_ticks_f64"]=function(){return(_rewind_get_oldest_ticks_f64=Module["_rewind_get_oldest_ticks_f64"]=Module["asm"]["X"]).apply(null,arguments)};var _emulator_set_default_joypad_callback=Module["_emulator_set_default_joypad_callback"]=function(){return(_emulator_set_default_joypad_callback=Module["_emulator_set_default_joypad_callback"]=Module["asm"]["Y"]).apply(null,arguments)};var _emulator_set_bw_palette_simple=Module["_emulator_set_bw_palette_simple"]=function(){return(_emulator_set_bw_palette_simple=Module["_emulator_set_bw_palette_simple"]=Module["asm"]["Z"]).apply(null,arguments)};var _rewind_new_simple=Module["_rewind_new_simple"]=function(){return(_rewind_new_simple=Module["_rewind_new_simple"]=Module["asm"]["_"]).apply(null,arguments)};var _rewind_begin=Module["_rewind_begin"]=function(){return(_rewind_begin=Module["_rewind_begin"]=Module["asm"]["$"]).apply(null,arguments)};var _emulator_set_rewind_joypad_callback=Module["_emulator_set_rewind_joypad_callback"]=function(){return(_emulator_set_rewind_joypad_callback=Module["_emulator_set_rewind_joypad_callback"]=Module["asm"]["aa"]).apply(null,arguments)};var _rewind_to_ticks_wrapper=Module["_rewind_to_ticks_wrapper"]=function(){return(_rewind_to_ticks_wrapper=Module["_rewind_to_ticks_wrapper"]=Module["asm"]["ba"]).apply(null,arguments)};var _rewind_end=Module["_rewind_end"]=function(){return(_rewind_end=Module["_rewind_end"]=Module["asm"]["ca"]).apply(null,arguments)};var _set_joyp_up=Module["_set_joyp_up"]=function(){return(_set_joyp_up=Module["_set_joyp_up"]=Module["asm"]["da"]).apply(null,arguments)};var _set_joyp_down=Module["_set_joyp_down"]=function(){return(_set_joyp_down=Module["_set_joyp_down"]=Module["asm"]["ea"]).apply(null,arguments)};var _set_joyp_left=Module["_set_joyp_left"]=function(){return(_set_joyp_left=Module["_set_joyp_left"]=Module["asm"]["fa"]).apply(null,arguments)};var _set_joyp_right=Module["_set_joyp_right"]=function(){return(_set_joyp_right=Module["_set_joyp_right"]=Module["asm"]["ga"]).apply(null,arguments)};var _set_joyp_B=Module["_set_joyp_B"]=function(){return(_set_joyp_B=Module["_set_joyp_B"]=Module["asm"]["ha"]).apply(null,arguments)};var _set_joyp_A=Module["_set_joyp_A"]=function(){return(_set_joyp_A=Module["_set_joyp_A"]=Module["asm"]["ia"]).apply(null,arguments)};var _set_joyp_start=Module["_set_joyp_start"]=function(){return(_set_joyp_start=Module["_set_joyp_start"]=Module["asm"]["ja"]).apply(null,arguments)};var _set_joyp_select=Module["_set_joyp_select"]=function(){return(_set_joyp_select=Module["_set_joyp_select"]=Module["asm"]["ka"]).apply(null,arguments)};var _get_frame_buffer_ptr=Module["_get_frame_buffer_ptr"]=function(){return(_get_frame_buffer_ptr=Module["_get_frame_buffer_ptr"]=Module["asm"]["la"]).apply(null,arguments)};var _get_frame_buffer_size=Module["_get_frame_buffer_size"]=function(){return(_get_frame_buffer_size=Module["_get_frame_buffer_size"]=Module["asm"]["ma"]).apply(null,arguments)};var _get_sgb_frame_buffer_ptr=Module["_get_sgb_frame_buffer_ptr"]=function(){return(_get_sgb_frame_buffer_ptr=Module["_get_sgb_frame_buffer_ptr"]=Module["asm"]["na"]).apply(null,arguments)};var _get_sgb_frame_buffer_size=Module["_get_sgb_frame_buffer_size"]=function(){return(_get_sgb_frame_buffer_size=Module["_get_sgb_frame_buffer_size"]=Module["asm"]["oa"]).apply(null,arguments)};var _get_audio_buffer_ptr=Module["_get_audio_buffer_ptr"]=function(){return(_get_audio_buffer_ptr=Module["_get_audio_buffer_ptr"]=Module["asm"]["pa"]).apply(null,arguments)};var _get_audio_buffer_capacity=Module["_get_audio_buffer_capacity"]=function(){return(_get_audio_buffer_capacity=Module["_get_audio_buffer_capacity"]=Module["asm"]["qa"]).apply(null,arguments)};var _ext_ram_file_data_new=Module["_ext_ram_file_data_new"]=function(){return(_ext_ram_file_data_new=Module["_ext_ram_file_data_new"]=Module["asm"]["ra"]).apply(null,arguments)};var _state_file_data_new=Module["_state_file_data_new"]=function(){return(_state_file_data_new=Module["_state_file_data_new"]=Module["asm"]["sa"]).apply(null,arguments)};var _get_file_data_ptr=Module["_get_file_data_ptr"]=function(){return(_get_file_data_ptr=Module["_get_file_data_ptr"]=Module["asm"]["ta"]).apply(null,arguments)};var _get_file_data_size=Module["_get_file_data_size"]=function(){return(_get_file_data_size=Module["_get_file_data_size"]=Module["asm"]["ua"]).apply(null,arguments)};var _set_log_apu_writes=Module["_set_log_apu_writes"]=function(){return(_set_log_apu_writes=Module["_set_log_apu_writes"]=Module["asm"]["va"]).apply(null,arguments)};var _get_apu_log_data_size=Module["_get_apu_log_data_size"]=function(){return(_get_apu_log_data_size=Module["_get_apu_log_data_size"]=Module["asm"]["wa"]).apply(null,arguments)};var _get_apu_log_data_ptr=Module["_get_apu_log_data_ptr"]=function(){return(_get_apu_log_data_ptr=Module["_get_apu_log_data_ptr"]=Module["asm"]["xa"]).apply(null,arguments)};var _reset_apu_log=Module["_reset_apu_log"]=function(){return(_reset_apu_log=Module["_reset_apu_log"]=Module["asm"]["ya"]).apply(null,arguments)};var calledRun;function ExitStatus(status){this.name="ExitStatus";this.message="Program terminated with exit("+status+")";this.status=status}dependenciesFulfilled=function runCaller(){if(!calledRun)run();if(!calledRun)dependenciesFulfilled=runCaller};function run(args){args=args||arguments_;if(runDependencies>0){return}preRun();if(runDependencies>0){return}function doRun(){if(calledRun)return;calledRun=true;Module["calledRun"]=true;if(ABORT)return;initRuntime();readyPromiseResolve(Module);if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(function(){setTimeout(function(){Module["setStatus"]("")},1);doRun()},1)}else{doRun()}}Module["run"]=run;function exit(status,implicit){EXITSTATUS=status;if(keepRuntimeAlive()){}else{exitRuntime()}procExit(status)}function procExit(code){EXITSTATUS=code;if(!keepRuntimeAlive()){if(Module["onExit"])Module["onExit"](code);ABORT=true}quit_(code,new ExitStatus(code))}if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}run();
+
+
+ return Binjgb.ready
+}
+);
+})();
+if (typeof exports === 'object' && typeof module === 'object')
+ module.exports = Binjgb;
+else if (typeof define === 'function' && define['amd'])
+ define([], function() { return Binjgb; });
+else if (typeof exports === 'object')
+ exports["Binjgb"] = Binjgb;
diff --git a/docs/binjgb.wasm b/docs/binjgb.wasm
index e73aa4e..7b73b77 100644
Binary files a/docs/binjgb.wasm and b/docs/binjgb.wasm differ
diff --git a/docs/demo.js b/docs/demo.js
index 344492a..621c696 100644
--- a/docs/demo.js
+++ b/docs/demo.js
@@ -37,6 +37,7 @@ const $ = document.querySelector.bind(document);
let emulator = null;
const binjgbPromise = Binjgb();
+const keyboardConfigPromise = BinjgbKeyboard.loadConfig('binjgb.ini');
const dbPromise = idb.open('db', 1, upgradeDb => {
const objectStore = upgradeDb.createObjectStore('games', {keyPath : 'sha1'});
@@ -201,7 +202,7 @@ let vm = new Vue({
this.files.show = false;
this.loadedFile = file;
this.needsReload = false;
- Emulator.start(await binjgbPromise, romBuffer, extRamBuffer);
+ Emulator.start(await binjgbPromise, romBuffer, extRamBuffer, await keyboardConfigPromise);
emulator.setBuiltinPalette(this.pal);
},
deleteFile: async function(file) {
@@ -310,6 +311,7 @@ let vm = new Vue({
toggleOpenDialog: function() {
this.files.show = !this.files.show;
if (this.files.show) {
+ if (emulator) emulator.keyboard.releaseAll();
this.paused = true;
}
},
@@ -368,9 +370,9 @@ function makeWasmBuffer(module, ptr, size) {
}
class Emulator {
- static start(module, romBuffer, extRamBuffer) {
+ static start(module, romBuffer, extRamBuffer, keyboardConfig) {
Emulator.stop();
- emulator = new Emulator(module, romBuffer, extRamBuffer);
+ emulator = new Emulator(module, romBuffer, extRamBuffer, keyboardConfig);
emulator.run();
}
@@ -381,7 +383,7 @@ class Emulator {
}
}
- constructor(module, romBuffer, extRamBuffer) {
+ constructor(module, romBuffer, extRamBuffer, keyboardConfig) {
this.module = module;
// Align size up to 32k.
const size = (romBuffer.byteLength + 0x7fff) & ~0x7fff;
@@ -396,7 +398,8 @@ class Emulator {
throw new Error('Invalid ROM.');
}
- this.gamepad = new Gamepad(module, this.e);
+ this.joypad = new BinjgbJoypad(module, this.e);
+ this.gamepad = new Gamepad(this.joypad);
this.audio = new Audio(module, this.e);
this.video = new Video(module, this.e, $('canvas'));
this.rewind = new Rewind(module, this.e);
@@ -411,7 +414,7 @@ class Emulator {
this.loadExtRam(extRamBuffer);
}
- this.bindKeys();
+ this.bindKeys(keyboardConfig);
this.gamepad.init();
}
@@ -568,10 +571,12 @@ class Emulator {
}
runUntil(untilTicks) {
+ this.keyboard.flush();
let next60hzTicks = this.getNext60HzTicks(this.ticks);
while (true) {
const event = this.module._emulator_run_until_f64(
this.e, Math.min(untilTicks, next60hzTicks));
+ this.keyboard.flush();
if (event & EVENT_NEW_FRAME) {
this.rewind.pushBuffer();
this.video.uploadTexture();
@@ -613,45 +618,36 @@ class Emulator {
this.video.renderTexture();
}
- bindKeys() {
- this.keyFuncs = {
- 'ArrowDown': this.module._set_joyp_down.bind(null, this.e),
- 'ArrowLeft': this.module._set_joyp_left.bind(null, this.e),
- 'ArrowRight': this.module._set_joyp_right.bind(null, this.e),
- 'ArrowUp': this.module._set_joyp_up.bind(null, this.e),
- 'KeyZ': this.module._set_joyp_B.bind(null, this.e),
- 'KeyX': this.module._set_joyp_A.bind(null, this.e),
- 'Enter': this.module._set_joyp_start.bind(null, this.e),
- 'Tab': this.module._set_joyp_select.bind(null, this.e),
- 'Backspace': this.keyRewind.bind(this),
- 'Space': this.keyPause.bind(this),
- 'F6': vm.saveState.bind(vm),
- 'F9': vm.loadState.bind(vm),
- };
- this.boundKeyDown = this.keyDown.bind(this);
- this.boundKeyUp = this.keyUp.bind(this);
-
- window.addEventListener('keydown', this.boundKeyDown);
- window.addEventListener('keyup', this.boundKeyUp);
- }
-
- unbindKeys() {
- window.removeEventListener('keydown', this.boundKeyDown);
- window.removeEventListener('keyup', this.boundKeyUp);
- }
-
- keyDown(event) {
- if (event.code in this.keyFuncs) {
- this.keyFuncs[event.code](true);
- event.preventDefault();
+ bindKeys(config) {
+ const handlers = {};
+ for (const [name, button, key] of [
+ ['up', 'up', 'UP'], ['down', 'down', 'DOWN'],
+ ['left', 'left', 'LEFT'], ['right', 'right', 'RIGHT'],
+ ['a', 'A', 'X'], ['b', 'B', 'Z'],
+ ['start', 'start', 'RETURN'], ['select', 'select', 'TAB'],
+ ]) {
+ handlers[`joypad-${name}`] = {
+ keys: key, held: true,
+ callback: down => this.joypad.set(button, 'keyboard', down),
+ };
}
+ Object.assign(handlers, {
+ 'shortcut-rewind': {keys: 'BACKSPACE', held: true, callback: this.keyRewind.bind(this)},
+ 'shortcut-pause': {keys: 'SPACE', callback: this.keyPause.bind(this)},
+ 'shortcut-save-state': {keys: 'F6', callback: vm.saveState.bind(vm)},
+ 'shortcut-load-state': {keys: 'F9', callback: vm.loadState.bind(vm)},
+ 'shortcut-fullscreen': {keys: '', callback: () => {
+ if (document.fullscreenElement) document.exitFullscreen();
+ else vm.toggleFullscreen();
+ }},
+ });
+ this.keyboard = new BinjgbKeyboard(this.module, this.e, config, handlers, {
+ isCaptured: () => vm.files.show,
+ });
}
- keyUp(event) {
- if (event.code in this.keyFuncs) {
- this.keyFuncs[event.code](false);
- event.preventDefault();
- }
+ unbindKeys() {
+ this.keyboard.destroy();
}
keyRewind(isKeyDown) {
@@ -672,33 +668,27 @@ class Emulator {
}
class Gamepad {
- constructor(module, e) {
- this.module = module;
- this.e = e;
+ constructor(joypad) {
+ this.joypad = joypad;
}
// Load a key map for gamepad-to-gameboy buttons
bindKeys(strMapping) {
+ const bind = (gb_key, gp_button, type = 'button') => {
+ const button = gb_key === 'a' || gb_key === 'b' ? gb_key.toUpperCase() : gb_key;
+ return {
+ gb_key, gp_button, type,
+ gp_bind: down => this.joypad.set(button, `gamepad:${type}:${gp_button}`, down),
+ };
+ };
this.GAMEPAD_KEYMAP_STANDARD = [
- {gb_key: "b", gp_button: 0, type: "button", gp_bind:this.module._set_joyp_B.bind(null, this.e) },
- {gb_key: "a", gp_button: 1, type: "button", gp_bind:this.module._set_joyp_A.bind(null, this.e) },
- {gb_key: "select", gp_button: 8, type: "button", gp_bind:this.module._set_joyp_select.bind(null, this.e) },
- {gb_key: "start", gp_button: 9, type: "button", gp_bind:this.module._set_joyp_start.bind(null, this.e) },
- {gb_key: "up", gp_button: 12, type: "button", gp_bind:this.module._set_joyp_up.bind(null, this.e) },
- {gb_key: "down", gp_button: 13, type: "button", gp_bind:this.module._set_joyp_down.bind(null, this.e) },
- {gb_key: "left", gp_button: 14, type: "button", gp_bind:this.module._set_joyp_left.bind(null, this.e) },
- {gb_key: "right", gp_button: 15, type: "button", gp_bind:this.module._set_joyp_right.bind(null, this.e) }
+ bind('b', 0), bind('a', 1), bind('select', 8), bind('start', 9),
+ bind('up', 12), bind('down', 13), bind('left', 14), bind('right', 15),
];
-
this.GAMEPAD_KEYMAP_DEFAULT = [
- {gb_key: "a", gp_button: 0, type: "button", gp_bind:this.module._set_joyp_A.bind(null, this.e) },
- {gb_key: "b", gp_button: 1, type: "button", gp_bind:this.module._set_joyp_B.bind(null, this.e) },
- {gb_key: "select", gp_button: 2, type: "button", gp_bind:this.module._set_joyp_select.bind(null, this.e) },
- {gb_key: "start", gp_button: 3, type: "button", gp_bind:this.module._set_joyp_start.bind(null, this.e) },
- {gb_key: "up", gp_button: 2, type: "axis", gp_bind:this.module._set_joyp_up.bind(null, this.e) },
- {gb_key: "down", gp_button: 3, type: "axis", gp_bind:this.module._set_joyp_down.bind(null, this.e) },
- {gb_key: "left", gp_button: 0, type: "axis", gp_bind:this.module._set_joyp_left.bind(null, this.e) },
- {gb_key: "right", gp_button: 1, type: "axis", gp_bind:this.module._set_joyp_right.bind(null, this.e) }
+ bind('a', 0), bind('b', 1), bind('select', 2), bind('start', 3),
+ bind('up', 2, 'axis'), bind('down', 3, 'axis'),
+ bind('left', 0, 'axis'), bind('right', 1, 'axis'),
];
// Try to use the w3c "standard" gamepad mapping if available
@@ -821,6 +811,7 @@ class Gamepad {
}
releaseGamepad() {
+ this.joypad.clearSource('gamepad:');
// Stop polling the gamepad for input
if (this.gp.timerID !== undefined) {
clearInterval(this.gp.timerID);
diff --git a/docs/index.html b/docs/index.html
index d42bfab..ea6203c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -293,5 +293,6 @@
+