Update to rust 1.89.0 (#540)

* some clippy fixes

* more

.cargo/config.toml

@@ -1,5 +1,16 @@
+[target.'cfg(target_os = "linux")']
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
+
+[target.'cfg(target_os = "windows")']
+linker = "rust-lld"
+
 [target.'cfg(target_arch = "x86_64")']
 rustflags = ["-C", "target-cpu=x86-64-v3"]
 
 [target.'cfg(target_arch = "aarch64")']
 rustflags = ["-C", "target-cpu=cortex-a76"]
+
+[env]
+CC = "clang"
+CXX = "clang++"
+AR = "llvm-ar"

.github/dependabot.yml

@@ -4,7 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "daily"
+# - package-ecosystem: "cargo"
+#   directory: "/"
+#   schedule:
+#     interval: "daily"

.github/workflows/build.yml

@@ -5,6 +5,8 @@ permissions:
 on:
   push:
     branches: ["main"]
+    tags:
+      - "v*"
   pull_request:
     branches: ["main"]
 
@@ -21,9 +23,11 @@ jobs:
           - os: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             arch: linux-x86_64
+            llvm: X64
           - os: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
             arch: linux-aarch64
+            llvm: ARM64
     steps:
       - uses: actions/checkout@v4
         with:
@@ -32,6 +36,8 @@ jobs:
         with:
           target: ${{ matrix.target }}
           rustflags: ""
+      - name: Set LLVM_VERSION
+        run: echo "LLVM_VERSION=$(rustc --version --verbose | grep "LLVM version" | cut -d':' -f2 | xargs)" >> $GITHUB_ENV
       - name: Install SDL Dependencies
         # https://wiki.libsdl.org/SDL3/README-linux#build-dependencies
         uses: awalsh128/cache-apt-pkgs-action@v1
@@ -44,6 +50,11 @@ jobs:
             libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \
             libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
           version: ${{ matrix.target }}-1.0
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v2
+        with:
+          version: ${{ env.LLVM_VERSION }}
+          force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-Linux-${{ matrix.llvm }}.tar.xz
       - name: Build
         run: |
           cargo build --release -v --target=${{ matrix.target }}
@@ -56,13 +67,19 @@ jobs:
           path: output/gopher64-${{ matrix.arch }}
 
   build-windows:
-    runs-on: windows-2025
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: x86_64-pc-windows-msvc
+          - os: windows-2025
+            target: x86_64-pc-windows-msvc
             arch: windows-x86_64
+            llvm: win64
+          #- os: windows-11-arm
+          #  target: aarch64-pc-windows-msvc
+          #  arch: windows-aarch64
+          #  llvm: woa64
     steps:
       - uses: actions/checkout@v4
         with:
@@ -71,19 +88,40 @@ jobs:
         with:
           target: ${{ matrix.target }}
           rustflags: ""
+      - name: Set LLVM_VERSION
+        run: |
+          $llvm_version = rustc --version --verbose | Select-String "LLVM version" | ForEach-Object { $_.Line.Split(":")[1].Trim() }
+          echo "LLVM_VERSION=$llvm_version" >> $env:GITHUB_ENV
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v2
+        with:
+          version: ${{ env.LLVM_VERSION }}
+          force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-${{ matrix.llvm }}.exe
       - name: Build
         run: |
           cargo build --release -v --target=${{ matrix.target }}
           mkdir output
           cp target/${{ matrix.target }}/release/gopher64.exe output/gopher64-${{ matrix.arch }}.exe
-      - name: Upload file
+      - name: Upload unsigned artifact
+        id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
           name: gopher64-${{ matrix.arch }}
           path: output/gopher64-${{ matrix.arch }}.exe
+      - name: SignPath
+        if: ${{ github.ref_type == 'tag' }}
+        uses: signpath/github-action-submit-signing-request@v1.3
+        with:
+          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
+          organization-id: "${{ secrets.SIGNPATH_ORG_ID }}"
+          project-slug: "gopher64"
+          artifact-configuration-slug: "gopher64-${{ matrix.arch }}"
+          signing-policy-slug: "release-signing"
+          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
+          wait-for-completion: false
 
   build-macos:
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
@@ -105,6 +143,8 @@ jobs:
           cargo build --release -v --target=${{ matrix.target }}
           mkdir output
           cp target/${{ matrix.target }}/release/gopher64 output/gopher64-${{ matrix.arch }}
+        env:
+          AR: ar
       - name: Upload file
         uses: actions/upload-artifact@v4
         with:

.github/workflows/lint.yml

@@ -22,6 +22,8 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: clippy, rustfmt
+      - name: Set LLVM_VERSION
+        run: echo "LLVM_VERSION=$(rustc --version --verbose | grep "LLVM version" | cut -d':' -f2 | xargs)" >> $GITHUB_ENV
       - name: Install SDL Dependencies
         # https://wiki.libsdl.org/SDL3/README-linux#build-dependencies
         uses: awalsh128/cache-apt-pkgs-action@v1
@@ -34,6 +36,11 @@ jobs:
             libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \
             libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
           version: lint-1.0
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v2
+        with:
+          version: ${{ env.LLVM_VERSION }}
+          force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-Linux-X64.tar.xz
       - name: Rustfmt Check
         uses: actions-rust-lang/rustfmt@v1
       - name: Lint

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "parallel-rdp/parallel-rdp-standalone"]
 	path = parallel-rdp/parallel-rdp-standalone
-	url = https://github.com/Themaister/parallel-rdp-standalone.git
+	url = https://github.com/gopher64/parallel-rdp-standalone.git
+	branch = gopher64
+[submodule "src/compat/sse2neon"]
+	path = src/compat/sse2neon
+	url = https://github.com/DLTcollab/sse2neon.git

Cargo.toml

@@ -1,32 +1,34 @@
 [package]
 name = "gopher64"
-version = "1.0.17"
+version = "1.1.3"
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.89"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 dirs = "6.0"
-zip = "4.0"
+zip = "4.3"
 governor = "0.10"
-sevenz-rust2 = { version = "0.14", default-features = false }
+sevenz-rust2 = { version = "0.17", default-features = false }
 chrono = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde-big-array = "0.5"
-eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] }
+slint = { version = "1.12", default-features = false, features = ["compat-1-2", "std", "backend-winit", "renderer-femtovg"] }
+open = "5.3"
 sha2 = "0.10"
-ab_glyph = "0.2"
 sdl3-sys = { version = "0.5", features = ["build-from-source-static"] }
+sdl3-ttf-sys = { version = "0.2", features = ["build-static-vendored", "no-sdlttf-harfbuzz", "no-sdlttf-plutosvg"] }
 rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] }
-tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] }
+tokio = {version = "1.46", features = ["rt-multi-thread", "macros"] }
 spin_sleep = "1.3"
 encoding_rs = "0.8"
 mimalloc = "0.1"
 regex = "1.11"
-tungstenite = "0.26"
-socket2 = "0.5"
+tokio-tungstenite = "0.27"
+futures = "0.3"
+socket2 = { version = "0.6", features = ["all"] }
 rand_chacha = "0.9"
 fatfs = "0.3"
 semver = "1.0"
