Archives
/
distant
mirror of https://github.com/chipsenkbeil/distant
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update termwiz 0.15.0 -> 0.17.1

Browse Source
pull/118/head
Chip Senkbeil 2 years ago
parent 90373bd1fb
commit b9d2e2e57e
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131
3 changed files with 212 additions and 12 deletions
Show Stats Download Patch File Download Diff File

217
Cargo.lock generated
Unescape Escape View File

@ -573,6 +573,22 @@ dependencies = [
"typenum",
]
[[package]]
name = "csscolorparser"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
dependencies = [
"lab",
"phf 0.11.1",
]
[[package]]
name = "deltae"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e412cd91a4ec62fcc739ea50c40babe21e3de60d69f36393cce377c7c04ead5a"
[[package]]
name = "der"
version = "0.6.0"
@ -984,6 +1000,12 @@ dependencies = [
"winapi",
]
[[package]]
name = "fixedbitset"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flexi_logger"
version = "0.23.0"
@ -1393,6 +1415,12 @@ dependencies = [
"libc",
]
[[package]]
name = "lab"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f"
[[package]]
name = "lazy_static"
version = "1.4.0"
@ -1518,6 +1546,18 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "nix"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
"libc",
"memoffset",
]
[[package]]
name = "nom"
version = "5.1.2"
@ -1648,9 +1688,9 @@ dependencies = [
[[package]]
name = "ordered-float"
version = "2.10.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2"
dependencies = [
"num-traits",
]
@ -1768,13 +1808,66 @@ dependencies = [
"ucd-trie",
]
[[package]]
name = "pest_derive"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91"
dependencies = [
"pest",
"pest_generator",
]
[[package]]
name = "pest_generator"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "pest_meta"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe"
dependencies = [
"once_cell",
"pest",
"sha-1",
]
[[package]]
name = "phf"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
"phf_shared",
"phf_shared 0.8.0",
]
[[package]]
name = "phf"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
"phf_shared 0.10.0",
]
[[package]]
name = "phf"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
dependencies = [
"phf_macros",
"phf_shared 0.11.1",
]
[[package]]
@ -1783,8 +1876,8 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [
"phf_generator",
"phf_shared",
"phf_generator 0.8.0",
"phf_shared 0.8.0",
]
[[package]]
@ -1793,10 +1886,33 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
"phf_shared",
"phf_shared 0.8.0",
"rand 0.7.3",
]
[[package]]
name = "phf_generator"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
dependencies = [
"phf_shared 0.11.1",
"rand 0.8.5",
]
[[package]]
name = "phf_macros"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
dependencies = [
"phf_generator 0.11.1",
"phf_shared 0.11.1",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "phf_shared"
version = "0.8.0"
@ -1806,6 +1922,24 @@ dependencies = [
"siphasher",
]
[[package]]
name = "phf_shared"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
dependencies = [
"siphasher",
]
[[package]]
name = "phf_shared"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
dependencies = [
"siphasher",
]
[[package]]
name = "pin-project-lite"
version = "0.2.9"
@ -2396,6 +2530,17 @@ dependencies = [
"which",
]
[[package]]
name = "sha-1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest 0.10.3",
]
[[package]]
name = "sha2"
version = "0.9.9"
@ -2691,7 +2836,7 @@ dependencies = [
"dirs 2.0.2",
"fnv",
"nom 5.1.2",
"phf",
"phf 0.8.0",
"phf_codegen",
]
@ -2721,23 +2866,28 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
[[package]]
name = "termwiz"
version = "0.15.0"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31ef6892cc0348a9b3b8c377addba91e0f6365863d92354bf27559dca81ee8c5"
checksum = "8afe4dd464afed784e203297d2af3dbe833fbded166a484587102cac73e56ff1"
dependencies = [
"anyhow",
"base64",
"bitflags",
"cfg-if 1.0.0",
"filedescriptor",
"fixedbitset",
"hex",
"lazy_static",
"libc",
"log",
"memmem",
"nix",
"num-derive",
"num-traits",
"ordered-float",
"pest",
"pest_derive",
"phf 0.10.1",
"regex",
"semver 0.11.0",
"sha2 0.9.9",
@ -2748,6 +2898,9 @@ dependencies = [
"ucd-trie",
"unicode-segmentation",
"vtparse",
"wezterm-bidi",
"wezterm-color-types",
"wezterm-dynamic",
"winapi",
]
@ -3091,6 +3244,52 @@ dependencies = [
"cc",
]
[[package]]
name = "wezterm-bidi"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c680e07480bd88aa16a8e6fc835870752129a0202dba0801116b5cf73a2f0b42"
dependencies = [
"log",
"wezterm-dynamic",
]
[[package]]
name = "wezterm-color-types"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777"
dependencies = [
"csscolorparser",
"deltae",
"lazy_static",
"wezterm-dynamic",
]
[[package]]
name = "wezterm-dynamic"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa"
dependencies = [
"log",
"ordered-float",
"strsim",
"thiserror",
"wezterm-dynamic-derive",
]
[[package]]
name = "wezterm-dynamic-derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c9f5ef318442d07b3d071f9f43ea40b80992f87faee14bb4d017b6991c307f0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "wezterm-ssh"
version = "0.4.0"

2
Cargo.toml
Unescape Escape View File

@ -48,7 +48,7 @@ tabled = "0.8.0"
tokio = { version = "1.20.1", features = ["full"] }
toml_edit = { version = "0.14.4", features = ["serde"] }
terminal_size = "0.2.1"
termwiz = "0.15.0"
termwiz = "0.17.1"
uriparse = "0.6.4"
which = "4.2.5"
winsplit = "0.1.0"

5
src/cli/commands/client/shell.rs
Unescape Escape View File

@ -9,7 +9,7 @@ use std::time::Duration;
use terminal_size::{terminal_size, Height, Width};
use termwiz::{
caps::Capabilities,
input::{InputEvent, KeyCodeEncodeModes},
input::{InputEvent, KeyCodeEncodeModes, KeyboardEncoding},
terminal::{new_terminal, Terminal},
};
@ -60,10 +60,11 @@ impl Shell {
if let Ok(input) = ev.key.encode(
ev.modifiers,
KeyCodeEncodeModes {
enable_csi_u_key_encoding: false,
encoding: KeyboardEncoding::Xterm,
application_cursor_keys: false,
newline_mode: false,
},
/* is_down */ true,
) {
if let Err(x) = stdin.write_str(input).await {
error!("Failed to write to stdin of remote process: {}", x);

Write Preview
Loading…
Cancel
Save