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

symbol: Eliminate in favor of Action

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-10-09 08:06:17 +00:00
parent 46d3312c86
commit ef38fd3e64
4 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/keyboard.rs
View File

@ -7,7 +7,7 @@ use std::io;
use std::rc::Rc;
use std::string::FromUtf8Error;
use ::symbol::{ Symbol, Action };
use ::symbol::Action;
use std::io::Write;
use std::iter::{ FromIterator, IntoIterator };
@ -73,7 +73,8 @@ pub struct KeyState {
pub pressed: bool,
pub locked: bool,
pub keycode: Option<u32>,
pub symbol: Symbol,
/// Static description of what the key does when pressed or released
pub action: Action,
}
/// Generates a mapping where each key gets a keycode, starting from 8
@ -124,7 +125,7 @@ pub fn generate_keymap(
for (name, state) in keystates.iter() {
let state = state.borrow();
if let ::symbol::Action::Submit { text: _, keys } = &state.symbol.action {
if let ::symbol::Action::Submit { text: _, keys } = &state.action {
match keys.len() {
0 => eprintln!("Key {} has no keysyms", name),
a => {
@ -156,7 +157,7 @@ pub fn generate_keymap(
)?;
for (name, state) in keystates.iter() {
if let ::symbol::Action::Submit { text: _, keys } = &state.borrow().symbol.action {
if let ::symbol::Action::Submit { text: _, keys } = &state.borrow().action {
if let Some(keysym) = keys.iter().next() {
write!(
buf,