Merge branch 'vecset' into 'master'

Move event handling to Rust

See merge request Librem5/squeekboard!223
This commit is contained in:
David Boddie
2019-10-24 14:03:21 +00:00
15 changed files with 662 additions and 610 deletions

View File

@ -14,7 +14,7 @@ use std::vec::Vec;
use xkbcommon::xkb;
use ::keyboard::{
KeyState,
KeyState, PressType,
generate_keymap, generate_keycodes, FormattingError
};
use ::resources;
@ -309,7 +309,7 @@ impl Layout {
(
name.into(),
KeyState {
pressed: false,
pressed: PressType::Released,
locked: false,
keycodes,
action,
@ -370,6 +370,8 @@ impl Layout {
CString::new(keymap_str)
.expect("Invalid keymap string generated")
},
locked_keys: HashSet::new(),
pressed_keys: HashSet::new(),
})
}
}