@@ -36,10 +38,10 @@ reqwest = { version = "0.12", default-features = false, features = ["http2","rus
 
 [build-dependencies]
 winresource = "0.1"
-bindgen = "0.71"
+bindgen = "0.72"
+slint-build = "1.12"
 cc = { version = "1.2", features = ["parallel"] }
 
 [profile.release]
-codegen-units = 1
-strip = true
 panic = "abort"
+lto = "thin"

README.md

@@ -1,7 +1,9 @@
 # gopher64
 ## download
 
-https://github.com/gopher64/gopher64/releases
+Windows: https://github.com/gopher64/gopher64/releases/latest/download/gopher64-windows-x86_64.exe
+
+Linux: https://flathub.org/apps/io.github.gopher64.gopher64
 
 ## wiki
 
@@ -15,13 +17,9 @@ https://discord.gg/9RGXq8W8JQ
 
 Keys are mapped according to [these defaults](https://github.com/gopher64/gopher64/wiki/Default-Keyboard-Setup). Xbox-style controllers also have a [default mapping applied](https://github.com/gopher64/gopher64/wiki/Default-Gamepad-Setup).
 
-You can create your mappings by running `./gopher64 --configure-input-profile my_profile`. You then bind that profile to a port: `./gopher64 --bind-input-profile my_profile --port 1`
-
-To use a controller (for example, an Xbox controller), run `./gopher64 --list-controllers` to get a list of attached controllers, and then assign it by doing `./gopher64 --assign-controller <controller_number> --port 1`
-
 ## netplay
 
-Gopher64 supports netplay (online play with others). It has a few public netplay servers. If you are interested in running a public netplay server, please let me know (open an issue or discussion or contact me on Discord). You can also run the server (https://github.com/gopher64/gopher64-netplay-server) yourself on a LAN.
+Gopher64 supports netplay (online play with others) via cloud hosted servers. You can also run the server (https://github.com/gopher64/gopher64-netplay-server) yourself on a LAN.
 
 ## portable mode
 
@@ -35,12 +33,6 @@ If you want to run the flatpak from the command line, you need to add the `--fil
 flatpak run --filesystem=host:ro io.github.gopher64.gopher64 /path/to/rom.z64
 ```
 
-## goals
-
-1. Performance. I want to be able to use this emulator on my laptop.
-2. Easy to use.
-3. Easy to work on. Dynamic recompilers perform well, but they are very hard to read and understand. This emulator will only have interpreters for the CPU and RSP. Additionally, it is completely written in Rust (besides Parallel-RDP), a modern programming language with a growing user base. I've tried to avoid the use of macros, which can reduce some repetitiveness in the code but also reduce readability.
-
 ## building and usage
 
 1. Linux only: install the SDL3 dependencies: https://wiki.libsdl.org/SDL3/README-linux#build-dependencies
@@ -57,3 +49,9 @@ I am very open to contributions! Please contact me via a GitHub issue or Discord
 ## license
 
 Gopher64 is licensed under the GPLv3 license. Many portions of gopher64 have been adapted from mupen64plus and/or ares. The license for mupen64plus can be found here: https://github.com/mupen64plus/mupen64plus-core/blob/master/LICENSES. The license for ares can be found here: https://github.com/ares-emulator/ares/blob/master/LICENSE.
+
+## privacy and code signing policy
+
+Free code signing for the Windows release is provided by [SignPath.io](https://about.signpath.io), certificate by [SignPath Foundation](https://signpath.org).
+
+During online netplay sessions, the server logs your IP address and basic session information (game title and session name) for operational purposes. No additional personal data is collected or stored.

build.rs

@@ -2,12 +2,21 @@ fn main() {
     println!("cargo::rerun-if-changed=parallel-rdp");
     println!("cargo::rerun-if-changed=src/compat");
 
+    let slint_config = slint_build::CompilerConfiguration::new().with_style("cosmic".into());
+    slint_build::compile_with_config("src/ui/gui/appwindow.slint", slint_config).unwrap();
+
     let mut simd_build = cc::Build::new();
-    let mut build = cc::Build::new();
-    build
+    let mut volk_build = cc::Build::new();
+    volk_build
+        .std("c17")
+        .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
+        .file("parallel-rdp/parallel-rdp-standalone/volk/volk.c");
+    let mut rdp_build = cc::Build::new();
+    rdp_build
         .cpp(true)
-        .warnings(false)
-        .std("c++17")
+        .std("c++23")
+        .flag("-Wno-unused-parameter")
+        .flag("-Wno-missing-field-initializers")
         .file("parallel-rdp/parallel-rdp-standalone/parallel-rdp/command_ring.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_device.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_dump_write.cpp")
@@ -27,6 +36,7 @@ fn main() {
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/image.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/indirect_layout.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/memory_allocator.cpp")
+        .file("parallel-rdp/parallel-rdp-standalone/vulkan/pipeline_cache.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/pipeline_event.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/query_pool.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/vulkan/render_pass.cpp")
@@ -44,7 +54,6 @@ fn main() {
         .file("parallel-rdp/parallel-rdp-standalone/util/timeline_trace_file.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/util/environment.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/util/thread_name.cpp")
-        .file("parallel-rdp/parallel-rdp-standalone/volk/volk.c")
         .file("parallel-rdp/interface.cpp")
         .file("parallel-rdp/wsi_platform.cpp")
         .include("parallel-rdp/parallel-rdp-standalone/parallel-rdp")
@@ -55,47 +64,44 @@ fn main() {
         .include(
             std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap())
                 .join("include"),
+        )
+        .include(
+            std::path::PathBuf::from(std::env::var("DEP_SDL3_TTF_OUT_DIR").to_owned().unwrap())
+                .join("include"),
         );
 
     let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
     let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-    let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    let profile = std::env::var("PROFILE").unwrap();
+    let opt_flag = if arch == "x86_64" {
+        "-march=x86-64-v3"
+    } else if arch == "aarch64" {
+        "-march=armv8.2-a"
+    } else {
+        panic!("unknown arch")
+    };
+
+    volk_build.flag(opt_flag);
+    rdp_build.flag(opt_flag);
+    simd_build.flag(opt_flag);
+
     if os == "windows" {
-        if arch == "x86_64" {
-            if env == "msvc" {
-                build.flag("/arch:AVX2");
-            } else if env == "gnu" {
-                build.flag("-march=x86-64-v3");
-            } else {
-                panic!("unknown env")
-            }
-        } else if arch == "aarch64" {
-            panic!("unsupported platform")
-        } else {
-            panic!("unknown arch")
-        }
-        build.flag("-DVK_USE_PLATFORM_WIN32_KHR");
+        volk_build.flag("-DVK_USE_PLATFORM_WIN32_KHR");
+        rdp_build.flag("-DVK_USE_PLATFORM_WIN32_KHR");
 
         winresource::WindowsResource::new()
-            .set_icon("data/icon.ico")
+            .set_icon("data/icon/icon.ico")
             .compile()
             .unwrap();
-    } else if os == "linux" || os == "macos" {
-        if arch == "x86_64" {
-            build.flag("-march=x86-64-v3");
-        } else if arch == "aarch64" {
-            build.flag("-march=armv8.2-a");
-            simd_build.flag("-march=armv8.2-a");
-            simd_build.flag("-DSSE2NEON_SUPPRESS_WARNINGS");
-            simd_build.file("src/compat/aarch64.c");
-        } else {
-            panic!("unknown arch")
-        }
-    } else {
-        panic!("unknown OS")
     }
 
-    build.compile("parallel-rdp");
+    if profile == "release" {
+        volk_build.flag("-flto=thin");
+        rdp_build.flag("-flto=thin");
+        simd_build.flag("-flto=thin");
+    }
+    volk_build.compile("volk");
+    rdp_build.compile("parallel-rdp");
 
     let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
 
@@ -106,6 +112,7 @@ fn main() {
         .allowlist_function("rdp_set_vi_register")
         .allowlist_function("rdp_update_screen")
         .allowlist_function("rdp_process_commands")
+        .allowlist_function("rdp_onscreen_message")
         .allowlist_function("rdp_check_callback")
         .allowlist_function("rdp_new_processor")
         .allowlist_function("rdp_state_size")
@@ -121,7 +128,7 @@ fn main() {
 
     if arch == "aarch64" {
         let simd_bindings = bindgen::Builder::default()
-            .header("src/compat/sse2neon/v1.8.0/sse2neon.h")
+            .header("src/compat/sse2neon/sse2neon.h")
             .allowlist_function("_mm_setzero_si128")
             .allowlist_function("_mm_set_epi8")
             .allowlist_function("_mm_movemask_epi8")
@@ -166,9 +173,14 @@ fn main() {
             .write_to_file(out_path.join("simd_bindings.rs"))
             .expect("Couldn't write bindings!");
 
-        simd_build.file(std::env::temp_dir().join("bindgen").join("extern.c"));
-        simd_build.include(".");
-        simd_build.compile("simd");
+        simd_build
+            .std("c17")
+            .flag("-D_POSIX_C_SOURCE=200112L")
+            .flag("-DSSE2NEON_SUPPRESS_WARNINGS")
+            .file("src/compat/aarch64.c")
+            .file(std::env::temp_dir().join("bindgen").join("extern.c"))
+            .include(".")
+            .compile("simd");
     }
 
     let git_output = std::process::Command::new("git")
@@ -177,7 +189,7 @@ fn main() {
         .unwrap();
 
     let git_hash = String::from_utf8(git_output.stdout).unwrap();
-    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+    println!("cargo:rustc-env=GIT_HASH={git_hash}");
 
     println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024);
 }

data/icon/generate.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+magick gopher64.png -resize 512x512 gopher64_512x512.png
+magick gopher64.png -resize 256x256 gopher64_256x256.png
+magick gopher64.png -resize 128x128 gopher64_128x128.png
+magick gopher64.png -resize 256x256 icon.ico

parallel-rdp/interface.cpp

@@ -5,6 +5,7 @@
 #include "spirv.hpp"
 #include "spirv_crt.hpp"
 #include <SDL3/SDL_vulkan.h>
+#include <SDL3_ttf/SDL_ttf.h>
 
 using namespace Vulkan;
 
@@ -58,6 +59,8 @@ typedef struct
 	int cmd_cur;
 	int cmd_ptr;
 	uint32_t region;
+	uint64_t vi_counter;
+	uint64_t last_sync;
 } RDP_DEVICE;
 
 static SDL_Window *window;
@@ -72,6 +75,12 @@ static GFX_INFO gfx_info;
 static const uint32_t *fragment_spirv;
 static size_t fragment_size;
 
+static TTF_Font *message_font;
+static std::queue<std::string> messages;
+static uint64_t message_timer;
+
+#define MESSAGE_TIME 3000 // 3 seconds
+
 typedef struct
 {
 	float SourceSize[4];
@@ -149,6 +158,7 @@ bool sdl_event_filter(void *userdata, SDL_Event *event)
 {
 	if (event->type == SDL_EVENT_WINDOW_CLOSE_REQUESTED)
 	{
+		callback.paused = false;
 		callback.emu_running = false;
 	}
 	else if (event->type == SDL_EVENT_WINDOW_RESIZED && callback.emu_running)
@@ -172,6 +182,12 @@ bool sdl_event_filter(void *userdata, SDL_Event *event)
 				callback.enable_speedlimiter = !callback.enable_speedlimiter;
 			}
 			break;
+		case SDL_SCANCODE_P:
+			if (event->key.mod & SDL_KMOD_ALT)
+			{
+				callback.paused = !callback.paused;
+			}
+			break;
 		case SDL_SCANCODE_ESCAPE:
 			if (gfx_info.fullscreen)
 				callback.emu_running = false;
@@ -191,6 +207,24 @@ bool sdl_event_filter(void *userdata, SDL_Event *event)
 		case SDL_SCANCODE_RIGHTBRACKET:
 			callback.raise_volume = true;
 			break;
+		case SDL_SCANCODE_0:
+		case SDL_SCANCODE_1:
+		case SDL_SCANCODE_2:
+		case SDL_SCANCODE_3:
+		case SDL_SCANCODE_4:
+		case SDL_SCANCODE_5:
+		case SDL_SCANCODE_6:
+		case SDL_SCANCODE_7:
+		case SDL_SCANCODE_8:
+		case SDL_SCANCODE_9:
+			if (event->key.mod & SDL_KMOD_ALT)
+			{
+				if (event->key.scancode == SDL_SCANCODE_0)
+					callback.save_state_slot = 0;
+				else
+					callback.save_state_slot = event->key.scancode - SDL_SCANCODE_1 + 1;
+			}
+			break;
 		default:
 			break;
 		}
@@ -223,9 +257,28 @@ void rdp_new_processor(GFX_INFO _gfx_info)
 	processor = new RDP::CommandProcessor(wsi->get_device(), gfx_info.RDRAM, 0, gfx_info.RDRAM_SIZE, gfx_info.RDRAM_SIZE / 2, flags);
 }
 
-void rdp_init(void *_window, GFX_INFO _gfx_info)
+static ImageHandle create_message_image(Vulkan::Device &device, int width, const char *message)
 {
+	SDL_Color fg = {255, 255, 255, 255};
+	SDL_Color bg = {0, 0, 0, 0};
+	SDL_Surface *surface = TTF_RenderText_LCD_Wrapped(message_font, message, 0, fg, bg, width);
+	ImageCreateInfo info = ImageCreateInfo::immutable_2d_image(surface->w, surface->h, VK_FORMAT_B8G8R8A8_UNORM, false);
+	ImageInitialData initial_data = {};
+	initial_data.data = surface->pixels;
+	initial_data.row_length = surface->pitch / 4;
+	initial_data.image_height = surface->h;
+
+	ImageHandle handle = device.create_image(info, &initial_data);
+	SDL_DestroySurface(surface);
+	return handle;
+}
+
+void rdp_init(void *_window, GFX_INFO _gfx_info, const void *font, size_t font_size)
+{
+	memset(&rdp_device, 0, sizeof(RDP_DEVICE));
+
 	window = (SDL_Window *)_window;
+	SDL_SyncWindow(window);
 	bool result = SDL_AddEventWatch(sdl_event_filter, nullptr);
 	if (!result)
 	{
@@ -257,32 +310,51 @@ void rdp_init(void *_window, GFX_INFO _gfx_info)
 	if (!::Vulkan::Context::init_loader((PFN_vkGetInstanceProcAddr)SDL_Vulkan_GetVkGetInstanceProcAddr()))
 	{
 		rdp_close();
+		return;
 	}
 	if (!wsi->init_simple(1, handles))
 	{
 		rdp_close();
+		return;
 	}
 
 	rdp_new_processor(gfx_info);
 
 	if (!processor->device_is_supported())
 	{
-		delete processor;
-		delete wsi;
-		processor = nullptr;
 		rdp_close();
+		return;
 	}
+
+	message_font = TTF_OpenFontIO(SDL_IOFromConstMem(font, font_size), true, 30.0);
+	if (!message_font)
+	{
+		rdp_close();
+		return;
+	}
+
 	wsi->begin_frame();
 
 	callback.emu_running = true;
 	callback.enable_speedlimiter = true;
+	callback.paused = false;
+	callback.save_state_slot = 0;
 	crop_letterbox = false;
+
+	messages = std::queue<std::string>();
+	message_timer = 0;
 }
 
 void rdp_close()
 {
-	wsi->end_frame();
+	if (wsi)
+		wsi->end_frame();
 
+	if (message_font)
+	{
+		TTF_CloseFont(message_font);
+		message_font = nullptr;
+	}
 	if (processor)
 	{
 		delete processor;
@@ -412,11 +484,30 @@ static void render_frame(Vulkan::Device &device)
 				cmd->push_constants(&push, 0, sizeof(push));
 			}
 
-			cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::LinearClamp);
+			cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::NearestClamp);
 			cmd->set_viewport(vp);
 			// The vertices are constants in the shader.
 			// Draws fullscreen quad using oversized triangle.
 			cmd->draw(3);
+
+			if (!messages.empty())
+			{
+				Vulkan::ImageHandle message_image = create_message_image(device, vp.width, messages.front().c_str());
+				cmd->set_texture(0, 0, message_image->get_view(), Vulkan::StockSampler::NearestClamp);
+				vp.x = vp.x + (vp.width - message_image->get_width()) / 2;
+				vp.y = vp.y + vp.height - message_image->get_height();
+				vp.height = message_image->get_height();
+				vp.width = message_image->get_width();
+				cmd->set_viewport(vp);
+
+				cmd->draw(3);
+
+				if (SDL_GetTicks() > message_timer)
+				{
+					messages.pop();
+					message_timer = SDL_GetTicks() + MESSAGE_TIME;
+				}
+			}
 		}
 
 		cmd->end_render_pass();
@@ -435,6 +526,7 @@ void rdp_update_screen()
 	render_frame(device);
 	wsi->end_frame();
 	wsi->begin_frame();
+	rdp_device.vi_counter += 1;
 }
 
 CALL_BACK rdp_check_callback()
@@ -462,6 +554,13 @@ void rdp_load_state(const uint8_t *state)
 	memcpy(&rdp_device, state, sizeof(RDP_DEVICE));
 }
 
+void rdp_onscreen_message(const char *_message)
+{
+	if (messages.empty())
+		message_timer = SDL_GetTicks() + MESSAGE_TIME;
+	messages.push(_message);
+}
+
 uint64_t rdp_process_commands()
 {
 	uint64_t interrupt_timer = 0;
@@ -542,11 +641,17 @@ uint64_t rdp_process_commands()
 			break;
 		}
 		case RDP::Op::SyncFull:
-			processor->wait_for_timeline(processor->signal_timeline());
+			if (rdp_device.last_sync != rdp_device.vi_counter)
+			{
+				processor->wait_for_timeline(processor->signal_timeline());
+				rdp_device.last_sync = rdp_device.vi_counter;
+			}
 			interrupt_timer = rdp_device.region;
 			if (interrupt_timer == 0)
 				interrupt_timer = 5000;
 			break;
+		default:
+			break;
 		}
 
 		rdp_device.cmd_cur += cmd_length;

parallel-rdp/interface.hpp

@@ -33,14 +33,17 @@ extern "C"
 		bool enable_speedlimiter;
 		bool lower_volume;
 		bool raise_volume;
+		bool paused;
+		uint32_t save_state_slot;
 	} CALL_BACK;
 
-	void rdp_init(void *_window, GFX_INFO _gfx_info);
+	void rdp_init(void *_window, GFX_INFO _gfx_info, const void *font, size_t font_size);
 	void rdp_close();
 	void rdp_set_vi_register(uint32_t reg, uint32_t value);
 	void rdp_update_screen();
 	CALL_BACK rdp_check_callback();
 	uint64_t rdp_process_commands();
+	void rdp_onscreen_message(const char *_message);
 	void rdp_new_processor(GFX_INFO _gfx_info);
 	size_t rdp_state_size();
 	void rdp_save_state(uint8_t *state);

parallel-rdp/wsi_platform.cpp

@@ -56,7 +56,6 @@ bool SDL_WSIPlatform::alive(Vulkan::WSI &wsi)
 
 void SDL_WSIPlatform::poll_input()
 {
-	SDL_PumpEvents();
 }
 
 void SDL_WSIPlatform::poll_input_async(Granite::InputTrackerHandler *handler)

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.87.0"
+channel = "1.89.0"

src/cheats.rs

@@ -0,0 +1,189 @@
+use crate::device;
+use crate::ui;
+
+#[derive(serde::Serialize, serde::Deserialize, Copy, Clone)]
+pub struct DecodedCheat {
+    code_type: u8,
+    address: u32,
+    data: u16,
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct Cheats {
+    pub cheats: Vec<Vec<DecodedCheat>>,
+    pub boot: bool,
+    pub enabled: bool,
+}
+
+pub fn init(
+    device: &mut device::Device,
+    cheat_settings: std::collections::HashMap<String, Option<String>>,
+) {
+    let cheats =
+        serde_json::from_slice::<ui::cheats::Cheats>(include_bytes!("../data/cheats.json"))
+            .unwrap()
+            .get(&ui::storage::get_game_crc(&device.cart.rom))
+            .cloned()
+            .unwrap_or_default();
+
+    let re = regex::Regex::new(r"\?+").unwrap();
+    for cheat_setting in cheat_settings.iter() {
+        if let Some(cheat_data) = cheats.get(cheat_setting.0) {
+            let mut option_value = None;
+            if let Some(option) = cheat_setting.1 {
+                if let Some(found_option_value) = cheat_data
+                    .options
+                    .as_ref()
+                    .cloned()
+                    .unwrap_or_default()
+                    .get(option)
+                {
+                    option_value = Some(found_option_value.to_string());
+                } else {
+                    panic!("Cheat option: {option} not found");
+                }
+            }
+
+            println!(
+                "Cheat: {} Option: {}",
+                cheat_setting.0,
+                cheat_setting.1.clone().unwrap_or("none".to_string())
+            );
+            let mut decoded_cheat: Vec<DecodedCheat> = vec![];
+            for code in cheat_data.data.iter() {
+                let mut result = code.clone();
+                if let Some(option_value) = option_value.as_ref() {
+                    result = re.replace_all(code, option_value).into_owned();
+                }
+                let mut split = result.split_whitespace();
+                let first_part = u32::from_str_radix(split.next().unwrap(), 16).unwrap();
+                decoded_cheat.push(DecodedCheat {
+                    code_type: (first_part >> 24) as u8,
+                    address: first_part & 0x00FFFFFF,
+                    data: u16::from_str_radix(split.next().unwrap(), 16).unwrap(),
+                });
+            }
+            device.cheats.cheats.push(decoded_cheat);
+        } else {
+            println!("Could not find cheat: {}", cheat_setting.0);
+        }
+    }
+
+    if !device.cheats.cheats.is_empty() {
+        device.cheats.enabled = true;
+        ui::video::onscreen_message(&device.ui, "Cheats enabled");
+    }
+}
+
+fn write_byte(device: &mut device::Device, cheat_line: &DecodedCheat) {
+    *device
+        .rdram
+        .mem
+        .get_mut(cheat_line.address as usize ^ device.byte_swap)
+        .unwrap_or(&mut 0) = cheat_line.data as u8;
+}
+
+fn write_half(device: &mut device::Device, cheat_line: &DecodedCheat) {
+    *device
+        .rdram
+        .mem
+        .get_mut(cheat_line.address as usize ^ device.byte_swap)
+        .unwrap_or(&mut 0) = (cheat_line.data >> 8) as u8;
+    *device
+        .rdram
+        .mem
+        .get_mut((cheat_line.address + 1) as usize ^ device.byte_swap)
+        .unwrap_or(&mut 0) = cheat_line.data as u8;
+}
+
+fn equal_byte(device: &mut device::Device, cheat_line: &DecodedCheat) -> bool {
+    let current_value = *device
+        .rdram
+        .mem
+        .get(cheat_line.address as usize ^ device.byte_swap)
+        .unwrap_or(&0);
+    current_value == (cheat_line.data as u8)
+}
+
+fn equal_half(device: &mut device::Device, cheat_line: &DecodedCheat) -> bool {
+    let current_value1 = *device
+        .rdram
+        .mem
+        .get(cheat_line.address as usize ^ device.byte_swap)
+        .unwrap_or(&0);
+    let current_value2 = *device
+        .rdram
+        .mem
+        .get((cheat_line.address + 1) as usize ^ device.byte_swap)
+        .unwrap_or(&0);
+    current_value1 == (cheat_line.data >> 8) as u8 && current_value2 == cheat_line.data as u8
+}
+
+pub fn execute_cheats(device: &mut device::Device, cheats: Vec<Vec<DecodedCheat>>) {
+    for cheat in cheats.iter() {
+        let mut valid = true;
+        let mut cheat_iter = cheat.iter().peekable();
+        while let Some(cheat_line) = cheat_iter.next() {
+            match cheat_line.code_type {
+                0x50 => {
+                    if valid {
+                        let mut expanded_cheat: Vec<DecodedCheat> = vec![];
+                        let compressed_cheat = *cheat_iter.peek().unwrap();
+                        let count = (cheat_line.address & 0xFF00) >> 8;
+                        let offset = cheat_line.address & 0xFF;
+                        for i in 0..count {
+                            let line = DecodedCheat {
+                                code_type: compressed_cheat.code_type,
+                                address: compressed_cheat.address + (i * offset),
+                                data: compressed_cheat.data
+                                    + (i as i16 * cheat_line.data as i16) as u16,
+                            };
+                            expanded_cheat.push(line);
+                        }
+                        execute_cheats(device, [expanded_cheat].to_vec());
+                    }
+                    valid = false; // skip the next line
+                }
+                0x80 | 0xA0 => {
+                    if valid {
+                        write_byte(device, cheat_line);
+                    }
+                    valid = true;
+                }
+                0x81 | 0xA1 => {
+                    if valid {
+                        write_half(device, cheat_line);
+                    }
+                    valid = true;
+                }
+                0xF0 => {
+                    if device.cheats.boot && valid {
+                        write_byte(device, cheat_line);
+                        valid = true;
+                    }
+                }
+                0xF1 => {
+                    if device.cheats.boot && valid {
+                        write_half(device, cheat_line);
+                        valid = true;
+                    }
+                }
+                0xD0 => {
+                    valid = equal_byte(device, cheat_line);
+                }
+                0xD1 => {
+                    valid = equal_half(device, cheat_line);
+                }
+                0xD2 => {
+                    valid = !equal_byte(device, cheat_line);
+                }
+                0xD3 => {
+                    valid = !equal_half(device, cheat_line);
+                }
+                0x88 | 0x89 | 0xD8 | 0xD9 | 0xDA | 0xDB => { /* GS button not emulated */ }
+                _ => panic!("Unknown cheat code type: {:X}", cheat_line.code_type),
+            }
+        }
+    }
+    device.cheats.boot = false;
+}

src/compat/aarch64.c

@@ -1,4 +1,4 @@
-#include "src/compat/sse2neon/v1.8.0/sse2neon.h"
+#include "src/compat/sse2neon/sse2neon.h"
 
 // Static wrappers
 

src/device.rs

@@ -12,7 +12,7 @@ use std::arch::x86_64::*;
 
 use rand_chacha::rand_core::{RngCore, SeedableRng};
 
-use crate::{netplay, ui};
+use crate::{cheats, netplay, ui};
 use std::{collections::HashMap, fs, io::Read};
 
 pub mod ai;
@@ -44,9 +44,12 @@ pub mod tlb;
 pub mod unmapped;
 pub mod vi;
 
-pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, fullscreen: bool, overclock: bool) {
-    device.ui.video.fullscreen = fullscreen;
-    device.cpu.overclock = overclock;
+pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, game_settings: ui::gui::GameSettings) {
+    device.ui.video.fullscreen = game_settings.fullscreen;
+    device.cpu.overclock = game_settings.overclock;
+    if game_settings.disable_expansion_pak {
+        device.rdram.size = 0x400000;
+    }
 
     init_rng(device);
 
@@ -55,13 +58,13 @@ pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, fullscreen: bool, ov
     // rdram pointer is shared with parallel-rdp
     rdram::init(device);
 
-    ui::audio::init(&mut device.ui, device.ai.freq);
     ui::video::init(device);
+    ui::audio::init(&mut device.ui, device.ai.freq);
     ui::input::init(&mut device.ui);
 
     mi::init(device);
     pif::init(device);
-    if device.ui.config.input.emulate_vru {
+    if device.ui.config.input.emulate_vru && device.netplay.is_none() {
         controller::vru::init(device);
     }
     memory::init(device);
@@ -74,12 +77,14 @@ pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, fullscreen: bool, ov
     ui::storage::init(&mut device.ui, &device.cart.rom);
     ui::storage::load_saves(&mut device.ui, &mut device.netplay);
 
+    cheats::init(device, game_settings.cheats);
+
     cpu::run(device);
 
-    ui::input::close(&mut device.ui);
-    ui::video::close(&device.ui);
-    ui::audio::close(&mut device.ui);
     ui::storage::write_saves(device);
+    ui::input::close(&mut device.ui);
+    ui::audio::close(&mut device.ui);
+    ui::video::close(&device.ui);
 }
 
 fn set_rng() -> rand_chacha::ChaCha8Rng {
@@ -146,12 +151,12 @@ pub fn get_rom_contents(file_path: &std::path::Path) -> Option<Vec<u8>> {
         }
     } else if file_path.extension().unwrap().eq_ignore_ascii_case("7z") {
         let mut archive =
-            sevenz_rust2::SevenZReader::open(file_path, sevenz_rust2::Password::empty()).unwrap();
+            sevenz_rust2::ArchiveReader::open(file_path, sevenz_rust2::Password::empty()).unwrap();
 
         let mut found = false;
         archive
             .for_each_entries(
-                &mut |entry: &sevenz_rust2::SevenZArchiveEntry, reader: &mut dyn std::io::Read| {
+                &mut |entry: &sevenz_rust2::ArchiveEntry, reader: &mut dyn std::io::Read| {
                     let name = entry.name().to_ascii_lowercase();
                     if !found
                         && (name.ends_with("z64") || name.ends_with("n64") || name.ends_with("v64"))
@@ -185,7 +190,7 @@ pub struct Device {
     pub netplay: Option<netplay::Netplay>,
     #[serde(skip, default = "ui::Ui::default")]
     pub ui: ui::Ui,
-    byte_swap: usize,
+    pub byte_swap: usize,
     pub save_state: bool,
     pub load_state: bool,
     pub cpu: cpu::Cpu,
@@ -206,6 +211,7 @@ pub struct Device {
     pub vru: controller::vru::Vru,
     pub vru_window: controller::vru::VruWindow,
     pub transferpaks: [controller::transferpak::TransferPak; 4],
+    pub cheats: cheats::Cheats,
 }
 
 pub fn zero_m128i() -> __m128i {
@@ -479,7 +485,6 @@ impl Device {
             vru_window: controller::vru::VruWindow {
                 window_notifier: None,
                 word_receiver: None,
-                gui_ctx: None,
             },
             vru: controller::vru::Vru {
                 status: 0,
@@ -498,6 +503,11 @@ impl Device {
                 controller::transferpak::TransferPak::default(),
                 controller::transferpak::TransferPak::default(),
             ],
+            cheats: cheats::Cheats {
+                cheats: vec![],
+                boot: true,
+                enabled: false,
+            },
         }
     }
 }

src/device/ai.rs

@@ -146,8 +146,8 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
         AI_DACRATE_REG => {
             if device.ai.regs[reg as usize] != value & mask {
                 device.ai.freq = device.vi.clock / (1 + (value & mask)) as u64;
-                ui::audio::close(&mut device.ui);
-                ui::audio::init(&mut device.ui, device.ai.freq)
+                ui::audio::close_game_audio(&mut device.ui);
+                ui::audio::init_game_audio(&mut device.ui, device.ai.freq)
             }
             device::memory::masked_write_32(&mut device.ai.regs[reg as usize], value, mask)
         }

src/device/cart.rs

@@ -21,16 +21,6 @@ const JDT_EEPROM_16K: u16 = 0xc000; /* 16k EEPROM */
 const EEPROM_BLOCK_SIZE: usize = 8;
 pub const EEPROM_MAX_SIZE: usize = 0x800;
 
-#[derive(serde::Serialize, serde::Deserialize)]
-pub enum CicType {
-    CicNus6101,
-    CicNus6102,
-    CicNus6103,
-    CicNus6105,
-    CicNus6106,
-    CicNus5167,
-}
-
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct AfRtc {
     pub control: u16,

src/device/cart/rom.rs

@@ -50,9 +50,7 @@ pub fn read_mem(
 }
 
 pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u32) {
-    if device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] != 0
-        && device.cart.sc64.cfg[device::cart::sc64::SC64_BOOTLOADER_SWITCH as usize] == 0
-    {
+    if device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] != 0 {
         let masked_address = address as usize & CART_MASK;
         let mut data = read_cart_word(device, masked_address);
         device::memory::masked_write_32(&mut data, value, mask);
@@ -82,16 +80,18 @@ pub fn dma_read(
     mut dram_addr: u32,
     length: u32,
 ) -> u64 {
-    if device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] != 0
-        && device.cart.sc64.cfg[device::cart::sc64::SC64_BOOTLOADER_SWITCH as usize] == 0
-    {
+    if device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] != 0 {
         dram_addr &= device::rdram::RDRAM_MASK as u32;
         cart_addr &= CART_MASK as u32;
 
         for i in 0..length {
             device.ui.storage.saves.romsave.data.insert(
                 cart_addr + i,
-                device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap],
+                *device
+                    .rdram
+                    .mem
+                    .get((dram_addr + i) as usize ^ device.byte_swap)
+                    .unwrap_or(&0),
             );
         }
         device.ui.storage.saves.romsave.written = true;
@@ -113,10 +113,17 @@ pub fn dma_write(
     let mut j = cart_addr;
     while i < dram_addr + length {
         if let Some(value) = device.ui.storage.saves.romsave.data.get(&j) {
-            device.rdram.mem[i as usize ^ device.byte_swap] = *value;
+            *device
+                .rdram
+                .mem
+                .get_mut(i as usize ^ device.byte_swap)
+                .unwrap_or(&mut 0) = *value;
         } else {
-            device.rdram.mem[i as usize ^ device.byte_swap] =
-                *device.cart.rom.get(j as usize).unwrap_or(&0);
+            *device
+                .rdram
+                .mem
+                .get_mut(i as usize ^ device.byte_swap)
+                .unwrap_or(&mut 0) = *device.cart.rom.get(j as usize).unwrap_or(&0);
         }
         i += 1;
         j += 1;
@@ -182,7 +189,6 @@ fn set_cic(device: &mut device::Device) {
         "53C0088FB777870D0AF32F0251E964030E2E8B72E830C26042FD191169508C05" => {
             device.cart.cic_seed = 0xdd; // CicNus5167
             device.cart.sc64.cfg[device::cart::sc64::SC64_ROM_WRITE_ENABLE as usize] = 1;
-            device.cart.sc64.cfg[device::cart::sc64::SC64_BOOTLOADER_SWITCH as usize] = 0;
         }
         _ => {
             device.cart.cic_seed = 0x3F; // CicNus6102

src/device/cart/sc64.rs

@@ -51,7 +51,7 @@ pub fn read_regs(
     match reg as u32 {
         SC64_SCR_REG | SC64_DATA0_REG | SC64_DATA1_REG => device.cart.sc64.regs[reg as usize],
         SC64_IDENTIFIER_REG => 0x53437632,
-        _ => panic!("unknown read reg {} address {:#x}", reg, address),
+        _ => panic!("unknown read reg {reg} address {address:#x}"),
     }
 }
 
@@ -155,24 +155,26 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                         let mut i = 0;
 
                         while i < length {
-                            if offset + i < device.ui.storage.saves.sdcard.data.len() {
-                                let data = u32::from_be_bytes(
-                                    device.ui.storage.saves.sdcard.data
-                                        [(offset + i)..(offset + i + 4)]
-                                        .try_into()
-                                        .unwrap(),
-                                );
+                            let data = u32::from_be_bytes(
+                                device
+                                    .ui
+                                    .storage
+                                    .saves
+                                    .sdcard
+                                    .data
+                                    .get((offset + i)..(offset + i + 4))
+                                    .unwrap_or(&[0; 4])
+                                    .try_into()
+                                    .unwrap_or_default(),
+                            );
 
-                                device::memory::data_write(
-                                    device,
-                                    address + i as u64,
-                                    data,
-                                    0xFFFFFFFF,
-                                    false,
-                                );
-                            } else {
-                                panic!("sd card read out of bounds")
-                            }
+                            device::memory::data_write(
+                                device,
+                                address + i as u64,
+                                data,
+                                0xFFFFFFFF,
+                                false,
+                            );
                             i += 4;
                         }
                     }
@@ -187,19 +189,22 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
                         let mut i = 0;
 
                         while i < length {
-                            if offset + i < device.ui.storage.saves.sdcard.data.len() {
-                                let data = device::memory::data_read(
-                                    device,
-                                    address + i as u64,
-                                    device::memory::AccessSize::Word,
-                                    false,
-                                )
-                                .to_be_bytes();
-                                device.ui.storage.saves.sdcard.data[(offset + i)..(offset + i + 4)]
-                                    .copy_from_slice(&data);
-                            } else {
-                                panic!("sd card write out of bounds")
-                            }
+                            let data = device::memory::data_read(
+                                device,
+                                address + i as u64,
+                                device::memory::AccessSize::Word,
+                                false,
+                            )
+                            .to_be_bytes();
+                            device
+                                .ui
+                                .storage
+                                .saves
+                                .sdcard
+                                .data
+                                .get_mut((offset + i)..(offset + i + 4))
+                                .unwrap_or(&mut [0; 4])
+                                .copy_from_slice(&data);
                             i += 4;
                         }
                         device.ui.storage.saves.sdcard.written = true;
@@ -308,8 +313,12 @@ pub fn dma_read(
     let mut i = dram_addr;
     let mut j = cart_addr;
 
-    while i < dram_addr + length && i < device.rdram.size {
-        buffer[j as usize] = device.rdram.mem[i as usize ^ device.byte_swap];
+    while i < dram_addr + length {
+        *buffer.get_mut(j as usize).unwrap_or(&mut 0) = *device
+            .rdram
+            .mem
+            .get(i as usize ^ device.byte_swap)
+            .unwrap_or(&0);
         i += 1;
         j += 1;
     }
@@ -335,8 +344,12 @@ pub fn dma_write(
     let mut i = dram_addr;
     let mut j = cart_addr;
 
-    while i < dram_addr + length && i < device.rdram.size {
-        device.rdram.mem[i as usize ^ device.byte_swap] = buffer[j as usize];
+    while i < dram_addr + length {
+        *device
+            .rdram
+            .mem
+            .get_mut(i as usize ^ device.byte_swap)
+            .unwrap_or(&mut 0) = *buffer.get(j as usize).unwrap_or(&0);
         i += 1;
         j += 1;
     }

src/device/cart/sram.rs

@@ -66,7 +66,7 @@ fn read_mem_flash(device: &device::Device, address: u64) -> u32 {
     {
         /* flashram MMIO read are not supported except for the "dummy" read @0x0000 done before DMA.
          * returns a "dummy" value. */
-        return 0;
+        0
     } else {
         /* other accesses are not implemented */
         panic!("unknown flashram read")
@@ -150,9 +150,19 @@ fn dma_read_sram(device: &mut device::Device, mut cart_addr: u32, mut dram_addr:
 
     format_sram(device);
 
-    while i < dram_addr + length && i < device.rdram.size {
-        device.ui.storage.saves.sram.data[j as usize] =
-            device.rdram.mem[i as usize ^ device.byte_swap];
+    while i < dram_addr + length {
+        *device
+            .ui
+            .storage
+            .saves
+            .sram
+            .data
+            .get_mut(j as usize)
+            .unwrap_or(&mut 0) = *device
+            .rdram
+            .mem
+            .get(i as usize ^ device.byte_swap)
+            .unwrap_or(&0);
         i += 1;
         j += 1;
     }
@@ -169,8 +179,11 @@ fn dma_read_flash(device: &mut device::Device, cart_addr: u32, dram_addr: u32, l
     {
         /* load page buf using DMA */
         for i in 0..length {
-            device.cart.flashram.page_buf[i as usize] =
-                device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap];
+            device.cart.flashram.page_buf[i as usize] = *device
+                .rdram
+                .mem
+                .get((dram_addr + i) as usize ^ device.byte_swap)
+                .unwrap_or(&0);
         }
     } else {
         /* other accesses are not implemented */
@@ -206,9 +219,19 @@ fn dma_write_sram(
 
     format_sram(device);
 
-    while i < dram_addr + length && i < device.rdram.size {
-        device.rdram.mem[i as usize ^ device.byte_swap] =
-            device.ui.storage.saves.sram.data[j as usize];
+    while i < dram_addr + length {
+        *device
+            .rdram
+            .mem
+            .get_mut(i as usize ^ device.byte_swap)
+            .unwrap_or(&mut 0) = *device
+            .ui
+            .storage
+            .saves
+            .sram
+            .data
+            .get(j as usize)
+            .unwrap_or(&0);
         i += 1;
         j += 1;
     }
@@ -227,10 +250,18 @@ fn dma_write_flash(
         && device.cart.flashram.mode == FlashramMode::ReadSiliconId
     {
         /* read Silicon ID using DMA */
-        device.rdram.mem[dram_addr as usize..dram_addr as usize + 4]
+        device
+            .rdram
+            .mem
+            .get_mut(dram_addr as usize..dram_addr as usize + 4)
+            .unwrap_or(&mut [0; 4])
             .copy_from_slice(&device.cart.flashram.silicon_id[0].to_ne_bytes());
         dram_addr += 4;
-        device.rdram.mem[dram_addr as usize..dram_addr as usize + 4]
+        device
+            .rdram
+            .mem
+            .get_mut(dram_addr as usize..dram_addr as usize + 4)
+            .unwrap_or(&mut [0; 4])
             .copy_from_slice(&device.cart.flashram.silicon_id[1].to_ne_bytes());
     } else if (cart_addr & 0x1ffff) < 0x10000
         && device.cart.flashram.mode == FlashramMode::ReadArray
@@ -250,8 +281,11 @@ fn dma_write_flash(
 
         /* do actual DMA */
         for i in 0..length {
-            device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap] =
-                device.ui.storage.saves.flash.data[(cart_addr + i) as usize];
+            *device
+                .rdram
+                .mem
+                .get_mut((dram_addr + i) as usize ^ device.byte_swap)
+                .unwrap_or(&mut 0) = device.ui.storage.saves.flash.data[(cart_addr + i) as usize];
         }
     } else {
         /* other accesses are not implemented */

src/device/controller.rs

@@ -96,7 +96,7 @@ pub fn process(device: &mut device::Device, channel: usize) {
             device.pif.channels[channel].rx_buf.unwrap(),
             channel,
         ),
-        _ => println!("unknown controller command {}", cmd),
+        _ => println!("unknown controller command {cmd}"),
     }
 }
 
@@ -111,8 +111,8 @@ fn pak_read_block(
         ((device.pif.ram[addr_acrc] as u16) << 8) | (device.pif.ram[addr_acrc + 1] & 0xe0) as u16;
     let handler = device.pif.channels[channel].pak_handler;
 
-    if handler.is_some() {
-        (handler.unwrap().read)(device, channel, address, data, PAK_CHUNK_SIZE);
+    if let Some(handler) = handler {
+        (handler.read)(device, channel, address, data, PAK_CHUNK_SIZE);
         device.pif.ram[dcrc] = data_crc(device, data, PAK_CHUNK_SIZE)
     } else {
         device.pif.ram[dcrc] = !data_crc(device, data, PAK_CHUNK_SIZE)
@@ -130,8 +130,8 @@ fn pak_write_block(
         ((device.pif.ram[addr_acrc] as u16) << 8) | (device.pif.ram[addr_acrc + 1] & 0xe0) as u16;
     let handler = device.pif.channels[channel].pak_handler;
 
-    if handler.is_some() {
-        (handler.unwrap().write)(device, channel, address, data, PAK_CHUNK_SIZE);
+    if let Some(handler) = handler {
+        (handler.write)(device, channel, address, data, PAK_CHUNK_SIZE);
         device.pif.ram[dcrc] = data_crc(device, data, PAK_CHUNK_SIZE)
     } else {
         device.pif.ram[dcrc] = !data_crc(device, data, PAK_CHUNK_SIZE)
@@ -189,20 +189,22 @@ pub fn pak_switch_event(device: &mut device::Device) {
                     write: device::controller::mempak::write,
                     pak_type: new_pak_type,
                 });
+                ui::video::onscreen_message(&device.ui, "MemPak selected");
             } else if new_pak_type == PakType::RumblePak {
                 channel.pak_handler = Some(device::controller::PakHandler {
                     read: device::controller::rumble::read,
                     write: device::controller::rumble::write,
                     pak_type: new_pak_type,
                 });
+                ui::video::onscreen_message(&device.ui, "RumblePak selected");
             } else if new_pak_type == PakType::TransferPak {
                 channel.pak_handler = Some(device::controller::PakHandler {
                     read: device::controller::transferpak::read,
                     write: device::controller::transferpak::write,
                     pak_type: new_pak_type,
                 });
+                ui::video::onscreen_message(&device.ui, "TransferPak selected");
             }
-            ui::audio::play_pak_switch(&device.ui, new_pak_type);
             channel.change_pak = PakType::None;
         }
     }

src/device/controller/gbcart.rs

@@ -155,7 +155,7 @@ fn write_mbc3(
             }
         }
     } else {
-        panic!("Unsupported write address {:x}", address);
+        panic!("Unsupported write address {address:x}");
     }
 }
 
@@ -208,7 +208,7 @@ fn read_mbc3(
             }
         }
     } else {
-        panic!("Unsupported read address {:x}", address);
+        panic!("Unsupported read address {address:x}");
     }
 }
 
@@ -231,7 +231,7 @@ fn write_mbc5(
     } else if address < 0x6000 {
         cart.ram_bank = (value & 0xf) as u16;
     } else if address < 0xa000 {
-        println!("Unknown MBC5 write address {:x}", address);
+        println!("Unknown MBC5 write address {address:x}");
     } else if (0xa000..0xc000).contains(&address) {
         if !cart.ram_enabled {
             return;
@@ -241,7 +241,7 @@ fn write_mbc5(
         cart.ram[banked_address as usize..banked_address as usize + size]
             .copy_from_slice(&pif_ram[data..data + size]);
     } else {
-        panic!("Unsupported write address {:x}", address);
+        panic!("Unsupported write address {address:x}");
     }
 }
 
@@ -272,7 +272,7 @@ fn read_mbc5(
         pif_ram[data..data + size]
             .copy_from_slice(&cart.ram[banked_address as usize..banked_address as usize + size]);
     } else {
-        panic!("Unsupported read address {:x}", address);
+        panic!("Unsupported read address {address:x}");
     }
 }
 
@@ -323,6 +323,6 @@ pub fn get_cart_type(data: u8) -> CartType {
         0x10 => CartType::MBC3RamBattRtc,
         0x13 => CartType::MBC3RamBatt,
         0x1b => CartType::MBC5RamBatt,
-        _ => panic!("Unsupported cart type {:x}", data),
+        _ => panic!("Unsupported cart type {data:x}"),
     }
 }

src/device/controller/transferpak.rs

@@ -61,7 +61,7 @@ pub fn read(device: &mut device::Device, channel: usize, address: u16, data: usi
             );
         }
         _ => {
-            panic!("unknown transfer pak read {:x}", address >> 12);
+            println!("unknown transfer pak read {:x}", address >> 12);
         }
     }
 }
@@ -84,7 +84,7 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us
                     }
                     pak.enabled = true;
                 }
-                _ => panic!("unknown transfer pak value"),
+                _ => println!("unknown transfer pak value"),
             }
             return;
         }
@@ -127,7 +127,7 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us
             );
         }
         _ => {
-            panic!("unknown transfer pak write {:x}", address >> 12);
+            println!("unknown transfer pak write {:x}", address >> 12);
         }
     }
 }

src/device/controller/vru.rs

@@ -1,5 +1,4 @@
 use crate::{device, ui};
-use eframe::egui;
 use std::collections::HashMap;
 
 const JCMD_VRU_READ: u8 = 0x09;
@@ -33,11 +32,9 @@ pub struct Vru {
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct VruWindow {
     #[serde(skip)]
-    pub window_notifier: Option<tokio::sync::mpsc::Sender<Vec<String>>>,
+    pub window_notifier: Option<tokio::sync::mpsc::Sender<Option<Vec<String>>>>,
     #[serde(skip)]
     pub word_receiver: Option<tokio::sync::mpsc::Receiver<String>>,
-    #[serde(skip)]
-    pub gui_ctx: Option<egui::Context>,
 }
 
 pub fn init(device: &mut device::Device) {
@@ -129,7 +126,7 @@ pub fn process(device: &mut device::Device, channel: usize) {
 
                         let (res, _enc, errors) = encoding_rs::SHIFT_JIS.decode(&data);
                         if errors {
-                            panic!("Failed to decode Japanese word {:X?}", data);
+                            panic!("Failed to decode Japanese word {data:X?}");
                         } else {
                             device.vru.words.push(res.to_string());
                         }
@@ -147,7 +144,7 @@ pub fn process(device: &mut device::Device, channel: usize) {
                         if let Some(result) = word {
                             device.vru.words.push(result.clone());
                         } else {
-                            panic!("Unknown VRU word {}", data);
+                            panic!("Unknown VRU word {data}");
                         }
                     }
                 } else {
@@ -195,7 +192,6 @@ pub fn process(device: &mut device::Device, channel: usize) {
                     &device.vru.words,
                     device.vru_window.window_notifier.as_ref().unwrap(),
                     device.vru_window.word_receiver.as_mut().unwrap(),
-                    device.vru_window.gui_ctx.as_ref().unwrap(),
                 )
             } else {
                 0x7FFF
@@ -253,7 +249,7 @@ pub fn process(device: &mut device::Device, channel: usize) {
             }
             device.vru.status = 0; /* status is always set to 0 after a write */
         }
-        _ => panic!("unknown VRU command {}", cmd),
+        _ => panic!("unknown VRU command {cmd}"),
     }
 }
 
@@ -2730,5 +2726,17 @@ fn create_word_mappings(device: &mut device::Device) {
             String::from("82B582E382C182CF82C282AF82A282A982A2"),
             String::from("restricted-depart"),
         ),
+        (
+            String::from("009903720366006903C903FF0045033C"),
+            String::from("objection"),
+        ),
+        (
+            String::from("041100CF02EE0381004503B7"),
+            String::from("hold-it"),
+        ),
+        (
+            String::from("03BA019203C9036C0087000303C6"),
+            String::from("take-that"),
+        ),
     ]);
 }

src/device/cpu.rs

@@ -1,4 +1,4 @@
-use crate::{device, savestates};
+use crate::{device, savestates, ui};
 
 #[derive(PartialEq, serde::Serialize, serde::Deserialize)]
 pub enum State {
@@ -227,6 +227,10 @@ pub fn init(device: &mut device::Device) {
     device.cpu.clock_rate = if !device.cpu.overclock {
         93750000
     } else {
+        ui::video::onscreen_message(
+            &device.ui,
+            "Overclocking enabled, setting clock rate to 125 MHz",
+        );
         125000000
     };
 

src/device/pi.rs

@@ -221,7 +221,11 @@ fn unknown_dma_write(
     dram_addr &= device::rdram::RDRAM_MASK as u32;
 
     for i in 0..length {
-        device.rdram.mem[(dram_addr + i) as usize ^ device.byte_swap] = 0;
+        *device
+            .rdram
+            .mem
+            .get_mut((dram_addr + i) as usize ^ device.byte_swap)
+            .unwrap_or(&mut 0) = 0;
     }
     device::pi::calculate_cycles(device, 1, length)
 }

src/device/pif.rs

@@ -226,7 +226,7 @@ pub fn connect_pif_channels(device: &mut device::Device) {
             device.pif.channels[i].process = Some(device::controller::process);
         }
     }
-    if device.ui.config.input.emulate_vru {
+    if device.ui.config.input.emulate_vru && device.netplay.is_none() {
         device.pif.channels[3].process = Some(device::controller::vru::process);
     }
     device.pif.channels[4].process = Some(device::cart::process)
@@ -280,7 +280,7 @@ pub fn init(device: &mut device::Device) {
             device.pif.channels[i].pak_handler = Some(default_handler);
         }
     }
-    if device.ui.config.input.emulate_vru {
+    if device.ui.config.input.emulate_vru && device.netplay.is_none() {
         device.pif.channels[3].pak_handler = None;
     }
 }

src/device/rdram.rs

@@ -29,9 +29,13 @@ pub fn read_mem_fast(
 ) -> u32 {
     let masked_address = address as usize & RDRAM_MASK;
     u32::from_ne_bytes(
-        device.rdram.mem[masked_address..masked_address + 4]
+        device
+            .rdram
+            .mem
+            .get(masked_address..masked_address + 4)
+            .unwrap_or(&[0; 4])
             .try_into()
-            .unwrap(),
+            .unwrap_or_default(),
     )
 }
 
@@ -45,28 +49,35 @@ pub fn read_mem(
         rdram_calculate_cycles(access_size as u64) / (access_size as u64 / 4),
     );
     let masked_address = address as usize & RDRAM_MASK;
-    if address < device.rdram.size as u64 {
-        u32::from_ne_bytes(
-            device.rdram.mem[masked_address..masked_address + 4]
-                .try_into()
-                .unwrap(),
-        )
-    } else {
-        0
-    }
+
+    u32::from_ne_bytes(
+        device
+            .rdram
+            .mem
+            .get(masked_address..masked_address + 4)
+            .unwrap_or(&[0; 4])
+            .try_into()
+            .unwrap_or_default(),
+    )
 }
 
 pub fn write_mem(device: &mut device::Device, address: u64, value: u32, mask: u32) {
-    if address < device.rdram.size as u64 {
-        let mut data = u32::from_ne_bytes(
-            device.rdram.mem[address as usize..(address + 4) as usize]
-                .try_into()
-                .unwrap(),
-        );
-        device::memory::masked_write_32(&mut data, value, mask);
-        device.rdram.mem[address as usize..(address + 4) as usize]
-            .copy_from_slice(&data.to_ne_bytes());
-    }
+    let mut data = u32::from_ne_bytes(
+        device
+            .rdram
+            .mem
+            .get(address as usize..(address + 4) as usize)
+            .unwrap_or(&[0; 4])
+            .try_into()
+            .unwrap_or_default(),
+    );
+    device::memory::masked_write_32(&mut data, value, mask);
+    device
+        .rdram
+        .mem
+        .get_mut(address as usize..(address + 4) as usize)
+        .unwrap_or(&mut [0; 4])
+        .copy_from_slice(&data.to_ne_bytes());
 }
 
 pub fn read_regs(
@@ -103,9 +114,19 @@ pub fn init(device: &mut device::Device) {
         unsafe { Vec::from_raw_parts(ptr, device.rdram.size as usize, device.rdram.size as usize) };
 
     // hack, skip RDRAM initialization
-    device.rdram.mem[0x318..0x318 + 4].copy_from_slice(&device.rdram.size.to_ne_bytes());
+    device
+        .rdram
+        .mem
+        .get_mut(0x318..0x318 + 4)
+        .unwrap_or(&mut [0; 4])
+        .copy_from_slice(&device.rdram.size.to_ne_bytes());
     // hack, skip RDRAM initialization
-    device.rdram.mem[0x3f0..0x3f0 + 4].copy_from_slice(&device.rdram.size.to_ne_bytes());
+    device
+        .rdram
+        .mem
+        .get_mut(0x3f0..0x3f0 + 4)
+        .unwrap_or(&mut [0; 4])
+        .copy_from_slice(&device.rdram.size.to_ne_bytes());
 
     device.ri.regs[device::ri::RI_MODE_REG as usize] = 0x0e;
     device.ri.regs[device::ri::RI_CONFIG_REG as usize] = 0x40;

src/device/rsp_interface.rs

@@ -157,7 +157,11 @@ fn do_dma(device: &mut device::Device, dma: RspDma) {
                         .try_into()
                         .unwrap(),
                 );
-                device.rdram.mem[dram_addr as usize..dram_addr as usize + 4]
+                device
+                    .rdram
+                    .mem
+                    .get_mut(dram_addr as usize..dram_addr as usize + 4)
+                    .unwrap_or(&mut [0; 4])
                     .copy_from_slice(&data.to_ne_bytes());
                 mem_addr += 4;
                 dram_addr += 4;
@@ -171,14 +175,16 @@ fn do_dma(device: &mut device::Device, dma: RspDma) {
         while j < count {
             let mut i = 0;
             while i < length {
-                let mut data = 0;
-                if dram_addr < device.rdram.size {
-                    data = u32::from_ne_bytes(
-                        device.rdram.mem[dram_addr as usize..dram_addr as usize + 4]
-                            .try_into()
-                            .unwrap(),
-                    );
-                }
+                let data = u32::from_ne_bytes(
+                    device
+                        .rdram
+                        .mem
+                        .get(dram_addr as usize..dram_addr as usize + 4)
+                        .unwrap_or(&[0; 4])
+                        .try_into()
+                        .unwrap_or_default(),
+                );
+
                 if offset != 0 {
                     // imem being updated
                     device.rsp.cpu.instructions[((mem_addr & 0xFFF) / 4) as usize].func =

src/device/rsp_su_instructions.rs

@@ -709,7 +709,7 @@ pub fn lsv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 2 == 0 {
+    if element.is_multiple_of(2) {
         modify_vpr16(
             &mut device.rsp.cpu.vpr[rt(opcode) as usize],
             element / 2,
@@ -736,7 +736,7 @@ pub fn llv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 4 == 0 {
+    if element.is_multiple_of(4) {
         let mut value = 0;
         for i in 0..4 {
             value |= (device.rsp.mem[((address + i) & 0xFFF) as usize] as u32) << (8 * (3 - i));
@@ -766,7 +766,7 @@ pub fn ldv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 8 == 0 {
+    if element.is_multiple_of(8) {
         let mut value = 0;
         for i in 0..8 {
             value |= (device.rsp.mem[((address + i) & 0xFFF) as usize] as u64) << (8 * (7 - i));
@@ -796,7 +796,7 @@ pub fn lqv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element == 0 && address % 16 == 0 {
+    if element == 0 && address.is_multiple_of(16) {
         let mut value = 0;
         for i in 0..16 {
             value |= (device.rsp.mem[((address + i) & 0xFFF) as usize] as u128) << (8 * (15 - i));
@@ -975,7 +975,7 @@ pub fn ssv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 2 == 0 {
+    if element.is_multiple_of(2) {
         let start = (address & 0xFFF) as usize;
         device.rsp.mem[start..start + 2].copy_from_slice(
             &get_vpr16(device.rsp.cpu.vpr[rt(opcode) as usize], element / 2).to_be_bytes(),
@@ -997,7 +997,7 @@ pub fn slv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 4 == 0 {
+    if element.is_multiple_of(4) {
         let start = (address & 0xFFF) as usize;
         device.rsp.mem[start..start + 4].copy_from_slice(
             &get_vpr32(device.rsp.cpu.vpr[rt(opcode) as usize], element / 4).to_be_bytes(),
@@ -1019,7 +1019,7 @@ pub fn sdv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element % 8 == 0 {
+    if element.is_multiple_of(8) {
         let start = (address & 0xFFF) as usize;
         device.rsp.mem[start..start + 8].copy_from_slice(
             &get_vpr64(device.rsp.cpu.vpr[rt(opcode) as usize], element / 8).to_be_bytes(),
@@ -1041,7 +1041,7 @@ pub fn sqv(device: &mut device::Device, opcode: u32) {
 
     let mut element = velement(opcode);
 
-    if element == 0 && address % 16 == 0 {
+    if element == 0 && address.is_multiple_of(16) {
         let start = (address & 0xFFF) as usize;
         device.rsp.mem[start..start + 16]
             .copy_from_slice(&get_vpr128(device.rsp.cpu.vpr[rt(opcode) as usize]).to_be_bytes());

src/device/si.rs

@@ -86,9 +86,13 @@ fn copy_pif_rdram(device: &mut device::Device) {
         let mut i = 0;
         while i < device::pif::PIF_RAM_SIZE {
             let data = u32::from_ne_bytes(
-                device.rdram.mem[dram_addr + i..dram_addr + i + 4]
+                device
+                    .rdram
+                    .mem
+                    .get(dram_addr + i..dram_addr + i + 4)
+                    .unwrap_or(&[0; 4])
                     .try_into()
-                    .unwrap(),
+                    .unwrap_or_default(),
             );
             device.pif.ram[i..i + 4].copy_from_slice(&data.to_be_bytes());
             i += 4;
@@ -97,7 +101,12 @@ fn copy_pif_rdram(device: &mut device::Device) {
         let mut i = 0;
         while i < device::pif::PIF_RAM_SIZE {
             let data = u32::from_be_bytes(device.pif.ram[i..i + 4].try_into().unwrap());
-            device.rdram.mem[dram_addr + i..dram_addr + i + 4].copy_from_slice(&data.to_ne_bytes());
+            device
+                .rdram
+                .mem
+                .get_mut(dram_addr + i..dram_addr + i + 4)
+                .unwrap_or(&mut [0; 4])
+                .copy_from_slice(&data.to_ne_bytes());
             i += 4;
         }
     } else {

src/device/vi.rs

@@ -1,4 +1,4 @@
-use crate::{device, netplay, ui};
+use crate::{cheats, device, netplay, ui};
 use governor::clock::Clock;
 
 const VI_STATUS_REG: u32 = 0;
@@ -72,10 +72,9 @@ fn set_vertical_interrupt(device: &mut device::Device) {
 fn set_current_line(device: &mut device::Device) {
     let delay = device.vi.delay;
     let next_vi = device::events::get_event(device, device::events::EVENT_TYPE_VI);
-    if next_vi.is_some() {
+    if let Some(next_vi) = next_vi {
         device.vi.regs[VI_CURRENT_REG as usize] = ((delay
-            - (next_vi.unwrap().count
-                - device.cpu.cop0.regs[device::cop0::COP0_COUNT_REG as usize]))
+            - (next_vi.count - device.cpu.cop0.regs[device::cop0::COP0_COUNT_REG as usize]))
             / device.vi.count_per_scanline)
             as u32;
 
@@ -135,16 +134,22 @@ pub fn write_regs(device: &mut device::Device, address: u64, value: u32, mask: u
 }
 
 pub fn vertical_interrupt_event(device: &mut device::Device) {
-    ui::video::check_callback(device);
+    if device.cheats.enabled {
+        cheats::execute_cheats(device, device.cheats.cheats.clone());
+    }
+    let mut speed_limiter_toggled = ui::video::check_callback(device);
 
     if device.netplay.is_some() {
         netplay::send_sync_check(device);
-        device.vi.enable_speed_limiter = !device.netplay.as_ref().unwrap().fast_forward;
+        if device.vi.enable_speed_limiter == device.netplay.as_ref().unwrap().fast_forward {
+            speed_limiter_toggled = true;
+            device.vi.enable_speed_limiter = !device.netplay.as_ref().unwrap().fast_forward;
+        }
     }
 
     device.vi.vi_counter += 1;
-    if device.vi.vi_counter % device.vi.limit_freq == 0 && device.vi.enable_speed_limiter {
-        speed_limiter(device);
+    if device.vi.vi_counter.is_multiple_of(device.vi.limit_freq) && device.vi.enable_speed_limiter {
+        speed_limiter(device, speed_limiter_toggled);
     }
     ui::video::update_screen();
 
@@ -176,10 +181,9 @@ pub fn init(device: &mut device::Device) {
     }
 }
 
-fn speed_limiter(device: &mut device::Device) {
+fn speed_limiter(device: &mut device::Device, speed_limiter_toggled: bool) {
     let result = device.vi.limiter.as_ref().unwrap().check();
-    if result.is_err() {
-        let outcome = result.unwrap_err();
+    if let Err(outcome) = result {
         let dur = outcome.wait_time_from(governor::clock::DefaultClock::default().now());
         spin_sleep::sleep(dur);
         if dur < device.vi.min_wait_time {
@@ -196,14 +200,17 @@ fn speed_limiter(device: &mut device::Device) {
         .as_secs_f64()
         > 1.0
     {
-        if device.vi.min_wait_time.as_secs_f64() == 0.0 && device.vi.limit_freq < MAX_LIMIT_FREQ {
-            device.vi.limit_freq += 1;
-            create_limiter(device);
-        } else if device.vi.min_wait_time.as_secs_f64() > device.vi.frame_time
-            && device.vi.limit_freq > 1
-        {
-            device.vi.limit_freq -= 1;
-            create_limiter(device);
+        if !speed_limiter_toggled {
+            if device.vi.min_wait_time.as_secs_f64() == 0.0 && device.vi.limit_freq < MAX_LIMIT_FREQ
+            {
+                device.vi.limit_freq += 1;
+                create_limiter(device);
+            } else if device.vi.min_wait_time.as_secs_f64() > device.vi.frame_time
+                && device.vi.limit_freq > 1
+            {
+                device.vi.limit_freq -= 1;
+                create_limiter(device);
+            }
         }
 
         //println!("limit freq: {}", device.vi.limit_freq);

src/main.rs

@@ -3,6 +3,7 @@
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
+mod cheats;
 mod device;
 mod netplay;
 mod savestates;
@@ -73,10 +74,6 @@ async fn main() {
     if result.is_err() {
         panic!("could not create config dir: {}", result.err().unwrap())
     }
-    result = std::fs::create_dir_all(dirs.cache_dir.clone());
-    if result.is_err() {
-        panic!("could not create cache dir: {}", result.err().unwrap())
-    }
     result = std::fs::create_dir_all(dirs.data_dir.join("saves"));
     if result.is_err() {
         panic!("could not create save dir: {}", result.err().unwrap())
@@ -85,13 +82,6 @@ async fn main() {
     if result.is_err() {
         panic!("could not create state dir: {}", result.err().unwrap())
     }
-    let running_file = dirs.cache_dir.join("game_running");
-    if running_file.exists() {
-        result = std::fs::remove_file(running_file);
-        if result.is_err() {
-            panic!("could not remove running file: {}", result.err().unwrap())
-        }
-    }
 
     let args = Args::parse();
     let args_as_strings: Vec<String> = std::env::args().collect();
@@ -111,12 +101,20 @@ async fn main() {
             }
         }
         if args.list_controllers {
-            let controllers = gui::get_controller_names(&ui);
+            let controllers = ui::input::get_controller_names(&ui);
             for (i, controller) in controllers.iter().enumerate() {
-                println!("Controller {}: {}", i, controller);
+                println!("Controller {i}: {controller}");
             }
             return;
         }
+        if args.configure_input_profile.is_some() {
+            ui::input::configure_input_profile(
+                &mut ui,
+                args.configure_input_profile.unwrap(),
+                args.use_dinput,
+            );
+            return;
+        }
         if args.assign_controller.is_some() {
             if args.port.is_none() {
                 println!("Must specify port number");
@@ -127,7 +125,6 @@ async fn main() {
                 args.assign_controller.unwrap(),
                 args.port.unwrap(),
             );
-            return;
         }
         if args.bind_input_profile.is_some() {
             if args.port.is_none() {
@@ -139,15 +136,6 @@ async fn main() {
                 args.bind_input_profile.unwrap(),
                 args.port.unwrap(),
             );
-            return;
-        }
-        if args.configure_input_profile.is_some() {
-            ui::input::configure_input_profile(
-                &mut ui,
-                args.configure_input_profile.unwrap(),
-                args.use_dinput,
-            );
-            return;
         }
     } else if args.game.is_some() {
         let file_path = std::path::Path::new(args.game.as_ref().unwrap());
@@ -158,7 +146,23 @@ async fn main() {
                 .spawn(move || {
                     let mut device = device::Device::new();
                     let overclock = device.ui.config.emulation.overclock;
-                    device::run_game(&mut device, rom_contents, args.fullscreen, overclock);
+                    let disable_expansion_pak = device.ui.config.emulation.disable_expansion_pak;
+
+                    let game_cheats = {
+                        let game_crc = ui::storage::get_game_crc(&rom_contents);
+                        let cheats = ui::config::Cheats::new();
+                        cheats.cheats.get(&game_crc).cloned().unwrap_or_default()
+                    };
+                    device::run_game(
+                        &mut device,
+                        rom_contents,
+                        ui::gui::GameSettings {
+                            fullscreen: args.fullscreen,
+                            overclock,
+                            disable_expansion_pak,
+                            cheats: game_cheats,
+                        },
+                    );
                 })
                 .unwrap();
 
@@ -168,34 +172,6 @@ async fn main() {
             return;
         }
     } else {
-        let options = eframe::NativeOptions {
-            viewport: eframe::egui::ViewportBuilder::default()
-                .with_inner_size([854.0, 480.0])
-                .with_icon(
-                    eframe::icon_data::from_png_bytes(include_bytes!("../data/gopher64.png"))
-                        .unwrap(),
-                ),
-            ..Default::default()
-        };
-
-        let controllers_paths;
-        let controller_names;
-        {
-            let game_ui = ui::Ui::new();
-            controllers_paths = gui::get_controller_paths(&game_ui);
-            controller_names = gui::get_controller_names(&game_ui);
-        }
-        eframe::run_native(
-            "gopher64",
-            options,
-            Box::new(|cc| {
-                Ok(Box::new(ui::gui::GopherEguiApp::new(
-                    cc,
-                    controllers_paths,
-                    controller_names,
-                )))
-            }),
-        )
-        .unwrap();
+        gui::app_window();
     }
 }

src/netplay.rs

@@ -46,14 +46,6 @@ struct InputEvent {
     plugin: u8,
 }
 
-pub const NETPLAY_ERROR_DESYNC: u32 = 0;
-pub const NETPLAY_ERROR_LOST_CONNECTION: u32 = 1;
-pub const NETPLAY_ERROR_PLAYER_DISCONNECTED: u32 = 2;
-pub const NETPLAY_ERROR_PLAYER_1_DISCONNECTED: u32 = 3;
-pub const NETPLAY_ERROR_PLAYER_2_DISCONNECTED: u32 = 4;
-pub const NETPLAY_ERROR_PLAYER_3_DISCONNECTED: u32 = 5;
-pub const NETPLAY_ERROR_PLAYER_4_DISCONNECTED: u32 = 6;
-
 pub fn send_rtc(netplay: &mut Netplay, rtc: i64) {
     let mut request: Vec<u8> = [TCP_SEND_RTC].to_vec();
     let size: u32 = 8;
@@ -113,7 +105,7 @@ pub fn receive_save(netplay: &mut Netplay, save_type: &str, save_data: &mut Vec<
 
 pub fn send_sync_check(device: &mut device::Device) {
     let netplay = device.netplay.as_mut().unwrap();
-    if netplay.vi_counter % 600 == 0 {
+    if netplay.vi_counter.is_multiple_of(600) {
         let mut request: Vec<u8> = [UDP_SYNC_DATA].to_vec();
         request.extend_from_slice(&(netplay.vi_counter).to_be_bytes());
 
@@ -155,7 +147,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::Inpu
             .remove(&netplay.player_data[channel].count);
 
         if std::time::Instant::now() > timeout {
-            ui::audio::play_netplay_audio(&device.ui, NETPLAY_ERROR_LOST_CONNECTION);
+            ui::video::onscreen_message(&device.ui, "Lost connection to netplay server");
             input = Some(InputEvent {
                 input: 0,
                 plugin: 0,
@@ -200,15 +192,13 @@ fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) {
                 }
                 if current_status != netplay.status {
                     if ((current_status & 0x1) ^ (netplay.status & 0x1)) != 0 {
-                        ui::audio::play_netplay_audio(ui, NETPLAY_ERROR_DESYNC);
+                        ui::video::onscreen_message(ui, "Netplay desync detected");
+                        ui::video::onscreen_message(ui, "Netplay desync detected"); // queue this message twice to ensure they see it
                     }
                     for dis in 1..5 {
                         if ((current_status & (0x1 << dis)) ^ (netplay.status & (0x1 << dis))) != 0
                         {
-                            ui::audio::play_netplay_audio(
-                                ui,
-                                NETPLAY_ERROR_PLAYER_DISCONNECTED + dis,
-                            );
+                            ui::video::onscreen_message(ui, &format!("Player {dis} disconnected"));
                         }
                     }
                     netplay.status = current_status;
@@ -246,18 +236,13 @@ fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) {
     }
 }
 
-pub fn init(
-    mut peer_addr: std::net::SocketAddr,
-    session: ui::gui::gui_netplay::NetplayRoom,
-    player_number: u8,
-) -> Netplay {
-    peer_addr.set_port(session.port.unwrap() as u16);
+pub fn init(peer_addr: std::net::SocketAddr, player_number: u8) -> Netplay {
     let udp_socket;
     if peer_addr.is_ipv4() {
         udp_socket = std::net::UdpSocket::bind((std::net::Ipv4Addr::UNSPECIFIED, 0))
             .expect("couldn't bind to address");
         socket2::SockRef::from(&udp_socket)
-            .set_tos(CS4 << 2)
+            .set_tos_v4(CS4 << 2)
             .unwrap();
     } else {
         udp_socket = std::net::UdpSocket::bind((std::net::Ipv6Addr::UNSPECIFIED, 0))

src/savestates.rs

@@ -12,7 +12,7 @@ impl<'de, const N: usize> Visitor<'de> for M128iArrayVisitor<N> {
     type Value = [__m128i; N];
 
     fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-        formatter.write_str(&format!("an array of {} 128-bit integers", N))
+        formatter.write_str(&format!("an array of {N} 128-bit integers"))
     }
 
     fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
@@ -87,14 +87,21 @@ pub fn create_savestate(device: &device::Device) {
         compressed_file,
     )
     .unwrap();
+    ui::video::onscreen_message(
+        &device.ui,
+        &format!(
+            "Savestate created in slot {}",
+            device.ui.storage.save_state_slot
+        ),
+    );
 }
 
 pub fn load_savestate(device: &mut device::Device) {
     let savestate = std::fs::read(&device.ui.storage.paths.savestate_file_path);
-    if savestate.is_ok() {
-        let device_bytes = ui::storage::decompress_file(savestate.as_ref().unwrap(), "device");
-        let save_bytes = ui::storage::decompress_file(savestate.as_ref().unwrap(), "saves");
-        let rdp_state = ui::storage::decompress_file(savestate.as_ref().unwrap(), "rdp_state");
+    if let Ok(savestate) = &savestate {
+        let device_bytes = ui::storage::decompress_file(savestate, "device");
+        let save_bytes = ui::storage::decompress_file(savestate, "saves");
+        let rdp_state = ui::storage::decompress_file(savestate, "rdp_state");
         if let Ok(state) = postcard::from_bytes::<device::Device>(&device_bytes) {
             device.ui.storage.saves = postcard::from_bytes(&save_bytes).unwrap();
 
@@ -116,6 +123,7 @@ pub fn load_savestate(device: &mut device::Device) {
             device.si = state.si;
             device.ri = state.ri;
             device.vru = state.vru;
+            device.cheats = state.cheats;
 
             let mut tpak_rom = [vec![], vec![], vec![], vec![]];
             for (i, item) in tpak_rom.iter_mut().enumerate() {
@@ -187,11 +195,24 @@ pub fn load_savestate(device: &mut device::Device) {
                 }
             }
 
-            ui::audio::close(&mut device.ui);
-            ui::audio::init(&mut device.ui, device.ai.freq);
+            ui::audio::close_game_audio(&mut device.ui);
+            ui::audio::init_game_audio(&mut device.ui, device.ai.freq);
             ui::video::load_state(device, rdp_state.as_ptr());
+            ui::video::onscreen_message(
+                &device.ui,
+                &format!(
+                    "Savestate loaded from slot {}",
+                    device.ui.storage.save_state_slot
+                ),
+            );
         } else {
-            println!("Failed to load savestate");
+            ui::video::onscreen_message(
+                &device.ui,
+                &format!(
+                    "Failed to load savestate from slot {}",
+                    device.ui.storage.save_state_slot
+                ),
+            );
         }
     }
 }

src/ui.rs

@@ -1,22 +1,22 @@
 pub mod audio;
+pub mod cheats;
 pub mod config;
 pub mod gui;
 pub mod input;
+pub mod netplay;
 pub mod storage;
 pub mod video;
 pub mod vru;
 
 pub struct Dirs {
     pub config_dir: std::path::PathBuf,
-    pub cache_dir: std::path::PathBuf,
     pub data_dir: std::path::PathBuf,
 }
 
 pub struct Audio {
+    pub audio_device_spec: sdl3_sys::audio::SDL_AudioSpec,
     pub audio_stream: *mut sdl3_sys::audio::SDL_AudioStream,
-    pub event_audio_stream: *mut sdl3_sys::audio::SDL_AudioStream,
     pub audio_device: u32,
-    pub event_audio: audio::EventAudio,
     pub gain: f32,
 }
 
@@ -30,6 +30,7 @@ pub struct Storage {
     pub save_type: Vec<storage::SaveTypes>,
     pub paths: storage::Paths,
     pub saves: storage::Saves,
+    pub save_state_slot: u32,
 }
 
 pub struct Video {
@@ -53,6 +54,7 @@ impl Drop for Ui {
     fn drop(&mut self) {
         if self.with_sdl {
             unsafe {
+                sdl3_ttf_sys::ttf::TTF_Quit();
                 sdl3_sys::init::SDL_Quit();
             }
         }
@@ -66,7 +68,15 @@ pub fn sdl_init(flag: sdl3_sys::init::SDL_InitFlags) {
             let err = std::ffi::CStr::from_ptr(sdl3_sys::error::SDL_GetError())
                 .to_str()
                 .unwrap();
-            panic!("Could not initialize SDL subsystem: {}, {}", flag, err);
+            panic!("Could not initialize SDL subsystem: {flag}, {err}");
+        }
+    }
+}
+
+pub fn ttf_init() {
+    unsafe {
+        if !sdl3_ttf_sys::ttf::TTF_Init() {
+            panic!("Could not initialize TTF");
         }
     }
 }
@@ -76,21 +86,17 @@ pub fn get_dirs() -> Dirs {
     let portable_dir = exe_path.parent();
     let portable = portable_dir.unwrap().join("portable.txt").exists();
     let config_dir;
-    let cache_dir;
     let data_dir;
     if portable {
         config_dir = portable_dir.unwrap().join("portable_data").join("config");
-        cache_dir = portable_dir.unwrap().join("portable_data").join("cache");
         data_dir = portable_dir.unwrap().join("portable_data").join("data");
     } else {
         config_dir = dirs::config_dir().unwrap().join("gopher64");
-        cache_dir = dirs::cache_dir().unwrap().join("gopher64");
         data_dir = dirs::data_dir().unwrap().join("gopher64");
     };
 
     Dirs {
         config_dir,
-        cache_dir,
         data_dir,
     }
 }
@@ -127,6 +133,7 @@ impl Ui {
                 joysticks,
             },
             storage: Storage {
+                save_state_slot: 0,
                 save_type: vec![],
                 paths: storage::Paths {
                     eep_file_path: std::path::PathBuf::new(),
@@ -169,22 +176,8 @@ impl Ui {
             game_id: String::new(),
             game_hash: String::new(),
             audio: Audio {
-                event_audio: audio::EventAudio {
-                    mempak: include_bytes!("../data/mempak.wav").to_vec(),
-                    rumblepak: include_bytes!("../data/rumblepak.wav").to_vec(),
-                    transferpak: include_bytes!("../data/transferpak.wav").to_vec(),
-                    netplay_desync: include_bytes!("../data/netplay_desync.wav").to_vec(),
-                    netplay_lost_connection: include_bytes!("../data/netplay_lost_connection.wav")
-                        .to_vec(),
-                    netplay_disconnected: [
-                        include_bytes!("../data/netplay_p1_disconnected.wav").to_vec(),
-                        include_bytes!("../data/netplay_p2_disconnected.wav").to_vec(),
-                        include_bytes!("../data/netplay_p3_disconnected.wav").to_vec(),
-                        include_bytes!("../data/netplay_p4_disconnected.wav").to_vec(),
-                    ],
-                },
+                audio_device_spec: Default::default(),
                 audio_stream: std::ptr::null_mut(),
-                event_audio_stream: std::ptr::null_mut(),
                 audio_device: 0,
                 gain: 1.0,
             },

src/ui/audio.rs

@@ -1,24 +1,9 @@
 use crate::device;
-use crate::netplay;
 use crate::ui;
 
-pub struct EventAudio {
-    pub mempak: Vec<u8>,
-    pub rumblepak: Vec<u8>,
-    pub transferpak: Vec<u8>,
-    pub netplay_desync: Vec<u8>,
-    pub netplay_lost_connection: Vec<u8>,
-    pub netplay_disconnected: [Vec<u8>; 4],
-}
-
 pub fn init(ui: &mut ui::Ui, frequency: u64) {
     ui::sdl_init(sdl3_sys::init::SDL_INIT_AUDIO);
 
-    let game_audio_spec = sdl3_sys::audio::SDL_AudioSpec {
-        format: sdl3_sys::audio::SDL_AUDIO_S16LE,
-        freq: frequency as i32,
-        channels: 2,
-    };
     let device_audio_spec = sdl3_sys::audio::SDL_AudioSpec {
         format: sdl3_sys::audio::SDL_AUDIO_S16LE,
         freq: 48000,
@@ -34,19 +19,29 @@ pub fn init(ui: &mut ui::Ui, frequency: u64) {
         panic!("Could not open audio device");
     }
 
-    let mut dst = Default::default();
     if !unsafe {
         sdl3_sys::audio::SDL_GetAudioDeviceFormat(
             ui.audio.audio_device,
-            &mut dst,
+            &mut ui.audio.audio_device_spec,
             std::ptr::null_mut(),
         )
     } {
         panic!("Could not get audio device format");
     }
 
-    ui.audio.audio_stream =
-        unsafe { sdl3_sys::audio::SDL_CreateAudioStream(&game_audio_spec, &dst) };
+    init_game_audio(ui, frequency);
+}
+
+pub fn init_game_audio(ui: &mut ui::Ui, frequency: u64) {
+    let game_audio_spec = sdl3_sys::audio::SDL_AudioSpec {
+        format: sdl3_sys::audio::SDL_AUDIO_S16LE,
+        freq: frequency as i32,
+        channels: 2,
+    };
+
+    ui.audio.audio_stream = unsafe {
+        sdl3_sys::audio::SDL_CreateAudioStream(&game_audio_spec, &ui.audio.audio_device_spec)
+    };
     if ui.audio.audio_stream.is_null() {
         return;
     }
@@ -56,38 +51,22 @@ pub fn init(ui: &mut ui::Ui, frequency: u64) {
     } {
         panic!("Could not bind audio stream");
     }
-
-    let wav_audio_spec = sdl3_sys::audio::SDL_AudioSpec {
-        format: sdl3_sys::audio::SDL_AUDIO_S16LE,
-        freq: 24000,
-        channels: 1,
-    };
-
-    ui.audio.event_audio_stream =
-        unsafe { sdl3_sys::audio::SDL_CreateAudioStream(&wav_audio_spec, &dst) };
-    if !unsafe {
-        sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.event_audio_stream, ui.audio.gain)
-            && sdl3_sys::audio::SDL_BindAudioStream(
-                ui.audio.audio_device,
-                ui.audio.event_audio_stream,
-            )
-    } {
-        panic!("Could not bind audio stream");
-    }
 }
 
 pub fn close(ui: &mut ui::Ui) {
+    close_game_audio(ui);
+    unsafe {
+        sdl3_sys::audio::SDL_CloseAudioDevice(ui.audio.audio_device);
+        ui.audio.audio_device = 0;
+    }
+}
+
+pub fn close_game_audio(ui: &mut ui::Ui) {
     unsafe {
         if !ui.audio.audio_stream.is_null() {
             sdl3_sys::audio::SDL_DestroyAudioStream(ui.audio.audio_stream);
             ui.audio.audio_stream = std::ptr::null_mut();
         }
-        if !ui.audio.event_audio_stream.is_null() {
-            sdl3_sys::audio::SDL_DestroyAudioStream(ui.audio.event_audio_stream);
-            ui.audio.event_audio_stream = std::ptr::null_mut();
-        }
-        sdl3_sys::audio::SDL_CloseAudioDevice(ui.audio.audio_device);
-        ui.audio.audio_device = 0;
     }
 }
 
@@ -98,7 +77,6 @@ pub fn lower_audio_volume(ui: &mut ui::Ui) {
             ui.audio.gain = 0.0;
         }
         sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.audio_stream, ui.audio.gain);
-        sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.event_audio_stream, ui.audio.gain);
     }
 }
 
@@ -109,61 +87,6 @@ pub fn raise_audio_volume(ui: &mut ui::Ui) {
             ui.audio.gain = 2.0;
         }
         sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.audio_stream, ui.audio.gain);
-        sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.event_audio_stream, ui.audio.gain);
-    }
-}
-
-pub fn play_netplay_audio(ui: &ui::Ui, error: u32) {
-    if ui.audio.event_audio_stream.is_null() {
-        return;
-    }
-    let sound = match error {
-        netplay::NETPLAY_ERROR_DESYNC => &ui.audio.event_audio.netplay_desync,
-        netplay::NETPLAY_ERROR_LOST_CONNECTION => &ui.audio.event_audio.netplay_lost_connection,
-        netplay::NETPLAY_ERROR_PLAYER_1_DISCONNECTED => {
-            &ui.audio.event_audio.netplay_disconnected[0]
-        }
-        netplay::NETPLAY_ERROR_PLAYER_2_DISCONNECTED => {
-            &ui.audio.event_audio.netplay_disconnected[1]
-        }
-        netplay::NETPLAY_ERROR_PLAYER_3_DISCONNECTED => {
-            &ui.audio.event_audio.netplay_disconnected[2]
-        }
-        netplay::NETPLAY_ERROR_PLAYER_4_DISCONNECTED => {
-            &ui.audio.event_audio.netplay_disconnected[3]
-        }
-        _ => panic!("Invalid netplay error"),
-    };
-    if !unsafe {
-        sdl3_sys::audio::SDL_PutAudioStreamData(
-            ui.audio.event_audio_stream,
-            sound.as_ptr() as *const std::ffi::c_void,
-            sound.len() as i32,
-        )
-    } {
-        panic!("Could not play audio");
-    }
-}
-
-pub fn play_pak_switch(ui: &ui::Ui, pak: device::controller::PakType) {
-    if ui.audio.event_audio_stream.is_null() {
-        return;
-    }
-
-    let sound = match pak {
-        device::controller::PakType::RumblePak => &ui.audio.event_audio.rumblepak,
-        device::controller::PakType::MemPak => &ui.audio.event_audio.mempak,
-        device::controller::PakType::TransferPak => &ui.audio.event_audio.transferpak,
-        _ => panic!("Invalid pak type"),
-    };
-    if !unsafe {
-        sdl3_sys::audio::SDL_PutAudioStreamData(
-            ui.audio.event_audio_stream,
-            sound.as_ptr() as *const std::ffi::c_void,
-            sound.len() as i32,
-        )
-    } {
-        panic!("Could not play audio");
     }
 }
 
@@ -176,12 +99,12 @@ pub fn play_audio(device: &device::Device, dram_addr: usize, length: u64) {
     let mut i = 0;
     while i < length as usize / 2 {
         // Left channel
-        primary_buffer[i] = device.rdram.mem[dram_addr + (i * 2) + 2] as i16
-            | ((device.rdram.mem[dram_addr + (i * 2) + 3] as i16) << 8);
+        primary_buffer[i] = *device.rdram.mem.get(dram_addr + (i * 2) + 2).unwrap_or(&0) as i16
+            | ((*device.rdram.mem.get(dram_addr + (i * 2) + 3).unwrap_or(&0) as i16) << 8);
 
         // Right channel
-        primary_buffer[i + 1] = device.rdram.mem[dram_addr + (i * 2)] as i16
-            | ((device.rdram.mem[dram_addr + (i * 2) + 1] as i16) << 8);
+        primary_buffer[i + 1] = *device.rdram.mem.get(dram_addr + (i * 2)).unwrap_or(&0) as i16
+            | ((*device.rdram.mem.get(dram_addr + (i * 2) + 1).unwrap_or(&0) as i16) << 8);
         i += 2;
     }
 

src/ui/cheats.rs

@@ -0,0 +1,156 @@
+use crate::device;
+use crate::ui;
+use crate::ui::gui::AppWindow;
+use crate::ui::gui::ErrorDialog;
+use slint::ComponentHandle;
+
+#[derive(serde::Serialize, serde::Deserialize, Clone)]
+pub struct CheatData {
+    note: String,
+    pub data: Vec<String>,
+    pub options: Option<std::collections::BTreeMap<String, String>>,
+}
+
+pub type Cheats = std::collections::BTreeMap<String, std::collections::BTreeMap<String, CheatData>>;
+
+pub fn cheats_window(app: &AppWindow) {
+    let weak = app.as_weak();
+    app.on_cheats_select_rom_clicked(move |rom_dir| {
+        let select_rom = if !rom_dir.is_empty()
+            && let Ok(exists) = std::fs::exists(&rom_dir)
+            && exists
+        {
+            rfd::AsyncFileDialog::new().set_directory(rom_dir)
+        } else {
+            rfd::AsyncFileDialog::new()
+        }
+        .set_title("Select ROM")
+        .add_filter("ROM files", &ui::gui::N64_EXTENSIONS)
+        .pick_file();
+        let weak = weak.clone();
+        tokio::spawn(async move {
+            if let Some(file) = select_rom.await
+                && let Some(rom_contents) = device::get_rom_contents(file.path())
+            {
+                let game_crc = ui::storage::get_game_crc(&rom_contents);
+                let game_name = ui::storage::get_game_name(&rom_contents);
+                weak.upgrade_in_event_loop(move |handle| {
+                    handle.set_cheat_game_name(game_name.into());
+                })
+                .unwrap();
+                let cheats: Cheats =
+                    serde_json::from_slice(include_bytes!("../../data/cheats.json")).unwrap();
+                if let Some(cheat) = cheats.get(&game_crc) {
+                    let cheat = cheat.clone();
+                    weak.upgrade_in_event_loop(move |handle| {
+                        let cheat_settings = ui::config::Cheats::new();
+                        let game_cheats = cheat_settings.cheats.get(&game_crc).cloned();
+                        handle.set_cheat_game_crc(game_crc.into());
+                        let cheats_vec = slint::VecModel::default();
+                        for item in cheat.iter() {
+                            let mut cheat_enabled = false;
+                            if let Some(game_cheat) = game_cheats.as_ref()
+                                && game_cheat.contains_key(item.0)
+                            {
+                                cheat_enabled = true;
+                            }
+                            let options_vec = slint::VecModel::default();
+                            if let Some(options) = item.1.options.as_ref() {
+                                for option in options.iter() {
+                                    let mut option_enabled = false;
+                                    if let Some(game_cheat) = game_cheats.as_ref()
+                                        && game_cheat.contains_key(item.0)
+                                        && let Some(opt) = game_cheat.get(item.0)
+                                        && let Some(opt) = opt
+                                        && opt == option.0
+                                    {
+                                        option_enabled = true;
+                                    }
+                                    options_vec.push((option_enabled, option.0.into()));
+                                }
+                            }
+                            let options = slint::ModelRc::from(std::rc::Rc::new(options_vec));
+                            cheats_vec.push((
+                                item.0.clone().into(),
+                                cheat_enabled,
+                                item.1.clone().note.into(),
+                                options,
+                            ));
+                        }
+                        #[allow(clippy::type_complexity)]
+                        let cheats_model: std::rc::Rc<
+                            slint::VecModel<(
+                                slint::SharedString,
+                                bool,
+                                slint::SharedString,
+                                slint::ModelRc<(bool, slint::SharedString)>,
+                            )>,
+                        > = std::rc::Rc::new(cheats_vec);
+                        handle.set_cheats(slint::ModelRc::from(cheats_model));
+                    })
+                    .unwrap();
+                } else {
+                    clear_cheats(&weak, false);
+                }
+            } else {
+                clear_cheats(&weak, true);
+                weak.upgrade_in_event_loop(move |_handle| {
+                    let message_dialog = ErrorDialog::new().unwrap();
+                    let weak_dialog = message_dialog.as_weak();
+                    message_dialog.on_close_clicked(move || {
+                        weak_dialog.unwrap().window().hide().unwrap();
+                    });
+                    message_dialog.set_text("Could not read ROM".into());
+                    message_dialog.show().unwrap();
+                })
+                .unwrap();
+            }
+        });
+    });
+
+    let weak = app.as_weak();
+    app.on_cheats_clear_clicked(move || {
+        let mut cheats = ui::config::Cheats::new();
+        cheats.cheats.clear();
+        clear_cheats(&weak, true);
+    });
+
+    app.on_cheat_toggled(move |game_crc, cheat_name, option, enabled| {
+        let mut cheats = ui::config::Cheats::new();
+        let mut game_cheats = cheats
+            .cheats
+            .remove(&game_crc.to_string())
+            .unwrap_or_default();
+        if enabled {
+            let cheat_option = if option.is_empty() {
+                None
+            } else {
+                Some(option.into())
+            };
+            game_cheats.insert(cheat_name.into(), cheat_option);
+        } else {
+            game_cheats.remove(&cheat_name.to_string());
+        }
+        cheats.cheats.insert(game_crc.into(), game_cheats);
+    });
+}
+
+fn clear_cheats(weak: &slint::Weak<AppWindow>, clear_name: bool) {
+    weak.upgrade_in_event_loop(move |handle| {
+        let cheats_vec = slint::VecModel::default();
+        #[allow(clippy::type_complexity)]
+        let cheats_model: std::rc::Rc<
+            slint::VecModel<(
+                slint::SharedString,
+                bool,
+                slint::SharedString,
+                slint::ModelRc<(bool, slint::SharedString)>,
+            )>,
+        > = std::rc::Rc::new(cheats_vec);
+        handle.set_cheats(slint::ModelRc::from(cheats_model));
+        if clear_name {
+            handle.set_cheat_game_name("".into());
+        }
+    })
+    .unwrap();
+}

src/ui/config.rs

@@ -33,7 +33,7 @@ pub struct InputProfile {
 
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct Input {
-    pub input_profiles: std::collections::HashMap<String, InputProfile>,
+    pub input_profiles: std::collections::BTreeMap<String, InputProfile>,
     pub input_profile_binding: [String; 4],
     pub controller_assignment: [Option<String>; 4],
     pub controller_enabled: [bool; 4],
@@ -53,6 +53,13 @@ pub struct Video {
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct Emulation {
     pub overclock: bool,
+    pub disable_expansion_pak: bool,
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct Cheats {
+    pub cheats:
+        std::collections::HashMap<String, std::collections::HashMap<String, Option<String>>>,
 }
 
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -60,6 +67,37 @@ pub struct Config {
     pub input: Input,
     pub video: Video,
     pub emulation: Emulation,
+    pub rom_dir: std::path::PathBuf,
+}
+
+impl Drop for Cheats {
+    fn drop(&mut self) {
+        write_cheats(self);
+    }
+}
+
+fn write_cheats(cheats: &Cheats) {
+    let dirs = ui::get_dirs();
+    let file_path = dirs.config_dir.join("cheats.json");
+    let f = std::fs::File::create(file_path).unwrap();
+    serde_json::to_writer_pretty(f, &cheats).unwrap();
+}
+
+impl Cheats {
+    pub fn new() -> Cheats {
+        let dirs = ui::get_dirs();
+        let file_path = dirs.config_dir.join("cheats.json");
+        let cheats_file = std::fs::read(file_path);
+        if let Ok(cheats_file) = cheats_file {
+            let result = serde_json::from_slice(cheats_file.as_ref());
+            if let Ok(result) = result {
+                return result;
+            }
+        }
+        Cheats {
+            cheats: std::collections::HashMap::new(),
+        }
+    }
 }
 
 impl Drop for Config {
@@ -80,13 +118,13 @@ impl Config {
         let dirs = ui::get_dirs();
         let file_path = dirs.config_dir.join("config.json");
         let config_file = std::fs::read(file_path);
-        if config_file.is_ok() {
-            let result = serde_json::from_slice(config_file.unwrap().as_ref());
+        if let Ok(config_file) = config_file {
+            let result = serde_json::from_slice(config_file.as_ref());
             if let Ok(result) = result {
                 return result;
             }
         }
-        let mut input_profiles = std::collections::HashMap::new();
+        let mut input_profiles = std::collections::BTreeMap::new();
         input_profiles.insert("default".to_string(), ui::input::get_default_profile());
         Config {
             input: Input {
@@ -109,7 +147,11 @@ impl Config {
                 widescreen: false,
                 crt: false,
             },
-            emulation: Emulation { overclock: false },
+            emulation: Emulation {
+                overclock: false,
+                disable_expansion_pak: false,
+            },
+            rom_dir: std::path::PathBuf::new(),
         }
     }
 }

src/ui/gui/about_page.slint

@@ -0,0 +1,98 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { Button, HorizontalBox, VerticalBox } from "std-widgets.slint";
+import { Page } from "page.slint";
+
+export global AboutData {
+    in property <string> version;
+    in property <bool> has_update;
+}
+
+export component NewVersionButton {
+    callback newversion_button_clicked;
+    HorizontalBox {
+        alignment: center;
+        Button {
+            text: @tr("New version available! Click here to download");
+            primary: true;
+            clicked => {
+                newversion_button_clicked();
+            }
+        }
+    }
+}
+
+export component About inherits Page {
+    callback wiki_button_clicked;
+    callback discord_button_clicked;
+    callback newversion_button_clicked;
+    callback patreon_button_clicked;
+    callback github_sponsors_button_clicked;
+    callback source_code_button_clicked;
+    title: @tr("About");
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Wiki");
+                clicked => {
+                    wiki_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Discord Server");
+                clicked => {
+                    discord_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Source Code");
+                clicked => {
+                    source_code_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Donate (via Patreon)");
+                clicked => {
+                    patreon_button_clicked();
+                }
+            }
+
+            Button {
+                text: @tr("Donate (via GitHub)");
+                clicked => {
+                    github_sponsors_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Text {
+                text: AboutData.version;
+            }
+        }
+
+        if AboutData.has_update:NewVersionButton {
+            newversion_button_clicked => {
+                newversion_button_clicked();
+            }
+        }
+        Rectangle { }
+    }
+}

src/ui/gui/appwindow.slint

@@ -0,0 +1,152 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { StandardButton } from "std-widgets.slint";
+import { LocalGame, ControllerConfig, Netplay, Cheats, Settings, About } from "pages.slint";
+import { SideBar } from "side_bar.slint";
+import { SettingsData } from "settings_page.slint";
+import { AboutData } from "about_page.slint";
+import { ControllerData } from "controller_page.slint";
+import { State } from "localgame_page.slint";
+import { CheatsData } from "cheat_page.slint";
+export { InputProfileDialog } from "input_profile.slint";
+export { VruDialog } from "vru_dialog.slint";
+export { NetplayCreate } from "netplay_create.slint";
+export { NetplayJoin } from "netplay_join.slint";
+export { NetplayWait } from "netplay_wait.slint";
+export { CustomNetplayServer } from "netplay_page.slint";
+export { DispatcherDialog } from "netplay_create.slint";
+
+export component AppWindow inherits Window {
+    callback wiki_button_clicked;
+    callback discord_button_clicked;
+    callback newversion_button_clicked;
+    callback patreon_button_clicked;
+    callback github_sponsors_button_clicked;
+    callback source_code_button_clicked;
+    callback open_rom_button_clicked;
+    callback saves_folder_button_clicked;
+    callback input_profile_button_clicked;
+    callback create_session_button_clicked;
+    callback join_session_button_clicked;
+    callback netplay_discord_button_clicked;
+    callback netplay_feedback_button_clicked;
+    callback cheats_select_rom_clicked(string);
+    callback cheats_clear_clicked;
+    callback cheat_toggled(string, string, string, bool);
+    in property version <=> AboutData.version;
+    in property has_update <=> AboutData.has_update;
+    in-out property integer_scaling <=> SettingsData.integer_scaling;
+    in-out property fullscreen <=> SettingsData.fullscreen;
+    in-out property widescreen <=> SettingsData.widescreen;
+    in-out property apply_crt_shader <=> SettingsData.apply_crt_shader;
+    in-out property overclock_n64_cpu <=> SettingsData.overclock_n64_cpu;
+    in-out property disable_expansion_pak <=> SettingsData.disable_expansion_pak;
+    in-out property resolution <=> SettingsData.resolution;
+    in-out property rom_dir <=> SettingsData.rom_dir;
+    in-out property emulate_vru <=> ControllerData.emulate_vru;
+    in-out property controller_enabled <=> ControllerData.controller_enabled;
+    in-out property transferpak <=> ControllerData.transferpak;
+    in-out property selected_profile_binding <=> ControllerData.selected_profile_binding;
+    in-out property input_profiles <=> ControllerData.input_profiles;
+    in-out property controller_names <=> ControllerData.controller_names;
+    in-out property selected_controller <=> ControllerData.selected_controller;
+    in-out property game_running <=> State.game_running;
+    in-out property blank_profiles <=> ControllerData.blank_profiles;
+    in-out property cheat_game_name <=> CheatsData.cheat_game_name;
+    in-out property cheat_game_crc <=> CheatsData.cheat_game_crc;
+    in-out property cheats <=> CheatsData.cheats;
+    preferred-width: 700px;
+    preferred-height: 500px;
+    title: @tr("Gopher64");
+    icon: @image-url("../../../data/icon/gopher64.png");
+
+    HorizontalLayout {
+        side-bar := SideBar {
+            title: @tr("Gopher64");
+            model: [
+                @tr("Menu" => "Local Game"),
+                @tr("Menu" => "Controller Config"),
+                @tr("Menu" => "Netplay"),
+                @tr("Menu" => "Cheats"),
+                @tr("Menu" => "Settings"),
+                @tr("Menu" => "About")
+            ];
+        }
+
+        if(side-bar.current-item == 0): LocalGame {
+            open_rom_button_clicked => {
+                open_rom_button_clicked();
+            }
+            saves_folder_button_clicked => {
+                saves_folder_button_clicked();
+            }
+            newversion_button_clicked => {
+                newversion_button_clicked();
+            }
+        }
+        if(side-bar.current-item == 1): ControllerConfig {
+            input_profile_button_clicked => {
+                input_profile_button_clicked();
+            }
+        }
+        if(side-bar.current-item == 2): Netplay {
+            create_session_button_clicked => {
+                create_session_button_clicked();
+            }
+            join_session_button_clicked => {
+                join_session_button_clicked();
+            }
+            netplay_discord_button_clicked => {
+                netplay_discord_button_clicked();
+            }
+            netplay_feedback_button_clicked => {
+                netplay_feedback_button_clicked();
+            }
+        }
+        if(side-bar.current-item == 3): Cheats {
+            cheats_select_rom_clicked(rom_dir) => {
+                cheats_select_rom_clicked(rom_dir);
+            }
+            cheats_clear_clicked => {
+                cheats_clear_clicked();
+            }
+            cheat_toggled(game_crc, cheat_name, option, enabled) => {
+                cheat_toggled(game_crc,cheat_name,option,enabled);
+            }
+        }
+        if(side-bar.current-item == 4): Settings { }
+        if(side-bar.current-item == 5): About {
+            wiki_button_clicked => {
+                wiki_button_clicked();
+            }
+            discord_button_clicked => {
+                discord_button_clicked();
+            }
+            newversion_button_clicked => {
+                newversion_button_clicked();
+            }
+            patreon_button_clicked => {
+                patreon_button_clicked();
+            }
+            github_sponsors_button_clicked => {
+                github_sponsors_button_clicked();
+            }
+            source_code_button_clicked => {
+                source_code_button_clicked();
+            }
+        }
+    }
+}
+
+export component ErrorDialog inherits Dialog {
+    in-out property <string> text;
+    title: @tr("Error");
+    Text {
+        text: text;
+    }
+
+    StandardButton {
+        kind: close;
+    }
+}

src/ui/gui/cheat_page.slint

@@ -0,0 +1,90 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { ListView, HorizontalBox, VerticalBox, Button, GroupBox, CheckBox } from "std-widgets.slint";
+import { Page } from "page.slint";
+import { SettingsData } from "settings_page.slint";
+
+export global CheatsData {
+    in-out property <string> cheat_game_name;
+    in-out property <string> cheat_game_crc;
+    in-out property <[{cheat_name:string, notes:string, enabled:bool, options:[{option:string, enabled:bool}]}]> cheats;
+}
+
+export component Cheats inherits Page {
+    title: @tr("Cheats");
+    callback cheats_select_rom_clicked(string);
+    callback cheats_clear_clicked;
+    callback cheat_toggled(string, string, string, bool);
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: start;
+            if CheatsData.cheat_game_name == "": Button {
+                text: @tr("Select ROM");
+                clicked => {
+                    cheats_select_rom_clicked(SettingsData.rom_dir);
+                }
+            }
+            if CheatsData.cheat_game_name != "": Button {
+                text: CheatsData.cheat_game_name;
+                clicked => {
+                    cheats_select_rom_clicked(SettingsData.rom_dir);
+                }
+            }
+            Rectangle {
+                width: 20px;
+            }
+
+            Button {
+                text: @tr("Clear Cheats For All ROMs");
+                clicked => {
+                    cheats_clear_clicked();
+                }
+            }
+        }
+
+        Rectangle { }
+
+        if CheatsData.cheats.length > 0:ListView {
+            preferred-height: 500px;
+            preferred-width: 520px;
+            for data in CheatsData.cheats: VerticalBox {
+                Text {
+                    text: data.cheat_name;
+                    font-size: 16px;
+                    wrap: word-wrap;
+                }
+
+                if data.notes != "":Text {
+                    text: data.notes;
+                    wrap: word-wrap;
+                }
+
+                if data.options.length == 0: CheckBox {
+                    text: @tr("Enabled");
+                    checked: data.enabled;
+                    toggled => {
+                        data.enabled = self.checked;
+                        cheat_toggled(CheatsData.cheat_game_crc,data.cheat_name,"",self.checked);
+                    }
+                }
+                for item[index] in data.options: CheckBox {
+                    text: item.option;
+                    enabled: !data.enabled || (data.enabled && item.enabled);
+                    checked: item.enabled;
+                    toggled => {
+                        item.enabled = self.checked;
+                        data.enabled = self.checked;
+                        cheat_toggled(CheatsData.cheat_game_crc,data.cheat_name,item.option,self.checked);
+                    }
+                }
+                Rectangle { }
+            }
+        }
+        if CheatsData.cheats.length == 0 && CheatsData.cheat_game_name != "": Text {
+            text: @tr("No Cheats Available");
+        }
+    }
+}

src/ui/gui/controller_page.slint

@@ -0,0 +1,123 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { CheckBox, ComboBox, Button, HorizontalBox, VerticalBox, GroupBox } from "std-widgets.slint";
+import { Page } from "page.slint";
+import { State } from "localgame_page.slint";
+
+export global ControllerData {
+    in-out property <bool> emulate_vru;
+    in-out property <[bool]> controller_enabled;
+    in-out property <[bool]> transferpak;
+    in-out property <[int]> selected_profile_binding: [-1, -1, -1, -1];
+    in-out property <[string]> input_profiles;
+    in-out property <[string]> controller_names;
+    in-out property <[int]> selected_controller;
+    in-out property <bool> blank_profiles;
+}
+
+export component ControllerConfig inherits Page {
+    callback input_profile_button_clicked;
+    title: @tr("Controller Configuration");
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: start;
+            Button {
+                text: @tr("Configure Input Profile");
+                enabled: !State.game_running;
+                clicked => {
+                    input_profile_button_clicked();
+                }
+            }
+        }
+
+        Rectangle { }
+
+        HorizontalBox {
+            GroupBox {
+                title: @tr("Port");
+                VerticalLayout {
+                    alignment: space-between;
+                    for player in [0, 1, 2, 3]: Text {
+                        text: player + 1;
+                        vertical-alignment: center;
+                    }
+                }
+            }
+
+            GroupBox {
+                title: @tr("Enabled");
+                VerticalLayout {
+                    alignment: space-between;
+                    for player in [0, 1, 2, 3]: CheckBox {
+                        checked: ControllerData.controller_enabled[player];
+                        toggled => {
+                            ControllerData.controller_enabled[player] = self.checked;
+                        }
+                    }
+                }
+            }
+
+            GroupBox {
+                title: @tr("Emulate VRU");
+                VerticalLayout {
+                    alignment: space-between;
+                    for valid in [false, false, false, true]: CheckBox {
+                        enabled: valid;
+                        checked: valid && ControllerData.emulate_vru;
+                        toggled => {
+                            ControllerData.emulate_vru = self.checked;
+                        }
+                    }
+                }
+            }
+
+            GroupBox {
+                title: @tr("Transfer Pak");
+                VerticalLayout {
+                    alignment: space-between;
+                    for player in [0, 1, 2, 3]: CheckBox {
+                        checked: ControllerData.transferpak[player];
+                        toggled => {
+                            ControllerData.transferpak[player] = self.checked;
+                        }
+                    }
+                }
+            }
+
+            if !ControllerData.blank_profiles: GroupBox {
+                title: @tr("Profile");
+                horizontal-stretch: 0.25;
+                VerticalLayout {
+                    alignment: space-between;
+                    for player in [0, 1, 2, 3]: ComboBox {
+                        model: ControllerData.input_profiles;
+                        min-width: self.preferred-width > 150px ? self.preferred-width : 150px;
+                        current-index: ControllerData.selected_profile_binding[player];
+                        selected => {
+                            ControllerData.selected_profile_binding[player] = self.current-index;
+                        }
+                    }
+                }
+            }
+
+            GroupBox {
+                title: @tr("Controller");
+                horizontal-stretch: 0.75;
+                VerticalLayout {
+                    alignment: space-between;
+                    for player in [0, 1, 2, 3]: ComboBox {
+                        model: ControllerData.controller_names;
+                        min-width: self.preferred-width > 300px ? self.preferred-width : 300px;
+                        current-index: ControllerData.selected_controller[player];
+                        selected => {
+                            ControllerData.selected_controller[player] = self.current-index;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/ui/gui/gui_netplay.rs

@@ -1,947 +0,0 @@
-use crate::device;
-use crate::ui::gui::GopherEguiApp;
-use crate::ui::{self, gui};
-use eframe::egui;
-use sha2::{Digest, Sha256};
-
-const NETPLAY_VERSION: i32 = 17;
-const EMU_NAME: &str = "gopher64";
-
-#[derive(Default)]
-pub struct GameInfo {
-    pub md5: String,
-    pub game_name: String,
-    pub rom_label: String,
-    pub rom_contents: Vec<u8>,
-}
-
-#[derive(PartialEq, Default)]
-pub struct NetplayServer {
-    pub name: String,
-    pub ip: String,
-}
-
-#[derive(Default)]
-pub struct GuiNetplay {
-    pub create: bool,
-    pub join: bool,
-    pub wait: bool,
-    pub session_name: String,
-    pub password: String,
-    pub player_name: String,
-    pub error: String,
-    pub create_rom_label: String,
-    pub join_rom_label: String,
-    pub send_chat: bool,
-    pub have_sessions: Option<NetplayServer>,
-    pub begin_game: bool,
-    pub chat_log: String,
-    pub chat_message: String,
-    pub selected_session: Option<NetplayRoom>,
-    pub pending_begin: bool,
-    pub peer_addr: Option<std::net::SocketAddr>,
-    pub motd: String,
-    pub sessions: Vec<NetplayRoom>,
-    pub rom_contents: Vec<u8>,
-    pub player_number: u8,
-    pub player_names: [String; 4],
-    pub server: NetplayServer,
-    pub socket_waiting: bool,
-    pub game_info: GameInfo,
-    pub servers: Vec<NetplayServer>,
-    pub waiting_session: Option<NetplayRoom>,
-    pub socket:
-        Option<tungstenite::WebSocket<tungstenite::stream::MaybeTlsStream<std::net::TcpStream>>>,
-    pub server_receiver:
-        Option<tokio::sync::mpsc::Receiver<std::collections::HashMap<String, String>>>,
-    pub game_info_receiver: Option<tokio::sync::mpsc::Receiver<GameInfo>>,
-    pub broadcast_socket: Option<std::net::UdpSocket>,
-    pub broadcast_timer: Option<std::time::Instant>,
-}
-
-#[derive(serde::Serialize, serde::Deserialize, PartialEq, Default, Clone)]
-pub struct NetplayRoom {
-    room_name: Option<String>,
-    password: Option<String>,
-    protected: Option<bool>,
-    #[serde(rename = "MD5")]
-    md5: Option<String>,
-    game_name: Option<String>,
-    pub port: Option<i32>,
-    features: Option<std::collections::HashMap<String, String>>,
-    buffer_target: Option<i32>,
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct NetplayMessage {
-    #[serde(rename = "type")]
-    message_type: String,
-    player_name: Option<String>,
-    client_sha: Option<String>,
-    netplay_version: Option<i32>,
-    emulator: Option<String>,
-    room: Option<NetplayRoom>,
-    accept: Option<i32>,
-    message: Option<String>,
-    auth: Option<String>,
-    player_names: Option<[String; 4]>,
-    #[serde(rename = "authTime")]
-    auth_time: Option<String>,
-    rooms: Option<Vec<NetplayRoom>>,
-}
-
-fn get_servers(app: &mut GopherEguiApp, ctx: &egui::Context) {
-    if app.netplay.servers.is_empty() {
-        if app.netplay.broadcast_socket.is_none() {
-            app.netplay.broadcast_socket = Some(
-                std::net::UdpSocket::bind((std::net::Ipv4Addr::UNSPECIFIED, 0))
-                    .expect("couldn't bind to address"),
-            );
-            let socket = app.netplay.broadcast_socket.as_ref().unwrap();
-            socket
-                .set_broadcast(true)
-                .expect("set_broadcast call failed");
-            socket
-                .set_nonblocking(true)
-                .expect("could not set up socket");
-            let data: [u8; 1] = [1];
-            socket
-                .send_to(&data, (std::net::Ipv4Addr::BROADCAST, 45000))
-                .expect("couldn't send data");
-            app.netplay.broadcast_timer =
-                Some(std::time::Instant::now() + std::time::Duration::from_secs(5));
-            ctx.request_repaint();
-        }
-        if app.netplay.server_receiver.is_none() {
-            let (tx, rx) = tokio::sync::mpsc::channel(1);
-            app.netplay.server_receiver = Some(rx);
-            let gui_ctx = ctx.clone();
-            let task = reqwest::get("https://m64p.s3.amazonaws.com/servers.json");
-            tokio::spawn(async move {
-                let response = task.await;
-                if let Ok(response) = response {
-                    tx.send(response.json().await.unwrap()).await.unwrap();
-                    gui_ctx.request_repaint();
-                }
-            });
-        }
-    }
-    if app.netplay.broadcast_timer.is_some()
-        && std::time::Instant::now() > app.netplay.broadcast_timer.unwrap()
-    {
-        app.netplay.broadcast_timer = None;
-    }
-    if app.netplay.broadcast_socket.is_some() && app.netplay.broadcast_timer.is_some() {
-        let mut buffer = [0; 1024];
-        let result = app
-            .netplay
-            .broadcast_socket
-            .as_ref()
-            .unwrap()
-            .recv_from(&mut buffer);
-        if result.is_ok() {
-            let (amt, _src) = result.unwrap();
-            let data: std::collections::HashMap<String, String> =
-                serde_json::from_slice(&buffer[..amt]).unwrap();
-            for server in data.iter() {
-                let (server_name, server_ip) = server;
-                app.netplay.servers.push(NetplayServer {
-                    name: server_name.to_string(),
-                    ip: server_ip.to_string(),
-                });
-                app.netplay.server = NetplayServer {
-                    name: server.0.clone(),
-                    ip: server.1.clone(),
-                };
-            }
-            app.netplay.broadcast_socket = None;
-        }
-        ctx.request_repaint();
-    }
-    if app.netplay.server_receiver.is_some() {
-        let result = app.netplay.server_receiver.as_mut().unwrap().try_recv();
-        if result.is_ok() {
-            for server in result.unwrap().iter() {
-                app.netplay.servers.push(NetplayServer {
-                    name: server.0.clone(),
-                    ip: server.1.clone(),
-                });
-            }
-            app.netplay.server_receiver = None;
-            if app.netplay.server.name.is_empty() {
-                let first_server = app.netplay.servers.first().unwrap();
-                app.netplay.server = NetplayServer {
-                    name: first_server.name.clone(),
-                    ip: first_server.ip.clone(),
-                };
-            }
-        }
-        ctx.request_repaint();
-    }
-}
-
-pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) {
-    egui::Window::new("Create Netplay Session").show(ctx, |ui| {
-        egui::Grid::new("netplay_create_grid").show(ui, |ui| {
-            let profile_name_label = ui.label("Session Name:");
-            let mut size = ui.spacing().interact_size;
-            size.x = 200.0;
-            ui.add_sized(size, |ui: &mut egui::Ui| {
-                ui.text_edit_singleline(&mut app.netplay.session_name)
-                    .labelled_by(profile_name_label.id)
-            });
-
-            ui.end_row();
-
-            let password_label = ui.label("Password (Optional):");
-
-            ui.text_edit_singleline(&mut app.netplay.password)
-                .labelled_by(password_label.id);
-
-            ui.end_row();
-
-            ui.label("ROM");
-            if app.netplay.create_rom_label.is_empty() {
-                app.netplay.create_rom_label = "Open ROM".to_string();
-            }
-            if ui.button(&app.netplay.create_rom_label).clicked() {
-                let (tx, rx) = tokio::sync::mpsc::channel(1);
-                app.netplay.game_info_receiver = Some(rx);
-                let gui_ctx = ctx.clone();
-                app.netplay.create_rom_label = "Inspecting ROM".to_string();
-                let task = rfd::AsyncFileDialog::new()
-                    .set_title("Select ROM")
-                    .pick_file();
-                tokio::spawn(async move {
-                    let file = task.await;
-
-                    if let Some(file) = file {
-                        parse_rom_file(file, tx).await;
-                    } else {
-                        tx.send(GameInfo {
-                            md5: "".to_string(),
-                            game_name: "".to_string(),
-                            rom_label: "Open ROM".to_string(),
-                            rom_contents: vec![],
-                        })
-                        .await
-                        .unwrap();
-                    }
-                    gui_ctx.request_repaint();
-                });
-            }
-
-            ui.end_row();
-
-            let player_name_label = ui.label("Player Name:");
-
-            ui.text_edit_singleline(&mut app.netplay.player_name)
-                .labelled_by(player_name_label.id);
-
-            ui.end_row();
-
-            ui.label("Server:");
-
-            get_servers(app, ctx);
-
-            if app.netplay.game_info_receiver.is_some() {
-                let result = app.netplay.game_info_receiver.as_mut().unwrap().try_recv();
-                if result.is_ok() {
-                    app.netplay.game_info_receiver = None;
-                    let data = result.unwrap();
-                    if !data.md5.is_empty() {
-                        app.netplay.game_info = data;
-                        app.netplay.rom_contents = app.netplay.game_info.rom_contents.clone();
-                        app.netplay.create_rom_label = app.netplay.game_info.rom_label.clone();
-                    } else {
-                        app.netplay.create_rom_label = data.rom_label;
-                    }
-                }
-                ctx.request_repaint();
-            }
-
-            egui::ComboBox::from_id_salt("server-combobox")
-                .selected_text(app.netplay.server.name.to_string())
-                .show_ui(ui, |ui| {
-                    for server in app.netplay.servers.iter() {
-                        ui.selectable_value(
-                            &mut app.netplay.server,
-                            NetplayServer {
-                                name: server.name.clone(),
-                                ip: server.ip.clone(),
-                            },
-                            server.name.clone(),
-                        );
-                    }
-                });
-
-            ui.end_row();
-
-            if app.netplay.socket_waiting {
-                let data = app.netplay.socket.as_mut().unwrap().read();
-                if data.is_ok() {
-                    let message: NetplayMessage =
-                        serde_json::from_slice(&data.unwrap().into_data()).unwrap();
-                    if message.accept.unwrap() == 0 {
-                        if message.message_type == "reply_create_room" {
-                            app.netplay.create = false;
-                            app.netplay.wait = true;
-                            app.netplay.waiting_session = Some(message.room.unwrap());
-                        }
-                    } else {
-                        app.netplay.error = message.message.unwrap();
-                    }
-                    app.netplay.socket_waiting = false;
-                }
-                ctx.request_repaint();
-            }
-        });
-        ui.horizontal(|ui| {
-            if ui.button("Create Session").clicked() {
-                if app.netplay.player_name.is_empty() {
-                    app.netplay.error = "Player Name cannot be empty".to_string();
-                } else if app.netplay.session_name.is_empty() {
-                    app.netplay.error = "Session Name cannot be empty".to_string();
-                } else if app.netplay.game_info.md5.is_empty() {
-                    app.netplay.error = "ROM not loaded".to_string();
-                } else {
-                    let now_utc = chrono::Utc::now().timestamp_millis().to_string();
-                    let hasher = Sha256::new().chain_update(&now_utc).chain_update(EMU_NAME);
-                    let mut game_name = app.netplay.game_info.game_name.to_string();
-                    if game_name.is_empty() {
-                        // If the ROM doesn't report a name, use the filename
-                        game_name = app.netplay.create_rom_label.clone();
-                    }
-                    let mut features = std::collections::HashMap::new();
-                    features.insert("overclock".to_string(), app.overclock.to_string());
-                    let netplay_message = NetplayMessage {
-                        message_type: "request_create_room".to_string(),
-                        player_name: Some(app.netplay.player_name.clone()),
-                        client_sha: Some(env!("GIT_HASH").to_string()),
-                        netplay_version: Some(NETPLAY_VERSION),
-                        emulator: Some(EMU_NAME.to_string()),
-                        accept: None,
-                        message: None,
-                        rooms: None,
-                        auth_time: Some(now_utc),
-                        player_names: None,
-                        auth: Some(format!("{:x}", hasher.finalize())),
-                        room: Some(NetplayRoom {
-                            room_name: Some(app.netplay.session_name.clone()),
-                            password: Some(app.netplay.password.clone()),
-                            game_name: Some(game_name),
-                            md5: Some(app.netplay.game_info.md5.clone()),
-                            protected: None,
-                            port: None,
-                            features: Some(features),
-                            buffer_target: None,
-                        }),
-                    };
-                    if let Ok((mut socket, _response)) =
-                        tungstenite::connect(&app.netplay.server.ip)
-                    {
-                        socket
-                            .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                                serde_json::to_vec(&netplay_message).unwrap(),
-                            )))
-                            .unwrap();
-                        match socket.get_mut() {
-                            tungstenite::stream::MaybeTlsStream::Plain(stream) => {
-                                app.netplay.peer_addr = Some(stream.peer_addr().unwrap());
-                                stream.set_nonblocking(true)
-                            }
-                            _ => unimplemented!(),
-                        }
-                        .expect("could not set socket to non-blocking");
-                        app.netplay.socket_waiting = true;
-                        app.netplay.socket = Some(socket);
-                    }
-                }
-            }
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui.button("Close").clicked() {
-                    if let Some(socket) = app.netplay.socket.as_mut() {
-                        socket.close(None).unwrap();
-                        loop {
-                            match socket.read() {
-                                Err(tungstenite::Error::ConnectionClosed) => break,
-                                _ => continue,
-                            };
-                        }
-                    }
-                    app.netplay = Default::default();
-                };
-            })
-        });
-    });
-}
-
-fn get_sessions(app: &mut GopherEguiApp, ctx: &egui::Context) {
-    if app.netplay.have_sessions.is_some()
-        && app.netplay.server != *app.netplay.have_sessions.as_ref().unwrap()
-    {
-        // User has changed the server
-        app.netplay.have_sessions = None;
-        app.netplay.socket = None;
-    }
-    if app.netplay.socket.is_none() {
-        if let Ok((mut sock, _response)) = tungstenite::connect(&app.netplay.server.ip) {
-            match sock.get_mut() {
-                tungstenite::stream::MaybeTlsStream::Plain(stream) => {
-                    app.netplay.peer_addr = Some(stream.peer_addr().unwrap());
-                    stream.set_nonblocking(true)
-                }
-                _ => unimplemented!(),
-            }
-            .expect("could not set socket to non-blocking");
-            app.netplay.socket = Some(sock);
-        }
-    }
-    if app.netplay.socket.is_some() {
-        let socket = app.netplay.socket.as_mut().unwrap();
-        if app.netplay.have_sessions.is_none() {
-            let now_utc = chrono::Utc::now().timestamp_millis().to_string();
-            let hasher = Sha256::new().chain_update(&now_utc).chain_update(EMU_NAME);
-            let request_rooms = NetplayMessage {
-                message_type: "request_get_rooms".to_string(),
-                player_name: None,
-                client_sha: None,
-                netplay_version: Some(NETPLAY_VERSION),
-                player_names: None,
-                emulator: Some(EMU_NAME.to_string()),
-                accept: None,
-                rooms: None,
-                message: None,
-                auth_time: Some(now_utc),
-                auth: Some(format!("{:x}", hasher.finalize())),
-                room: None,
-            };
-
-            socket
-                .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                    serde_json::to_vec(&request_rooms).unwrap(),
-                )))
-                .unwrap();
-            app.netplay.have_sessions = Some(NetplayServer {
-                name: app.netplay.server.name.clone(),
-                ip: app.netplay.server.ip.clone(),
-            });
-            app.netplay.socket_waiting = true;
-            ctx.request_repaint();
-        }
-    }
-}
-
-async fn parse_rom_file(file: rfd::FileHandle, tx: tokio::sync::mpsc::Sender<GameInfo>) {
-    if let Some(rom_contents) = device::get_rom_contents(file.path()) {
-        let hash = device::cart::rom::calculate_hash(&rom_contents);
-        let game_name = ui::storage::get_game_name(&rom_contents);
-
-        tx.send(GameInfo {
-            md5: hash,
-            game_name,
-            rom_label: file.file_name(),
-            rom_contents,
-        })
-        .await
-        .unwrap();
-    } else {
-        tx.send(GameInfo {
-            md5: "".to_string(),
-            game_name: "".to_string(),
-            rom_label: "Invalid ROM".to_string(),
-            rom_contents: vec![],
-        })
-        .await
-        .unwrap();
-    }
-}
-
-pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) {
-    if app.netplay.socket_waiting {
-        let socket = app.netplay.socket.as_mut().unwrap();
-        let data = socket.read();
-        if data.is_ok() {
-            let message: NetplayMessage =
-                serde_json::from_slice(&data.unwrap().into_data()).unwrap();
-            if message.accept.unwrap() == 0 {
-                if message.message_type == "reply_get_rooms" {
-                    if message.rooms.is_some() {
-                        app.netplay.sessions = message.rooms.unwrap();
-                    } else {
-                        app.netplay.sessions = vec![];
-                    }
-                } else if message.message_type == "reply_join_room" {
-                    app.netplay.join = false;
-                    app.netplay.wait = true;
-                    app.netplay.waiting_session = Some(message.room.unwrap());
-                }
-                app.netplay.socket_waiting = false;
-            } else {
-                app.netplay.error = message.message.unwrap();
-                app.netplay.join_rom_label = "Join Session (Open ROM)".to_string();
-            }
-        }
-        ctx.request_repaint();
-    }
-    if app.netplay.game_info_receiver.is_some() {
-        let result = app.netplay.game_info_receiver.as_mut().unwrap().try_recv();
-        if result.is_ok() {
-            app.netplay.game_info_receiver = None;
-            let data = result.unwrap();
-            if !data.md5.is_empty() {
-                app.netplay.game_info = data;
-                app.netplay.rom_contents = app.netplay.game_info.rom_contents.clone();
-
-                let netplay_message = NetplayMessage {
-                    message_type: "request_join_room".to_string(),
-                    player_name: Some(app.netplay.player_name.clone()),
-                    client_sha: Some(env!("GIT_HASH").to_string()),
-                    netplay_version: None,
-                    emulator: None,
-                    accept: None,
-                    message: None,
-                    rooms: None,
-                    auth_time: None,
-                    player_names: None,
-                    auth: None,
-                    room: Some(NetplayRoom {
-                        room_name: None,
-                        password: Some(app.netplay.password.clone()),
-                        game_name: None,
-                        md5: Some(app.netplay.game_info.md5.clone()),
-                        protected: None,
-                        port: app.netplay.selected_session.as_ref().unwrap().port,
-                        features: None,
-                        buffer_target: None,
-                    }),
-                };
-                let socket = app.netplay.socket.as_mut().unwrap();
-                socket
-                    .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                        serde_json::to_vec(&netplay_message).unwrap(),
-                    )))
-                    .unwrap();
-
-                app.netplay.socket_waiting = true;
-            } else {
-                app.netplay.error = data.rom_label;
-                app.netplay.join_rom_label = "Join Session (Open ROM)".to_string();
-            }
-        }
-        ctx.request_repaint();
-    }
-    egui::Window::new("Join Netplay Session").show(ctx, |ui| {
-        ui.horizontal(|ui| {
-            let mut size = ui.spacing().interact_size;
-            size.x = 100.0;
-            ui.add_sized(
-                size,
-                egui::TextEdit::singleline(&mut app.netplay.player_name).hint_text("Player name"),
-            );
-
-            get_servers(app, ctx);
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui.button("Refresh").clicked() {
-                    app.netplay.socket = None;
-                    app.netplay.have_sessions = None;
-                    app.netplay.selected_session = None;
-                    ctx.request_repaint();
-                }
-                egui::ComboBox::from_id_salt("server-combobox")
-                    .selected_text(app.netplay.server.name.to_string())
-                    .show_ui(ui, |ui| {
-                        for server in app.netplay.servers.iter() {
-                            ui.selectable_value(
-                                &mut app.netplay.server,
-                                NetplayServer {
-                                    name: server.name.clone(),
-                                    ip: server.ip.clone(),
-                                },
-                                server.name.clone(),
-                            );
-                        }
-                    });
-            });
-        });
-        if !app.netplay.server.name.is_empty() {
-            get_sessions(app, ctx);
-        }
-        ui.add_space(16.0);
-        if app.netplay.sessions.is_empty() {
-            ui.label("No sessions available");
-        } else {
-            egui::Grid::new("netplay_join_grid").show(ui, |ui| {
-                ui.label(egui::RichText::new("Session Name (click to select)").underline());
-                ui.label(egui::RichText::new("Game Name").underline());
-                ui.label(egui::RichText::new("Password Protected").underline());
-                ui.end_row();
-
-                for room in app.netplay.sessions.iter() {
-                    ui.selectable_value(
-                        &mut app.netplay.selected_session,
-                        Some(room.clone()),
-                        room.room_name.as_ref().unwrap(),
-                    );
-                    ui.label(room.game_name.as_ref().unwrap());
-                    ui.label(room.protected.unwrap_or(false).to_string());
-                    ui.end_row();
-                }
-            });
-        }
-        ui.add_space(16.0);
-        ui.horizontal(|ui| {
-            let mut size = ui.spacing().interact_size;
-            size.x = 130.0;
-            ui.add_sized(
-                size,
-                egui::TextEdit::singleline(&mut app.netplay.password)
-                    .hint_text("Password (if required)"),
-            );
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui.button("Close").clicked() {
-                    if let Some(socket) = app.netplay.socket.as_mut() {
-                        socket.close(None).unwrap();
-                        loop {
-                            match socket.read() {
-                                Err(tungstenite::Error::ConnectionClosed) => break,
-                                _ => continue,
-                            };
-                        }
-                    }
-                    app.netplay = Default::default();
-                };
-                if app.netplay.join_rom_label.is_empty() {
-                    app.netplay.join_rom_label = "Join Session (Open ROM)".to_string();
-                }
-                if ui.button(&app.netplay.join_rom_label).clicked() {
-                    if app.netplay.player_name.is_empty() {
-                        app.netplay.error = "Player Name cannot be empty".to_string();
-                    } else if app.netplay.selected_session.is_none() {
-                        app.netplay.error = "No session selected".to_string();
-                    } else if app
-                        .netplay
-                        .selected_session
-                        .as_ref()
-                        .unwrap()
-                        .protected
-                        .unwrap()
-                        && app.netplay.password.is_empty()
-                    {
-                        app.netplay.error = "Session requires a password".to_string();
-                    } else {
-                        let (tx, rx) = tokio::sync::mpsc::channel(1);
-                        app.netplay.game_info_receiver = Some(rx);
-                        let gui_ctx = ctx.clone();
-                        app.netplay.join_rom_label = "Inspecting ROM".to_string();
-                        let task = rfd::AsyncFileDialog::new()
-                            .set_title("Select ROM")
-                            .pick_file();
-                        tokio::spawn(async move {
-                            let file = task.await;
-
-                            if let Some(file) = file {
-                                parse_rom_file(file, tx).await;
-                            } else {
-                                tx.send(GameInfo {
-                                    md5: "".to_string(),
-                                    game_name: "".to_string(),
-                                    rom_label: "No ROM selected".to_string(),
-                                    rom_contents: vec![],
-                                })
-                                .await
-                                .unwrap();
-                            }
-                            gui_ctx.request_repaint();
-                        });
-                    }
-                };
-            });
-        });
-    });
-}
-
-pub fn netplay_wait(app: &mut GopherEguiApp, ctx: &egui::Context) {
-    let overclock = app
-        .netplay
-        .waiting_session
-        .as_ref()
-        .unwrap()
-        .features
-        .as_ref()
-        .unwrap()
-        .get("overclock")
-        .unwrap();
-
-    let motd_message = NetplayMessage {
-        message_type: "request_motd".to_string(),
-        player_name: None,
-        client_sha: None,
-        netplay_version: None,
-        emulator: None,
-        accept: None,
-        rooms: None,
-        player_names: None,
-        message: None,
-        auth_time: None,
-        auth: None,
-        room: None,
-    };
-    let request_players = NetplayMessage {
-        message_type: "request_players".to_string(),
-        player_name: None,
-        client_sha: None,
-        netplay_version: None,
-        player_names: None,
-        emulator: None,
-        rooms: None,
-        accept: None,
-        message: None,
-        auth_time: None,
-        auth: None,
-        room: Some(NetplayRoom {
-            room_name: None,
-            password: None,
-            game_name: None,
-            md5: None,
-            protected: None,
-            port: app.netplay.waiting_session.as_ref().unwrap().port,
-            features: None,
-            buffer_target: None,
-        }),
-    };
-
-    if !app.netplay.socket_waiting {
-        let socket = app.netplay.socket.as_mut().unwrap();
-        socket
-            .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                serde_json::to_vec(&motd_message).unwrap(),
-            )))
-            .unwrap();
-        socket
-            .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                serde_json::to_vec(&request_players).unwrap(),
-            )))
-            .unwrap();
-        app.netplay.socket_waiting = true;
-    }
-
-    if app.netplay.begin_game {
-        let begin_game = NetplayMessage {
-            message_type: "request_begin_game".to_string(),
-            player_name: None,
-            client_sha: None,
-            netplay_version: None,
-            player_names: None,
-            rooms: None,
-            emulator: None,
-            accept: None,
-            message: None,
-            auth_time: None,
-            auth: None,
-            room: Some(NetplayRoom {
-                room_name: None,
-                password: None,
-                game_name: None,
-                md5: None,
-                protected: None,
-                port: app.netplay.waiting_session.as_ref().unwrap().port,
-                features: None,
-                buffer_target: None,
-            }),
-        };
-        let socket = app.netplay.socket.as_mut().unwrap();
-        socket
-            .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                serde_json::to_vec(&begin_game).unwrap(),
-            )))
-            .unwrap();
-        app.netplay.begin_game = false;
-    }
-
-    if app.netplay.send_chat {
-        let send_chat = NetplayMessage {
-            message_type: "request_chat_message".to_string(),
-            player_name: Some(app.netplay.player_name.clone()),
-            client_sha: None,
-            netplay_version: None,
-            player_names: None,
-            rooms: None,
-            emulator: None,
-            accept: None,
-            message: Some(app.netplay.chat_message.clone()),
-            auth_time: None,
-            auth: None,
-            room: Some(NetplayRoom {
-                room_name: None,
-                password: None,
-                game_name: None,
-                md5: None,
-                protected: None,
-                port: app.netplay.waiting_session.as_ref().unwrap().port,
-                features: None,
-                buffer_target: None,
-            }),
-        };
-        app.netplay.chat_message.clear();
-        let socket = app.netplay.socket.as_mut().unwrap();
-        socket
-            .send(tungstenite::Message::Binary(tungstenite::Bytes::from(
-                serde_json::to_vec(&send_chat).unwrap(),
-            )))
-            .unwrap();
-        app.netplay.send_chat = false;
-    }
-
-    if app.netplay.socket_waiting {
-        let socket = app.netplay.socket.as_mut().unwrap();
-        let data = socket.read();
-        if data.is_ok() {
-            let message: NetplayMessage =
-                serde_json::from_slice(&data.unwrap().into_data()).unwrap();
-            if message.accept.unwrap() == 0 {
-                if message.message_type == "reply_motd" {
-                    let re = regex::Regex::new(r"<[^>]*>").unwrap();
-                    app.netplay.motd = re
-                        .replace_all(message.message.unwrap().as_str(), "")
-                        .into_owned();
-                } else if message.message_type == "reply_players" {
-                    app.netplay.player_names = message.player_names.unwrap();
-                } else if message.message_type == "reply_chat_message" {
-                    app.netplay.chat_log.push_str(&message.message.unwrap());
-                    app.netplay.chat_log.push('\n');
-                } else if message.message_type == "reply_begin_game" {
-                    let mut player = 0;
-                    for (i, name) in app.netplay.player_names.iter().enumerate() {
-                        if *name == app.netplay.player_name {
-                            player = i;
-                            break;
-                        }
-                    }
-                    app.netplay.player_number = player as u8;
-
-                    if message.accept.unwrap() == 0 {
-                        socket.close(None).unwrap();
-                        loop {
-                            match socket.read() {
-                                Err(tungstenite::Error::ConnectionClosed) => break,
-                                _ => continue,
-                            };
-                        }
-
-                        gui::open_rom(app, ctx, *overclock == "true");
-                        app.netplay = Default::default();
-                        return;
-                    } else {
-                        app.netplay.error = message.message.unwrap();
-                    }
-                }
-            } else {
-                app.netplay.error = message.message.unwrap();
-            }
-        }
-        ctx.request_repaint();
-    }
-
-    egui::Window::new("Pending Netplay Session").show(ctx, |ui| {
-        egui::Grid::new("netplay_wait_grid_1").show(ui, |ui| {
-            ui.label("Session Name:");
-            let room_name = app
-                .netplay
-                .waiting_session
-                .as_ref()
-                .unwrap()
-                .room_name
-                .as_ref()
-                .unwrap();
-            let game_name = app
-                .netplay
-                .waiting_session
-                .as_ref()
-                .unwrap()
-                .game_name
-                .as_ref()
-                .unwrap();
-            ui.label(room_name);
-            ui.end_row();
-            ui.label("Game Name:");
-            ui.label(game_name);
-            ui.end_row();
-            for i in 0..4 {
-                ui.label(format!("Player {}:", i + 1));
-                ui.label(app.netplay.player_names[i].clone());
-                ui.end_row();
-            }
-        });
-        egui::ScrollArea::vertical()
-            .max_height(100.0)
-            .stick_to_bottom(true)
-            .show(ui, |ui| {
-                ui.add(
-                    egui::TextEdit::multiline(&mut app.netplay.chat_log)
-                        .interactive(false)
-                        .desired_width(ui.available_width()),
-                );
-            });
-
-        ui.horizontal(|ui| {
-            let mut size = ui.spacing().interact_size;
-            size.x = 200.0;
-
-            ui.add_sized(
-                size,
-                egui::TextEdit::singleline(&mut app.netplay.chat_message)
-                    .hint_text("Enter chat message here"),
-            );
-
-            if ui
-                .add_enabled(!app.netplay.send_chat, egui::Button::new("Send Message"))
-                .clicked()
-                && !app.netplay.chat_message.is_empty()
-            {
-                app.netplay.send_chat = true;
-            }
-        });
-
-        ui.add_space(16.0);
-        ui.label(app.netplay.motd.clone());
-        ui.add_space(16.0);
-
-        ui.horizontal(|ui| {
-            let button_enabled = app.netplay.player_name == app.netplay.player_names[0]
-                && !app.netplay.pending_begin;
-            if ui
-                .add_enabled(button_enabled, egui::Button::new("Start Session"))
-                .clicked()
-            {
-                app.netplay.begin_game = true;
-                app.netplay.pending_begin = true;
-            }
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui.button("Close").clicked() {
-                    if let Some(socket) = app.netplay.socket.as_mut() {
-                        socket.close(None).unwrap();
-                        loop {
-                            match socket.read() {
-                                Err(tungstenite::Error::ConnectionClosed) => break,
-                                _ => continue,
-                            };
-                        }
-                    }
-                    app.netplay = Default::default();
-                };
-            });
-        });
-    });
-}
-
-pub fn netplay_error(app: &mut GopherEguiApp, ctx: &egui::Context, error: String) {
-    egui::Window::new("Netplay Error").show(ctx, |ui| {
-        ui.label(error);
-        if ui.button("Close").clicked() {
-            app.netplay.error = "".to_string();
-        };
-    });
-}

src/ui/gui/input_profile.slint

@@ -0,0 +1,45 @@
+import { StandardButton, HorizontalBox, VerticalBox, Button, LineEdit, CheckBox } from "std-widgets.slint";
+
+export global InputProfileData {
+    in-out property <bool> dinput;
+    in-out property <string> profile_name;
+}
+
+export component InputProfileDialog inherits Window {
+    title: @tr("Create Input Profile");
+    callback profile_creation_button_clicked;
+    in-out property dinput <=> InputProfileData.dinput;
+    in-out property profile_name <=> InputProfileData.profile_name;
+    VerticalBox {
+        HorizontalBox {
+            LineEdit {
+                placeholder-text: @tr("Enter profile name");
+                preferred-width: 300px;
+                edited(text) => {
+                    InputProfileData.profile_name = text;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            CheckBox {
+                text: @tr("Use DirectInput");
+                checked: InputProfileData.dinput;
+                toggled => {
+                    InputProfileData.dinput = self.checked;
+                }
+            }
+        }
+
+        HorizontalBox {
+            Button {
+                text: @tr("Start Profile Creation Wizard");
+                enabled: InputProfileData.profile_name != "" && InputProfileData.profile_name != "default";
+                clicked => {
+                    profile_creation_button_clicked();
+                }
+            }
+        }
+    }
+}

src/ui/gui/localgame_page.slint

@@ -0,0 +1,48 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { Button, HorizontalBox, VerticalBox } from "std-widgets.slint";
+import { Page } from "page.slint";
+import { AboutData, NewVersionButton } from "about_page.slint";
+
+export global State {
+    in-out property <bool> game_running;
+}
+
+export component LocalGame inherits Page {
+    callback open_rom_button_clicked;
+    callback saves_folder_button_clicked;
+    callback newversion_button_clicked;
+    title: @tr("Local Game");
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Open ROM");
+                enabled: !State.game_running;
+                clicked => {
+                    open_rom_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Open Saves Folder");
+                clicked => {
+                    saves_folder_button_clicked();
+                }
+            }
+        }
+
+        if AboutData.has_update:NewVersionButton {
+            newversion_button_clicked => {
+                newversion_button_clicked();
+            }
+        }
+        Rectangle { }
+    }
+}

src/ui/gui/netplay_create.slint

@@ -0,0 +1,130 @@
+import { LineEdit, HorizontalBox, VerticalBox, Button, ComboBox } from "std-widgets.slint";
+import { NetplayData } from "netplay_page.slint";
+
+export component NetplayCreate inherits Window {
+    title: @tr("Netplay: Create Session");
+    in-out property server_names <=> NetplayData.server_names;
+    in-out property server_urls <=> NetplayData.server_urls;
+    in-out property custom_server_url <=> NetplayData.custom_server_url;
+    in-out property game_name <=> NetplayData.game_name;
+    in-out property game_hash <=> NetplayData.game_hash;
+    in-out property game_cheats <=> NetplayData.game_cheats;
+    in-out property pending_session <=> NetplayData.pending_session;
+    in-out property rom_path <=> NetplayData.rom_path;
+    in-out property peer_addr <=> NetplayData.peer_addr;
+    in-out property rom_dir <=> NetplayData.rom_dir;
+    callback get_custom_url();
+    callback select_rom(string);
+    callback create_session(string, string, string, string, string, string, string);
+
+    VerticalBox {
+        HorizontalBox {
+            VerticalBox {
+                Text {
+                    text: @tr("Session Name:");
+                }
+
+                LineEdit {
+                    placeholder_text: @tr("Enter session name");
+                    edited(text) => {
+                        NetplayData.session_name = text;
+                    }
+                }
+            }
+
+            VerticalBox {
+                Text {
+                    text: @tr("Password (Optional):");
+                }
+
+                LineEdit {
+                    placeholder_text: @tr("Enter session password");
+                    edited(text) => {
+                        NetplayData.password = text;
+                    }
+                }
+            }
+        }
+
+        VerticalBox {
+            Text {
+                text: @tr("Player Name:");
+            }
+
+            LineEdit {
+                placeholder_text: @tr("Enter player name");
+                edited(text) => {
+                    NetplayData.player_name = text;
+                }
+            }
+        }
+
+        VerticalBox {
+            Text {
+                text: @tr("Server:");
+            }
+
+            HorizontalBox {
+                server := ComboBox {
+                    model: NetplayData.server_names;
+                    selected => {
+                        if (self.current-index >= 0) {
+                            if (self.current-value == "Custom") {
+                                get_custom_url();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if NetplayData.game_name == "": Button {
+            text: @tr("Select ROM");
+            clicked => {
+                select_rom(NetplayData.rom_dir);
+            }
+        }
+        if NetplayData.game_name != "": Button {
+            text: NetplayData.game_name;
+            clicked => {
+                select_rom(NetplayData.rom_dir);
+            }
+        }
+
+        Rectangle { }
+
+        if NetplayData.game_cheats != "":Text {
+            text: @tr("This game has cheats enabled. Cheats will be synchronized with other players.");
+        }
+        Rectangle { }
+
+        Button {
+            property <string> server_url;
+            text: @tr("Create Session");
+            enabled: NetplayData.session_name != "" && NetplayData.player_name != "" && NetplayData.game_name != "" && !NetplayData.pending_session;
+            clicked => {
+                NetplayData.pending_session = true;
+                if (server.current-value == "Custom") {
+                    server_url = "ws://" + NetplayData.custom_server_url;
+                } else {
+                    server_url = NetplayData.server_urls[server.current-index];
+                }
+                create_session(
+                    server_url,
+                    NetplayData.session_name,
+                    NetplayData.player_name,
+                    NetplayData.game_name,
+                    NetplayData.game_hash,
+                    NetplayData.game_cheats,
+                    NetplayData.password);
+            }
+        }
+    }
+}
+
+export component DispatcherDialog inherits Dialog {
+    title: @tr("Creating Server");
+    Text {
+        text: "Creating server, please wait...This may take about 30 seconds.";
+    }
+}

src/ui/gui/netplay_join.slint

@@ -0,0 +1,137 @@
+import { VerticalBox, LineEdit, StandardTableView, HorizontalBox, ComboBox, Button } from "std-widgets.slint";
+import { NetplayData } from "netplay_page.slint";
+
+export component NetplayJoin inherits Window {
+    title: @tr("Netplay: Join Session");
+    in-out property server_names <=> NetplayData.server_names;
+    in-out property server_urls <=> NetplayData.server_urls;
+    in-out property custom_server_url <=> NetplayData.custom_server_url;
+    in-out property sessions <=> NetplayData.sessions;
+    in-out property current_session <=> NetplayData.current_session;
+    in-out property room_urls <=> NetplayData.room_urls;
+    in-out property game_name <=> NetplayData.game_name;
+    in-out property game_hash <=> NetplayData.game_hash;
+    in-out property game_cheats <=> NetplayData.game_cheats;
+    in-out property peer_addr <=> NetplayData.peer_addr;
+    in-out property pending_session <=> NetplayData.pending_session;
+    in-out property pending_refresh <=> NetplayData.pending_refresh;
+    in-out property rom_path <=> NetplayData.rom_path;
+    in-out property rom_dir <=> NetplayData.rom_dir;
+    callback refresh_session();
+    callback select_rom(string);
+    callback join_session(string, string, string, string, string);
+    preferred-width: 700px;
+
+    VerticalBox {
+        HorizontalBox {
+            VerticalBox {
+                Text {
+                    text: @tr("Player Name:");
+                }
+
+                LineEdit {
+                    placeholder_text: @tr("Enter player name");
+                    edited(text) => {
+                        NetplayData.player_name = text;
+                    }
+                }
+            }
+
+            VerticalBox {
+                Text {
+                    text: @tr("Custom Server URL (optional):");
+                }
+
+                LineEdit {
+                    placeholder-text: @tr("example.com:45000");
+                    text: NetplayData.custom_server_url;
+                    edited(text) => {
+                        NetplayData.custom_server_url = text;
+                    }
+                }
+            }
+        }
+
+        if NetplayData.pending_refresh: Text {
+            text: @tr("Refreshing session list, please wait...");
+            horizontal-alignment: center;
+            vertical-alignment: center;
+        }
+        if !NetplayData.pending_refresh && NetplayData.sessions.length > 0: Text {
+            text: @tr("Click on a session below to select it");
+            horizontal-alignment: center;
+            vertical-alignment: center;
+        }
+        if !NetplayData.pending_refresh && NetplayData.sessions.length == 0: Text {
+            text: @tr("No sessions available. Please refresh to check again.");
+            horizontal-alignment: center;
+            vertical-alignment: center;
+        }
+        StandardTableView {
+            columns: [
+                { title: "Server" },
+                { title: "Session Name" },
+                { title: "Game Name" },
+                { title: "Password" },
+                { title: "Cheats" }
+            ];
+            rows: NetplayData.sessions;
+            current-row: NetplayData.current_session;
+            current-row-changed(current-row) => {
+                NetplayData.current_session = current-row;
+            }
+        }
+
+        HorizontalBox {
+            Rectangle { }
+
+            Button {
+                enabled: !NetplayData.pending_refresh;
+                text: @tr("Refresh Session List");
+                clicked => {
+                    NetplayData.pending_refresh = true;
+                    NetplayData.current_session = -1;
+                    NetplayData.sessions = [];
+                    NetplayData.room_urls = [];
+                    refresh_session();
+                }
+            }
+        }
+
+        HorizontalBox {
+            LineEdit {
+                placeholder-text: @tr("Password (if required)");
+                edited(text) => {
+                    NetplayData.password = text;
+                }
+            }
+
+            if NetplayData.game_name == "": Button {
+                text: @tr("Select ROM");
+                clicked => {
+                    select_rom(NetplayData.rom_dir);
+                }
+            }
+            if NetplayData.game_name != "": Button {
+                text: NetplayData.game_name;
+                clicked => {
+                    select_rom(NetplayData.rom_dir);
+                }
+            }
+
+            Button {
+                text: @tr("Join Session");
+                enabled: NetplayData.player_name != "" && NetplayData.current_session >= 0 && NetplayData.game_name != "" && !NetplayData.pending_session;
+                clicked => {
+                    NetplayData.pending_session = true;
+                    join_session(
+                    NetplayData.player_name,
+                    NetplayData.game_hash,
+                    NetplayData.password,
+                    NetplayData.room_urls[NetplayData.current_session],
+                    NetplayData.sessions[NetplayData.current_session][1].text);
+                }
+            }
+        }
+    }
+}

src/ui/gui/netplay_page.slint

@@ -0,0 +1,96 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { StandardButton, VerticalBox, HorizontalBox, Button, LineEdit } from "std-widgets.slint";
+import { Page } from "page.slint";
+
+export global NetplayData {
+    in-out property <[string]> server_names;
+    in-out property <[string]> server_urls;
+    in-out property <string> player_name;
+    in-out property <string> game_name;
+    in-out property <string> game_hash;
+    in-out property <string> game_cheats;
+    in-out property <string> rom_path;
+    in-out property <string> password;
+    in-out property <string> peer_addr;
+    in-out property <bool> pending_session;
+    in-out property <bool> pending_refresh;
+    in-out property <string> session_name;
+    in-out property <[[StandardListViewItem]]> sessions;
+    in-out property <[string]> room_urls;
+    in-out property <int> current_session: -1;
+    in-out property <string> rom_dir;
+    in-out property <string> custom_server_url;
+}
+
+export component Netplay inherits Page {
+    callback create_session_button_clicked;
+    callback join_session_button_clicked;
+    callback netplay_discord_button_clicked;
+    callback netplay_feedback_button_clicked;
+    title: @tr("Netplay");
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Create Session");
+                clicked => {
+                    create_session_button_clicked();
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Join Session");
+                clicked => {
+                    join_session_button_clicked();
+                }
+            }
+        }
+
+        Rectangle {
+            height: 20px;
+        }
+
+        HorizontalBox {
+            alignment: center;
+            Button {
+                text: @tr("Netplay Discord Channel");
+                clicked => {
+                    netplay_discord_button_clicked();
+                }
+            }
+
+            Button {
+                text: @tr("Provide Feedback");
+                clicked => {
+                    netplay_feedback_button_clicked();
+                }
+            }
+        }
+    }
+}
+
+export component CustomNetplayServer inherits Dialog {
+    in-out property custom_server_url <=> NetplayData.custom_server_url;
+    title: @tr("Custom Netplay Server");
+    preferred-width: 400px;
+    callback ok_clicked(string);
+    server_url := LineEdit {
+        text: NetplayData.custom_server_url;
+        placeholder-text: "example.com:45000";
+    }
+
+    StandardButton {
+        kind: ok;
+        clicked => {
+            NetplayData.custom_server_url = server_url.text;
+            ok_clicked(NetplayData.custom_server_url);
+        }
+    }
+}

src/ui/gui/netplay_wait.slint

@@ -0,0 +1,110 @@
+import { VerticalBox, HorizontalBox, TextEdit, ScrollView, LineEdit, Button, GridBox } from "std-widgets.slint";
+import { NetplayData } from "netplay_page.slint";
+
+export global NetplayWaitData {
+    in-out property <string> motd;
+    in-out property <[string]> players;
+    in-out property <int> port;
+    in-out property <bool> can_start;
+    in-out property <string> chat_text;
+    in-out property <string> ping;
+}
+
+export component NetplayWait inherits Window {
+    title: @tr("Netplay: Waiting Room");
+    preferred-width: 400px;
+    preferred-height: 400px;
+    in-out property players <=> NetplayWaitData.players;
+    in-out property session_name <=> NetplayData.session_name;
+    in-out property game_name <=> NetplayData.game_name;
+    in-out property rom_path <=> NetplayData.rom_path;
+    in-out property motd <=> NetplayWaitData.motd;
+    in-out property port <=> NetplayWaitData.port;
+    in-out property can_start <=> NetplayWaitData.can_start;
+    in-out property chat_text <=> NetplayWaitData.chat_text;
+    in-out property ping <=> NetplayWaitData.ping;
+    callback send_chat_message(string);
+    callback begin_game;
+
+    VerticalBox {
+        Text {
+            text: @tr("Session Name: ") + NetplayData.session_name;
+            font-size: 15px;
+            horizontal-alignment: center;
+        }
+
+        Text {
+            text: @tr("Game Name: ") + NetplayData.game_name;
+            font-size: 15px;
+            horizontal-alignment: center;
+        }
+
+        Text {
+            text: @tr("Ping: ") + NetplayWaitData.ping;
+            horizontal-alignment: center;
+        }
+
+        GridBox {
+            Row {
+                Text {
+                    text: "Player 1: " + players[0];
+                }
+
+                Text {
+                    text: "Player 2: " + players[1];
+                }
+            }
+
+            Row {
+                Text {
+                    text: "Player 3: " + players[2];
+                }
+
+                Text {
+                    text: "Player 4: " + players[3];
+                }
+            }
+        }
+
+        TextEdit {
+            read-only: true;
+            text: NetplayWaitData.chat_text;
+        }
+
+        HorizontalBox {
+            chat_message := LineEdit {
+                placeholder_text: @tr("Enter chat message");
+                key-released(event) => {
+                    if (event.text == Key.Return && chat_message.text != "") {
+                        send_chat_message(chat_message.text);
+                        chat_message.text = "";
+                    }
+                    accept
+                }
+            }
+
+            Button {
+                text: @tr("Send Message");
+                enabled: chat_message.text != "";
+                clicked => {
+                    send_chat_message(chat_message.text);
+                    chat_message.text = "";
+                }
+            }
+        }
+
+        Text {
+            text: NetplayWaitData.motd;
+            wrap: word-wrap;
+        }
+
+        Button {
+            text: @tr("Start Game");
+            enabled: NetplayWaitData.can_start;
+            clicked => {
+                NetplayWaitData.can_start = false;
+                begin_game();
+            }
+        }
+    }
+}

src/ui/gui/page.slint

@@ -0,0 +1,23 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { Switch, GridBox, ListView, ScrollView, HorizontalBox, VerticalBox, Palette } from "std-widgets.slint";
+
+export component Page inherits VerticalBox {
+    in property <string> title: "title";
+
+    accessible-role: tab-panel;
+    accessible-label: root.title;
+
+    HorizontalBox {
+        Text {
+            font-size: 20px;
+            text <=> root.title;
+        }
+
+        // Spacer
+        Rectangle { }
+    }
+
+    @children
+}

src/ui/gui/pages.slint

@@ -0,0 +1,6 @@
+export { LocalGame } from "localgame_page.slint";
+export { ControllerConfig } from "controller_page.slint";
+export { Netplay } from "netplay_page.slint";
+export { Cheats } from "cheat_page.slint";
+export { Settings } from "settings_page.slint";
+export { About } from "about_page.slint";

src/ui/gui/settings_page.slint

@@ -0,0 +1,109 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { ComboBox, HorizontalBox, VerticalBox, CheckBox } from "std-widgets.slint";
+import { Page } from "page.slint";
+
+export global SettingsData {
+    in-out property <bool> integer_scaling;
+    in-out property <bool> fullscreen;
+    in-out property <bool> widescreen;
+    in-out property <bool> apply_crt_shader;
+    in-out property <bool> overclock_n64_cpu;
+    in-out property <bool> disable_expansion_pak;
+    in-out property <int> resolution;
+    in-out property <string> rom_dir;
+}
+
+export component Settings inherits Page {
+    title: @tr("Settings");
+
+    VerticalBox {
+        alignment: start;
+        HorizontalBox {
+            alignment: start;
+            Text {
+                text: @tr("Resolution:");
+                vertical-alignment: center;
+            }
+
+            ComboBox {
+                model: ["1x", "2x", "4x"];
+                current-index: SettingsData.resolution;
+                selected => {
+                    SettingsData.resolution = self.current-index;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Integer Scaling");
+                checked: SettingsData.integer_scaling;
+                toggled => {
+                    SettingsData.integer_scaling = self.checked;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Fullscreen (Esc closes game)");
+                checked: SettingsData.fullscreen;
+                toggled => {
+                    SettingsData.fullscreen = self.checked;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Widescreen (strech)");
+                checked: SettingsData.widescreen;
+                toggled => {
+                    SettingsData.widescreen = self.checked;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Apply CRT shader");
+                checked: SettingsData.apply_crt_shader;
+                toggled => {
+                    SettingsData.apply_crt_shader = self.checked;
+                }
+            }
+        }
+
+        Rectangle {
+            height: 20px;
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Overclock N64 CPU (may cause bugs)");
+                checked: SettingsData.overclock_n64_cpu;
+                toggled => {
+                    SettingsData.overclock_n64_cpu = self.checked;
+                }
+            }
+        }
+
+        HorizontalBox {
+            alignment: start;
+            CheckBox {
+                text: @tr("Disable Expansion Pak");
+                checked: SettingsData.disable_expansion_pak;
+                toggled => {
+                    SettingsData.disable_expansion_pak = self.checked;
+                }
+            }
+        }
+    }
+}

src/ui/gui/side_bar.slint

@@ -0,0 +1,145 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: MIT
+
+import { HorizontalBox, VerticalBox, Palette } from "std-widgets.slint";
+
+component SideBarItem inherits Rectangle {
+    in property <int> tab-index;
+    in property <bool> selected;
+    in property <bool> has-focus;
+    in-out property <string> text <=> label.text;
+
+    callback clicked <=> touch.clicked;
+
+    min-height: l.preferred-height;
+    accessible-role: tab;
+    accessible-label: root.text;
+    accessible-item-index: root.tab-index;
+    accessible-item-selectable: true;
+    accessible-item-selected: root.selected;
+    accessible-action-default => {
+        self.clicked();
+    }
+
+    states [
+        pressed when touch.pressed: {
+            state.opacity: 0.8;
+        }
+        hover when touch.has-hover: {
+            state.opacity: 0.6;
+        }
+        selected when root.selected: {
+            state.opacity: 1;
+        }
+        focused when root.has-focus: {
+            state.opacity: 0.8;
+        }
+    ]
+
+    state := Rectangle {
+        opacity: 0;
+        background: Palette.background;
+
+        animate opacity { duration: 150ms; }
+    }
+
+    l := HorizontalBox {
+        y: (parent.height - self.height) / 2;
+        spacing: 0px;
+
+        label := Text {
+            vertical-alignment: center;
+            accessible-role: none;
+        }
+    }
+
+    touch := TouchArea {
+        width: 100%;
+        height: 100%;
+    }
+}
+
+export component SideBar inherits Rectangle {
+    in property <[string]> model: [];
+    in property <string> title <=> label.text;
+    out property <int> current-item: 0;
+    out property <int> current-focused: fs.has-focus ? fs.focused-tab : -1; // The currently focused tab
+
+    width: 180px;
+    forward-focus: fs;
+
+    Rectangle {
+        background: Palette.background.darker(0.2);
+    }
+
+    VerticalBox {
+        padding-left: 0px;
+        padding-right: 0px;
+        alignment: start;
+
+        label := Text {
+            font-size: 16px;
+            horizontal-alignment: center;
+        }
+
+        navigation := VerticalLayout {
+            alignment: start;
+            vertical-stretch: 0;
+            accessible-role: tab-list;
+            accessible-delegate-focus: root.current-focused >= 0 ? root.current-focused : root.current-item;
+            accessible-label: root.title;
+            accessible-item-count: root.model.length;
+
+            fs := FocusScope {
+                key-pressed(event) => {
+                    if (event.text == "\n") {
+                        root.current-item = root.current-focused;
+                        return accept;
+                    }
+                    if (event.text == Key.UpArrow) {
+                        self.focused-tab = Math.max(self.focused-tab - 1, 0);
+                        return accept;
+                    }
+                    if (event.text == Key.DownArrow) {
+                        self.focused-tab = Math.min(self.focused-tab + 1, root.model.length - 1);
+                        return accept;
+                    }
+                    return reject;
+                }
+
+                key-released(event) => {
+                    if (event.text == " ") {
+                        root.current-item = root.current-focused;
+                        return accept;
+                    }
+                    return reject;
+                }
+
+                property <int> focused-tab: 0;
+
+                x: 0;
+                width: 0; // Do not react on clicks
+            }
+
+            for item[index] in root.model: SideBarItem {
+                clicked => {
+                    root.current-item = index;
+                }
+
+                tab-index: index;
+                has-focus: index == root.current-focused;
+                text: item;
+                selected: index == root.current-item;
+            }
+        }
+
+        VerticalLayout {
+            bottom := VerticalBox {
+                padding-top: 0px;
+                padding-bottom: 0px;
+
+                @children
+            }
+        }
+    }
+}

src/ui/gui/vru_dialog.slint

@@ -0,0 +1,24 @@
+import { Button, VerticalBox, ScrollView } from "std-widgets.slint";
+export global VruData {
+    in-out property <[string]> words;
+}
+
+export component VruDialog inherits Window {
+    title: @tr("What Would You Like To Say?");
+    preferred-width: 400px;
+    preferred-height: 400px;
+    callback vru_button_clicked(string);
+    in-out property words <=> VruData.words;
+
+    ScrollView {
+        VerticalBox {
+            padding-bottom: 40px;
+            for word[i] in words: Button {
+                text: word;
+                clicked => {
+                    vru_button_clicked(self.text);
+                }
+            }
+        }
+    }
+}

src/ui/input.rs

@@ -334,7 +334,37 @@ fn change_paks(
     pressed
 }
 
+pub fn get_controller_names(game_ui: &ui::Ui) -> Vec<String> {
+    let mut controllers: Vec<String> = vec![];
+
+    for joystick in game_ui.input.joysticks.iter() {
+        let name = unsafe {
+            std::ffi::CStr::from_ptr(sdl3_sys::joystick::SDL_GetJoystickNameForID(*joystick))
+        };
+        controllers.push(name.to_string_lossy().to_string());
+    }
+
+    controllers
+}
+
+pub fn get_controller_paths(game_ui: &ui::Ui) -> Vec<Option<String>> {
+    let mut controller_paths: Vec<Option<String>> = vec![];
+
+    for joystick in game_ui.input.joysticks.iter() {
+        let path = unsafe {
+            std::ffi::CStr::from_ptr(sdl3_sys::joystick::SDL_GetJoystickPathForID(*joystick))
+                .to_string_lossy()
+                .to_string()
+        };
+        controller_paths.push(Some(path));
+    }
+
+    controller_paths
+}
+
 pub fn get(ui: &ui::Ui, channel: usize) -> InputData {
+    unsafe { sdl3_sys::events::SDL_PumpEvents() };
+
     let profile_name = ui.config.input.input_profile_binding[channel].clone();
     let profile = ui.config.input.input_profiles.get(&profile_name).unwrap();
     let mut keys = 0;
@@ -436,6 +466,7 @@ fn close_controllers(
 
 pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
     ui::sdl_init(sdl3_sys::init::SDL_INIT_VIDEO);
+    ui::ttf_init();
 
     if profile == "default" {
         println!("Profile name cannot be default");
@@ -537,8 +568,18 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
         axis: 0,
     };
 
-    let font =
-        ab_glyph::FontRef::try_from_slice(include_bytes!("../../data/Roboto-Regular.ttf")).unwrap();
+    let text_engine = unsafe { sdl3_ttf_sys::ttf::TTF_CreateRendererTextEngine(renderer) };
+    let font = unsafe {
+        let font_bytes = include_bytes!("../../data/Roboto-Regular.ttf");
+        sdl3_ttf_sys::ttf::TTF_OpenFontIO(
+            sdl3_sys::everything::SDL_IOFromConstMem(
+                font_bytes.as_ptr() as *const std::ffi::c_void,
+                font_bytes.len(),
+            ),
+            true,
+            35.0,
+        )
+    };
 
     for (key, value) in key_labels.iter() {
         let mut event: sdl3_sys::events::SDL_Event = Default::default();
@@ -547,7 +588,8 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
         ui::video::draw_text(
             format!("Select binding for: {key}").as_str(),
             renderer,
-            &font,
+            text_engine,
+            font,
         );
 
         let mut key_set = false;
@@ -581,7 +623,9 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
                 } else if event_type == u32::from(sdl3_sys::events::SDL_EVENT_GAMEPAD_AXIS_MOTION) {
                     let axis_value = unsafe { event.gaxis.value };
                     let axis = unsafe { event.gaxis.axis };
-                    if !open_controllers.is_empty() && axis_value.saturating_abs() > i16::MAX / 2 {
+                    if !open_controllers.is_empty()
+                        && axis_value.saturating_abs() > (i16::MAX as i32 * 3 / 4) as i16
+                    {
                         let result = ui::config::InputControllerAxis {
                             enabled: true,
                             id: axis as i32,
@@ -617,7 +661,9 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
                 {
                     let axis_value = unsafe { event.jaxis.value };
                     let axis = unsafe { event.jaxis.axis };
-                    if !open_joysticks.is_empty() && axis_value.saturating_abs() > i16::MAX / 2 {
+                    if !open_joysticks.is_empty()
+                        && axis_value.saturating_abs() > (i16::MAX as i32 * 3 / 4) as i16
+                    {
                         let result = ui::config::InputControllerAxis {
                             enabled: true,
                             id: axis as i32,
@@ -637,6 +683,8 @@ pub fn configure_input_profile(ui: &mut ui::Ui, profile: String, dinput: bool) {
     close_controllers(open_joysticks, open_controllers);
 
     unsafe {
+        sdl3_ttf_sys::ttf::TTF_CloseFont(font);
+        sdl3_ttf_sys::ttf::TTF_DestroyRendererTextEngine(text_engine);
         sdl3_sys::render::SDL_DestroyRenderer(renderer);
         sdl3_sys::video::SDL_DestroyWindow(window);
     }
@@ -889,7 +937,7 @@ pub fn init(ui: &mut ui::Ui) {
                 if !profile.dinput {
                     let gamepad = unsafe { sdl3_sys::gamepad::SDL_OpenGamepad(joystick_id) };
                     if gamepad.is_null() {
-                        println!("could not connect gamepad: {}", joystick_id)
+                        println!("could not connect gamepad: {joystick_id}")
                     } else {
                         ui.input.controllers[i].game_controller = gamepad;
                         let properties =
@@ -908,7 +956,7 @@ pub fn init(ui: &mut ui::Ui) {
                 } else {
                     let joystick = unsafe { sdl3_sys::joystick::SDL_OpenJoystick(joystick_id) };
                     if joystick.is_null() {
-                        println!("could not connect joystick: {}", joystick_id)
+                        println!("could not connect joystick: {joystick_id}")
                     } else {
                         ui.input.controllers[i].joystick = joystick;
                         let properties =

src/ui/storage.rs

@@ -57,10 +57,10 @@ fn get_save_type(rom: &[u8], game_id: &str) -> Vec<SaveTypes> {
             1 => return vec![SaveTypes::Eeprom4k],
             2 => return vec![SaveTypes::Eeprom16k],
             3 => return vec![SaveTypes::Sram],
-            4 => panic!("Unsupported save type: {}", save_type),
+            4 => panic!("Unsupported save type: {save_type}"),
             5 => return vec![SaveTypes::Flash],
-            6 => panic!("Unsupported save type: {}", save_type),
-            _ => panic!("Unknown save type: {}", save_type),
+            6 => panic!("Unsupported save type: {save_type}"),
+            _ => panic!("Unknown save type: {save_type}"),
         }
     }
     match game_id {
@@ -120,15 +120,26 @@ fn get_save_type(rom: &[u8], game_id: &str) -> Vec<SaveTypes> {
     }
 }
 
+pub fn get_game_crc(rom: &[u8]) -> String {
+    let crc1 = format!(
+        "{:08X}",
+        u32::from_be_bytes(rom[0x10..0x14].try_into().unwrap())
+    );
+    let crc2 = format!(
+        "{:08X}",
+        u32::from_be_bytes(rom[0x14..0x18].try_into().unwrap())
+    );
+    let country_code = format!("{:02X}", &rom[0x3E]);
+
+    format!("{crc1}-{crc2}-C:{country_code}")
+}
+
 pub fn get_game_name(rom: &[u8]) -> String {
     let mut game_name = "".to_owned();
     let header_value = std::str::from_utf8(&rom[0x20..0x34]);
-    if header_value.is_ok() {
+    if let Ok(header_value) = header_value {
         let re = regex::Regex::new(r"[^a-zA-Z0-9_ -]").unwrap();
-        game_name = re
-            .replace_all(header_value.unwrap(), "")
-            .trim()
-            .replace('\0', "");
+        game_name = re.replace_all(header_value, "").trim().replace('\0', "");
     }
     game_name
 }
@@ -188,38 +199,40 @@ pub fn init(ui: &mut ui::Ui, rom: &[u8]) {
         .paths
         .savestate_file_path
         .clone_from(&states_path);
-    ui.storage
-        .paths
-        .savestate_file_path
-        .push(prefix.to_owned() + "-" + &ui.game_hash + ".state");
+    ui.storage.paths.savestate_file_path.push(
+        prefix.to_owned()
+            + "-"
+            + &ui.game_hash
+            + ".state"
+            + ui.storage.save_state_slot.to_string().as_str(),
+    );
 }
 
 pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
     if netplay.is_none() || netplay.as_ref().unwrap().player_number == 0 {
         let eep = std::fs::read(&ui.storage.paths.eep_file_path);
-        if eep.is_ok() {
-            ui.storage.saves.eeprom.data = eep.unwrap();
+        if let Ok(eep) = eep {
+            ui.storage.saves.eeprom.data = eep;
         }
         let sra = std::fs::read(&ui.storage.paths.sra_file_path);
-        if sra.is_ok() {
-            ui.storage.saves.sram.data = sra.unwrap();
+        if let Ok(sra) = sra {
+            ui.storage.saves.sram.data = sra;
         }
         let fla = std::fs::read(&ui.storage.paths.fla_file_path);
-        if fla.is_ok() {
-            ui.storage.saves.flash.data = fla.unwrap();
+        if let Ok(fla) = fla {
+            ui.storage.saves.flash.data = fla;
         }
         let mempak = std::fs::read(&ui.storage.paths.pak_file_path);
-        if mempak.is_ok() {
-            ui.storage.saves.mempak.data = mempak.unwrap();
+        if let Ok(mempak) = mempak {
+            ui.storage.saves.mempak.data = mempak;
         }
         let sdcard = std::fs::read(&ui.storage.paths.sdcard_file_path);
-        if sdcard.is_ok() {
-            ui.storage.saves.sdcard.data = sdcard.unwrap();
+        if let Ok(sdcard) = sdcard {
+            ui.storage.saves.sdcard.data = sdcard;
         }
         let romsave = std::fs::read(&ui.storage.paths.romsave_file_path);
-        if romsave.is_ok() {
-            ui.storage.saves.romsave.data =
-                postcard::from_bytes(romsave.unwrap().as_ref()).unwrap();
+        if let Ok(romsave) = romsave {
+            ui.storage.saves.romsave.data = postcard::from_bytes(romsave.as_ref()).unwrap();
         }
     }
 
@@ -331,7 +344,8 @@ pub fn compress_file(data: &[(&[u8], &str)]) -> Vec<u8> {
                 .start_file(
                     item.1,
                     zip::write::SimpleFileOptions::default()
-                        .compression_method(zip::CompressionMethod::Zstd),
+                        .compression_method(zip::CompressionMethod::Zstd)
+                        .compression_level(Some(1)),
                 )
                 .unwrap();
             writer.write_all(item.0).unwrap();

src/ui/video.rs

@@ -1,10 +1,10 @@
 #![allow(non_snake_case)]
 include!(concat!(env!("OUT_DIR"), "/parallel_bindings.rs"));
 use crate::{device, ui};
-use ab_glyph::{Font, ScaleFont};
 
 pub fn init(device: &mut device::Device) {
     ui::sdl_init(sdl3_sys::init::SDL_INIT_VIDEO);
+    ui::ttf_init();
 
     let title = std::ffi::CString::new("gopher64").unwrap();
 
@@ -37,10 +37,18 @@ pub fn init(device: &mut device::Device) {
         sdl3_sys::video::SDL_CreateWindow(title.as_ptr(), window_width, window_height, flags)
     };
     if device.ui.video.window.is_null() {
-        panic!("Could not create window");
+        panic!("Could not create window: {}", unsafe {
+            std::ffi::CStr::from_ptr(sdl3_sys::error::SDL_GetError())
+                .to_str()
+                .unwrap()
+        });
     }
     if !unsafe { sdl3_sys::video::SDL_ShowWindow(device.ui.video.window) } {
-        panic!("Could not show window");
+        panic!("Could not show window: {}", unsafe {
+            std::ffi::CStr::from_ptr(sdl3_sys::error::SDL_GetError())
+                .to_str()
+                .unwrap()
+        });
     }
     unsafe {
         sdl3_sys::everything::SDL_HideCursor();
@@ -66,7 +74,15 @@ pub fn init(device: &mut device::Device) {
         crt: device.ui.config.video.crt,
     };
 
-    unsafe { rdp_init(device.ui.video.window as *mut std::ffi::c_void, gfx_info) }
+    unsafe {
+        let font_bytes = include_bytes!("../../data/Roboto-Regular.ttf");
+        rdp_init(
+            device.ui.video.window as *mut std::ffi::c_void,
+            gfx_info,
+            font_bytes.as_ptr() as *const std::ffi::c_void,
+            font_bytes.len(),
+        )
+    }
 }
 
 pub fn close(ui: &ui::Ui) {
@@ -114,8 +130,9 @@ pub fn load_state(device: &mut device::Device, rdp_state: *const u8) {
     }
 }
 
-pub fn check_callback(device: &mut device::Device) {
-    let callback = unsafe { rdp_check_callback() };
+pub fn check_callback(device: &mut device::Device) -> bool {
+    let mut speed_limiter_toggled = false;
+    let mut callback = unsafe { rdp_check_callback() };
     device.cpu.running = callback.emu_running;
     if device.netplay.is_none() {
         if callback.save_state {
@@ -123,14 +140,36 @@ pub fn check_callback(device: &mut device::Device) {
         } else if callback.load_state {
             device.load_state = true;
         }
-        device.vi.enable_speed_limiter = callback.enable_speedlimiter;
+        if device.vi.enable_speed_limiter != callback.enable_speedlimiter {
+            speed_limiter_toggled = true;
+            device.vi.enable_speed_limiter = callback.enable_speedlimiter;
+        }
+        while callback.paused {
+            std::thread::sleep(std::time::Duration::from_secs_f64(1.0 / 60.0));
+            unsafe { sdl3_sys::events::SDL_PumpEvents() };
+            callback = unsafe { rdp_check_callback() };
+        }
     }
 
+    if device.ui.storage.save_state_slot != callback.save_state_slot {
+        ui::video::onscreen_message(
+            &device.ui,
+            &format!("Switching savestate slot to {}", callback.save_state_slot,),
+        );
+        device.ui.storage.save_state_slot = callback.save_state_slot;
+        device
+            .ui
+            .storage
+            .paths
+            .savestate_file_path
+            .set_extension("state".to_owned() + callback.save_state_slot.to_string().as_str());
+    }
     if callback.lower_volume {
         ui::audio::lower_audio_volume(&mut device.ui);
     } else if callback.raise_volume {
         ui::audio::raise_audio_volume(&mut device.ui);
     }
+    speed_limiter_toggled
 }
 
 pub fn set_register(reg: u32, value: u32) {
@@ -143,60 +182,30 @@ pub fn process_rdp_list() -> u64 {
     unsafe { rdp_process_commands() }
 }
 
+pub fn onscreen_message(_ui: &ui::Ui, message: &str) {
+    unsafe { rdp_onscreen_message(std::ffi::CString::new(message).unwrap().as_ptr()) };
+}
+
 pub fn draw_text(
     text: &str,
     renderer: *mut sdl3_sys::render::SDL_Renderer,
-    font: &ab_glyph::FontRef,
+    text_engine: *mut sdl3_ttf_sys::ttf::TTF_TextEngine,
+    font: *mut sdl3_ttf_sys::ttf::TTF_Font,
 ) {
-    // Clear the canvas
     unsafe {
-        sdl3_sys::render::SDL_SetRenderDrawColor(
-            renderer,
+        let (mut w, mut h) = (0, 0);
+        sdl3_sys::render::SDL_GetRenderOutputSize(renderer, &mut w, &mut h);
+
+        let ttf_text = sdl3_ttf_sys::ttf::TTF_CreateText(
+            text_engine,
+            font,
+            std::ffi::CString::new(text).unwrap().as_ptr(),
             0,
-            0,
-            0,
-            sdl3_sys::pixels::SDL_ALPHA_OPAQUE,
         );
-        sdl3_sys::render::SDL_RenderClear(renderer);
-    };
 
-    let text_size = 40.0;
-    let (mut w, mut h) = (0, 0);
-    unsafe { sdl3_sys::render::SDL_GetRenderOutputSize(renderer, &mut w, &mut h) };
-    let x_start = 20.0;
-    let y_start = (h / 2) as f32;
-
-    let mut x_offset = 0.0;
-    for c in text.chars() {
-        let q_glyph_id = font.glyph_id(c);
-        let q_glyph = q_glyph_id.with_scale(text_size);
-
-        if let Some(q) = font.outline_glyph(q_glyph) {
-            q.draw(|x, y, c| {
-                if c > 0.5 {
-                    unsafe {
-                        sdl3_sys::render::SDL_SetRenderDrawColor(
-                            renderer,
-                            255,
-                            255,
-                            255,
-                            sdl3_sys::pixels::SDL_ALPHA_OPAQUE,
-                        );
-                        sdl3_sys::render::SDL_RenderPoint(
-                            renderer,
-                            x_start + x_offset + x as f32 - q.px_bounds().width()
-                                + q.px_bounds().max.x,
-                            y_start + y as f32 - q.px_bounds().height() + q.px_bounds().max.y,
-                        );
-                    };
-                }
-            });
-        }
-        x_offset += font.as_scaled(text_size).h_advance(q_glyph_id);
-    }
-
-    // Present the canvas
-    if !unsafe { sdl3_sys::render::SDL_RenderPresent(renderer) } {
-        panic!("Could not present renderer");
+        sdl3_sys::everything::SDL_RenderClear(renderer);
+        sdl3_ttf_sys::ttf::TTF_DrawRendererText(ttf_text, 20.0, h as f32 / 2.0);
+        sdl3_sys::render::SDL_RenderPresent(renderer);
+        sdl3_ttf_sys::ttf::TTF_DestroyText(ttf_text);
     }
 }

src/ui/vru.rs

@@ -1,23 +1,17 @@
-use eframe::egui;
-
-use crate::ui;
-
 pub fn prompt_for_match(
     words: &[String],
-    window_notifier: &tokio::sync::mpsc::Sender<Vec<String>>,
+    window_notifier: &tokio::sync::mpsc::Sender<Option<Vec<String>>>,
     word_index_receiver: &mut tokio::sync::mpsc::Receiver<String>,
-    gui_ctx: &egui::Context,
 ) -> u16 {
     let mut dedup_words = words.to_owned();
     dedup_words.sort();
     dedup_words.dedup();
-    window_notifier.try_send(dedup_words).unwrap();
-    gui_ctx.request_repaint(); // this is so the window pops up right away
+    window_notifier.try_send(Some(dedup_words)).unwrap();
     let mut result = word_index_receiver.try_recv();
     while result.is_err() {
         result = word_index_receiver.try_recv();
         std::thread::sleep(std::time::Duration::from_secs_f64(1.0 / 60.0));
-        ui::video::update_screen(); // so the OS doesn't complain about the game window being frozen
+        unsafe { sdl3_sys::events::SDL_PumpEvents() }; // so the OS doesn't complain about the game window being frozen
     }
     for (i, v) in words.iter().enumerate() {
         if *v == *result.as_ref().unwrap() {