Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 15:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

fish_key_reader: use canonical key name for ctrl-{c,d}

Browse source 
The uppercase version has a different meaning now.
This commit is contained in:
Johannes Altmanninger 2024-04-18 23:41:14 +02:00
parent 5ba21cd290
commit 565eb85d8b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bin/fish_key_reader.rs
View file

@ -1,7 +1,7 @@
//! A small utility to print information related to pressing keys. This is similar to using tools
//! like `xxd` and `od -tx1z` but provides more information such as the time delay between each
//! character. It also allows pressing and interpreting keys that are normally special such as
//! [ctrl-C] (interrupt the program) or [ctrl-D] (EOF to signal the program should exit).
//! [ctrl-c] (interrupt the program) or [ctrl-d] (EOF to signal the program should exit).
//! And unlike those other tools this one disables ICRNL mode so it can distinguish between
//! carriage-return (\cM) and newline (\cJ).
//!
@ -46,8 +46,8 @@ fn should_exit(recent_keys: &mut Vec<Key>, key: Key) -> bool {
return true;
}
eprintf!(
"Press [ctrl-%c] again to exit\n",
char::from(modes.c_cc[evt] + 0x40)
"Press ctrl-%c again to exit\n",
char::from(modes.c_cc[evt] + 0x60)
);
return false;
}
@ -133,9 +133,9 @@ fn setup_and_process_keys(continuous_mode: bool) -> i32 {
eprintf!("To terminate this program type \"exit\" or \"quit\" in this window,\n");
let modes = shell_modes();
eprintf!(
"or press [ctrl-%c] or [ctrl-%c] twice in a row.\n",
char::from(modes.c_cc[VINTR] + 0x40),
char::from(modes.c_cc[VEOF] + 0x40)
"or press ctrl-%c or ctrl-%c twice in a row.\n",
char::from(modes.c_cc[VINTR] + 0x60),
char::from(modes.c_cc[VEOF] + 0x60)
);
eprintf!("\n");
}