h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-20 07:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Extract constant for the number of function keys

Browse Source 
Switch to fish_wcstoul because we want the constant to be unsigned.
It's u32 because most callers of function_key() want that.
This commit is contained in:
Johannes Altmanninger
2025-03-31 20:30:09 +02:00
parent 26ca12d5af
commit e9d1cdfe87
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/key.rs
View File

@@ -26,9 +26,10 @@
pub(crate) const Space: char = '\u{F50E}';
pub(crate) const Menu: char = '\u{F50F}';
pub(crate) const PrintScreen: char = '\u{F510}';
pub(crate) const MAX_FUNCTION_KEY: u32 = 12;
pub(crate) fn function_key(n: u32) -> char {
assert!((1..=12).contains(&n));
char::from_u32(u32::from('\u{F5FF}') - 12 + (n - 1)).unwrap()
assert!((1..=MAX_FUNCTION_KEY).contains(&n));
char::from_u32(u32::from('\u{F5FF}') - MAX_FUNCTION_KEY + (n - 1)).unwrap()
}
pub(crate) const Invalid: char = '\u{F5FF}';
@@ -308,11 +309,14 @@ pub(crate) fn parse_keys(value: &wstr) -> Result<Vec<Key>, WString> {
})?
} else if codepoint.is_none() && key_name.starts_with('f') && key_name.len() <= 3 {
let num = key_name.strip_prefix('f').unwrap();
let codepoint = match fish_wcstoi(num) {
Ok(n) if (1..=12).contains(&n) => function_key(u32::try_from(n).unwrap()),
let codepoint = match fish_wcstoul(num) {
Ok(n) if (1..=u64::from(MAX_FUNCTION_KEY)).contains(&n) => {
function_key(u32::try_from(n).unwrap())
}
_ => {
return Err(wgettext_fmt!(
"only f1 through f12 are supported, not 'f%s'",
"only f1 through f%d are supported, not 'f%s'",
MAX_FUNCTION_KEY,
num,
));
}
@@ -403,7 +407,7 @@ fn from(key: Key) -> Self {
.iter()
.find_map(|&(codepoint, name)| (codepoint == key.codepoint).then(|| name.to_owned()))
.or_else(|| {
(function_key(1)..=function_key(12))
(function_key(1)..=function_key(MAX_FUNCTION_KEY))
.contains(&key.codepoint)
.then(|| {
sprintf!(