diff --git a/Cargo.lock b/Cargo.lock index b66313127..4695b175c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1044,6 +1044,15 @@ dependencies = [ "backtrace", ] +[[package]] +name = "fastrand" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +dependencies = [ + "instant", +] + [[package]] name = "filetime" version = "0.2.15" @@ -1070,9 +1079,9 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2917b8937f4d36d9df8b15a51428b6a1b2726ec57402b0c94b4dfc393a409e5" +checksum = "0b51b4517f4422bfa0515dafcc10b4cc4cd3953d69a19608fd74afb3b19e227c" dependencies = [ "ansi_term", "atty", @@ -2949,7 +2958,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0" -source = "git+https://github.com/open-trade/rdev#faeef84bf2edfa457e9e32c0c96b63f44e494fff" +source = "git+https://github.com/open-trade/rdev#f0ffc49b502c884956a47b8a1830fc5f55bf9faf" dependencies = [ "cocoa 0.22.0", "core-foundation 0.7.0", @@ -3604,13 +3613,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi 0.3.9", diff --git a/Cargo.toml b/Cargo.toml index db0133937..6a9325e25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,8 +54,6 @@ sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" ctrlc = "3.2" arboard = "2.0" clipboard-master = "3.1" -#tigervnc = { path = "../tigervnc" } -#tigervnc = { git = "https://github.com/open-trade/tigervnc" } #rdev = { path = "../rdev" } rdev = { git = "https://github.com/open-trade/rdev" } diff --git a/src/ui/remote.rs b/src/ui/remote.rs index 34888aba9..0ca61eb3a 100644 --- a/src/ui/remote.rs +++ b/src/ui/remote.rs @@ -280,7 +280,7 @@ impl Handler { Key::Space => Some(ControlKey::Space), Key::Tab => Some(ControlKey::Tab), Key::UpArrow => Some(ControlKey::UpArrow), - Key::Delete | Key::KpDelete => { + Key::Delete => { if is_win && ctrl && alt { me.ctrl_alt_del(); return; @@ -305,6 +305,21 @@ impl Handler { Key::Sleep => Some(ControlKey::Sleep), Key::Separator => Some(ControlKey::Separator), Key::KpReturn => Some(ControlKey::NumpadEnter), + Key::Kp0 => Some(ControlKey::Numpad0), + Key::Kp1 => Some(ControlKey::Numpad1), + Key::Kp2 => Some(ControlKey::Numpad2), + Key::Kp3 => Some(ControlKey::Numpad3), + Key::Kp4 => Some(ControlKey::Numpad4), + Key::Kp5 => Some(ControlKey::Numpad5), + Key::Kp6 => Some(ControlKey::Numpad6), + Key::Kp7 => Some(ControlKey::Numpad7), + Key::Kp8 => Some(ControlKey::Numpad8), + Key::Kp9 => Some(ControlKey::Numpad9), + Key::KpDivide => Some(ControlKey::Divide), + Key::KpMultiply => Some(ControlKey::Subtract), + Key::KpDecimal => Some(ControlKey::Decimal), + Key::KpMinus => Some(ControlKey::Subtract), + Key::KpPlus => Some(ControlKey::Add), Key::CapsLock | Key::NumLock | Key::ScrollLock => { return; } @@ -1022,6 +1037,7 @@ impl Handler { } else if get_key_state(enigo::Key::CapsLock) && common::valid_for_capslock(&key_event) { key_event.modifiers.push(ControlKey::CapsLock.into()); } + */ if self.peer_platform() != "Mac OS" { if crate::is_control_key(&key_event, &ControlKey::NumLock) { return; @@ -1029,7 +1045,6 @@ impl Handler { key_event.modifiers.push(ControlKey::NumLock.into()); } } - */ if down_or_up == 1 { key_event.down = true; } else if down_or_up == 3 {