moparisthebest/rusty-keys
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Avoid index out of bounds on strange keys (Apple)
All checks were successful
moparisthebest/rusty-keys/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Travis Burtrum 2021-09-25 01:36:50 -04:00
parent 8ffe640c4b
commit d0e38d0e55
1 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/keymapper.rs
View File

@ -215,7 +215,12 @@ pub fn send_event(&mut self, mut event: &mut E, device: &K) -> Result<R> {
self.key_state[device.caps_lock_code().into()] = !self.key_state[device.caps_lock_code().into()]; self.key_state[device.caps_lock_code().into()] = !self.key_state[device.caps_lock_code().into()];
} }
} else { } else {
self.key_state[event.code().into()] = value == KeyState::DOWN; let idx = event.code().into();
if idx >= KEY_MAX {
// oh well, send it directly then
return device.send(event);
}
self.key_state[idx] = value == KeyState::DOWN;
} }
let mut switch_layout_keys_pressed = true; let mut switch_layout_keys_pressed = true;
for layout_switch_key in self.switch_layout_keys.iter_mut() { for layout_switch_key in self.switch_layout_keys.iter_mut() {
@ -250,42 +255,16 @@ pub fn send_event(&mut self, mut event: &mut E, device: &K) -> Result<R> {
const KEY_MAX: usize = 249; const KEY_MAX: usize = 249;
struct KeyMap<T: Into<usize> + Copy> { struct KeyMap<T: Into<usize> + Copy> {
//keymap: Vec<Key>,
keymap: [Key<T>; KEY_MAX], keymap: [Key<T>; KEY_MAX],
} }
impl<T: Into<usize> + Copy> KeyMap<T> { impl<T: Into<usize> + Copy> KeyMap<T> {
pub fn new() -> Self { pub fn new() -> Self {
//let mut keymap = [0u16; KEY_MAX];
//let mut keymap : [Box<KeyMapper>; KEY_MAX] = [Box::new(NOOP); KEY_MAX];
//let mut keymap : [Box<KeyMapper>; KEY_MAX] = [Box::new(0u16); KEY_MAX];
let keymap: [Key<T>; KEY_MAX] = [Key::Noop; KEY_MAX];
/*
let mut keymap: Vec<Key> = Vec::with_capacity(KEY_MAX);
#[allow(unused_variables)]
for x in 0..KEY_MAX {
keymap.push(Key::Noop);
}
*/
// which is rustier
/*
for x in 0..KEY_MAX {
keymap[x as usize] = x as u16;
}
for (x, v) in keymap.iter_mut().enumerate() {
*v = x as u16;
}
*/
//println!("keymap: {:?}", &keymap[..]);
KeyMap { KeyMap {
keymap: keymap keymap: [Key::Noop; KEY_MAX]
} }
} }
/*
pub fn map(&mut self, from : u16, to: u16) {
self.keymap[from as usize] = to;
}
*/
pub fn map(&mut self, from: T, to: Key<T>) { pub fn map(&mut self, from: T, to: Key<T>) {
self.keymap[from.into()] = to; self.keymap[from.into()] = to;
} }
@ -303,25 +282,18 @@ impl<K, T, E, R> KeyMapper<K, T, E, R> for KeyMap<T>
} }
struct CodeKeyMap<T: Into<usize> + TryFrom<usize> + Copy + Default> { struct CodeKeyMap<T: Into<usize> + TryFrom<usize> + Copy + Default> {
//keymap: Vec<Key>,
keymap: [T; KEY_MAX], keymap: [T; KEY_MAX],
} }
impl<T: Into<usize> + TryFrom<usize> + Copy + Default> CodeKeyMap<T> { impl<T: Into<usize> + TryFrom<usize> + Copy + Default> CodeKeyMap<T> {
pub fn new() -> Self { pub fn new() -> Self {
let mut keymap = [T::default(); KEY_MAX]; let mut keymap = [T::default(); KEY_MAX];
// which is rustier
/*
for x in 0..KEY_MAX {
keymap[x as usize] = x as u16;
}
*/
for (x, v) in keymap.iter_mut().enumerate() { for (x, v) in keymap.iter_mut().enumerate() {
*v = T::try_from(x).unwrap_or_else(|_| panic!("cannot convert from usize to T ????")); *v = T::try_from(x).unwrap_or_else(|_| panic!("cannot convert from usize to T ????"));
} }
//println!("keymap: {:?}", &keymap[..]); //println!("keymap: {:?}", &keymap[..]);
CodeKeyMap { CodeKeyMap {
keymap: keymap keymap
} }
} }