From 11f726223bef35105cbc5100d07da2927c5b5e5f Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 25 Jan 2022 22:36:38 +0800 Subject: [PATCH] update to @gsora's patch to improve hosted mode performance We run a branch of minifb because we need the `set_key_state` function, which is not available on the main branch. This function is necessary to extract raw scan keycodes from the keyboard so we can respond to e.g. menu and prediction emulation keys (Home and Fn keys). The mainline minifb crate eats all of those key events and does not pass them on. --- Cargo.lock | 37 ++++++++++++----------------- services/graphics-server/Cargo.toml | 4 +++- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c9ba40c6..8d2193a8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1276,12 +1276,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.3.4" @@ -1310,7 +1304,7 @@ dependencies = [ [[package]] name = "minifb" version = "0.19.3" -source = "git+https://github.com/xobs/rust_minifb.git?rev=ea25c2e4843abd130d6794b2045812907a24eab2#ea25c2e4843abd130d6794b2045812907a24eab2" +source = "git+https://github.com/xobs/rust_minifb.git?rev=1717ec60830c1f9592b77ce875e492afef1aa533#1717ec60830c1f9592b77ce875e492afef1aa533" dependencies = [ "cc", "orbclient", @@ -2658,9 +2652,9 @@ checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "wayland-client" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" +checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" dependencies = [ "bitflags", "downcast-rs", @@ -2673,9 +2667,9 @@ dependencies = [ [[package]] name = "wayland-commons" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" +checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" dependencies = [ "nix", "once_cell", @@ -2685,9 +2679,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37e5455ec72f5de555ec39b5c3704036ac07c2ecd50d0bffe02d5fe2d4e65ab" +checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" dependencies = [ "nix", "wayland-client", @@ -2696,9 +2690,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95df3317872bcf9eec096c864b69aa4769a1d5d6291a5b513f8ba0af0efbd52c" +checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" dependencies = [ "bitflags", "wayland-client", @@ -2708,9 +2702,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" +checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" dependencies = [ "proc-macro2", "quote", @@ -2719,9 +2713,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.28.5" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" +checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" dependencies = [ "pkg-config", ] @@ -2798,13 +2792,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.18.5" +version = "2.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" +checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" dependencies = [ "lazy_static", "libc", - "maybe-uninit", "pkg-config", ] diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index 6bee687ce..e07e6baf4 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -25,7 +25,9 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics utralib = {path = "../../utralib"} [target.'cfg(any(windows,unix))'.dependencies] -minifb = {version = "0.19.2", git = "https://github.com/xobs/rust_minifb.git", rev = "ea25c2e4843abd130d6794b2045812907a24eab2"} +# this is forked from minifb because the `set_key_state` callback was dropped in later versions of minifb (or maybe it was never there?) +# the working branch is thus `set-key-state-cb` +minifb = {version = "0.19.2", git = "https://github.com/xobs/rust_minifb.git", rev = "1717ec60830c1f9592b77ce875e492afef1aa533"} [features] debugprint = []