s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'backspace-requires-another-keycode-on-the-same-keymap' into 'main'

Browse Source 
keyboard.rs: Add keycode to the keymap with BackSpace if there is no other

See merge request World/Phosh/squeekboard!695
This commit is contained in:
Marge Bot
2024-11-05 10:01:28 +00:00
parent 9fd15f76c7 04b6e07b61
commit ec45ef5e1f
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/keyboard.rs
View File

@ -117,7 +117,7 @@ pub fn generate_keycodes<'a, C: IntoIterator<Item=String>>(
let keycode_offset = 8; let keycode_offset = 8;
HashMap::from_iter( let mut keycode_map = HashMap::from_iter(
// Sort to remove a source of indeterminism in keycode assignment. // Sort to remove a source of indeterminism in keycode assignment.
sorted(key_names.into_iter()) sorted(key_names.into_iter())
.zip(util::cycle_count((9..255).filter(|x| allowed.contains(&(x - keycode_offset))))) .zip(util::cycle_count((9..255).filter(|x| allowed.contains(&(x - keycode_offset)))))
@ -251,11 +251,21 @@ pub fn generate_keycodes<'a, C: IntoIterator<Item=String>>(
if name == "Pause" { code = KEY_PAUSE + keycode_offset; keymap_idx = 0 } if name == "Pause" { code = KEY_PAUSE + keycode_offset; keymap_idx = 0 }
if name == "Return" { code = KEY_ENTER + keycode_offset; keymap_idx = 0 } if name == "Return" { code = KEY_ENTER + keycode_offset; keymap_idx = 0 }
if name == "Tab" { code = KEY_TAB + keycode_offset; keymap_idx = 0 } if name == "Tab" { code = KEY_TAB + keycode_offset; keymap_idx = 0 }
( (String::from(name), KeyCode { code, keymap_idx })
String::from(name), }),
KeyCode { code, keymap_idx }, );
)}) // Workaround: BackSpace does not work with `tools/entry.py` (made with GTK3),
) // if the keymap with BackSpace does not contain any other keycodes.
// This should only happen for the emoji-layout or incomplete custom-layouts,
// because the layout-tests for normal layouts check for the presence of a button for Return.
// This does add an "Unknown"-keycode, if necessary, to let BackSpace work anyway.
if !HashMap::contains_key(&keycode_map, &"Return".to_string()) {
HashMap::insert(&mut keycode_map,
"Unknown".to_string(),
KeyCode { code: KEY_UNKNOWN + keycode_offset, keymap_idx: 0 }
);
}
keycode_map
} }
#[derive(Debug)] #[derive(Debug)]