auto reformat main.rs

This commit is contained in:
Travis Burtrum 2017-09-19 01:46:36 -04:00
parent 8f320174a1
commit 8b7ab9d036
1 changed files with 383 additions and 387 deletions

View File

@ -17,7 +17,7 @@ use std::collections::HashMap;
use std::process::{exit, Command};
use std::fs::File;
use std::io::{Read};
use std::io::Read;
use std::{env, mem};
use std::os::unix::io::AsRawFd;
@ -26,7 +26,7 @@ use getopts::Options;
const VERSION: &'static str = env!("CARGO_PKG_VERSION");
const EV_KEY_U16 : u16 = EV_KEY as u16;
const EV_KEY_U16: u16 = EV_KEY as u16;
#[derive(Debug)]
struct Config {
@ -41,7 +41,6 @@ impl Config {
}
fn main() {
let key_map_config = parse_cfg("keymap.toml").expect("provided config cannot be found/parsed");
//println!("key_map_config: {:?}", key_map_config);
@ -86,7 +85,6 @@ fn main() {
} else {
device.write_event(event).expect("could not write event?");
}
}
}
@ -160,15 +158,15 @@ fn get_keyboard_device_filenames() -> Vec<String> {
ioctl!(write eviocgrab with b'E', 0x90; c_int);
// TODO: use size_of_input_event instead of hard-coding 24.
const SIZE_OF_INPUT_EVENT : usize = 24;//mem::size_of::<input_event>();
const SIZE_OF_INPUT_EVENT: usize = 24;//mem::size_of::<input_event>();
struct InputDevice {
device_file : File,
buf : [u8; SIZE_OF_INPUT_EVENT],
device_file: File,
buf: [u8; SIZE_OF_INPUT_EVENT],
}
impl InputDevice {
pub fn open(device_file : &str) -> Self {
pub fn open(device_file: &str) -> Self {
let device_file = File::open(device_file).unwrap_or_else(|e| panic!("{}", e));
InputDevice {
device_file: device_file,
@ -206,19 +204,19 @@ impl Drop for InputDevice {
// keymapper stuff
// 1 is down, 0 is up
const DOWN : i32 = 1;
const UP : i32 = 0;
const INVERT_KEY_FLAG : char = '^';
const CAPS_MODIFY_KEY_FLAG : char = '*';
const DOWN: i32 = 1;
const UP: i32 = 0;
const INVERT_KEY_FLAG: char = '^';
const CAPS_MODIFY_KEY_FLAG: char = '*';
const HALF_KEY_SEPARATOR: char = ':';
const LEFTSHIFT_INDEX : usize = KEY_LEFTSHIFT as usize;
const RIGHTSHIFT_INDEX : usize = KEY_RIGHTSHIFT as usize;
const CAPSLOCK_INDEX : usize = KEY_CAPSLOCK as usize;
const LEFTSHIFT_INDEX: usize = KEY_LEFTSHIFT as usize;
const RIGHTSHIFT_INDEX: usize = KEY_RIGHTSHIFT as usize;
const CAPSLOCK_INDEX: usize = KEY_CAPSLOCK as usize;
const KEY_LEFTSHIFT_U16 : u16 = KEY_LEFTSHIFT as u16;
const KEY_RIGHTSHIFT_U16 : u16 = KEY_RIGHTSHIFT as u16;
const KEY_CAPSLOCK_U16 : u16 = KEY_CAPSLOCK as u16;
const KEY_LEFTSHIFT_U16: u16 = KEY_LEFTSHIFT as u16;
const KEY_RIGHTSHIFT_U16: u16 = KEY_RIGHTSHIFT as u16;
const KEY_CAPSLOCK_U16: u16 = KEY_CAPSLOCK as u16;
trait KeyMapper {
fn send_event(&mut self, key_state: &mut [bool], event: input_event, device: &Device);
@ -237,14 +235,14 @@ struct KeyMaps {
}
fn parse_key(key_map: &HashMap<&'static str, *const c_int>, key: &str) -> u16 {
match key_map.get(key.trim_matches(|c : char| c.is_whitespace() || c == INVERT_KEY_FLAG || c == CAPS_MODIFY_KEY_FLAG)) {
match key_map.get(key.trim_matches(|c: char| c.is_whitespace() || c == INVERT_KEY_FLAG || c == CAPS_MODIFY_KEY_FLAG)) {
Some(key_code) => *key_code as u16,
None => panic!("unknown key: {}", key.trim())
}
}
fn parse_keymap_numeric(key_map: &HashMap<&'static str, *const c_int>, keymap: &str) -> Vec<u16> {
keymap.split(",").map(|k|parse_key(key_map, k)).collect()
keymap.split(",").map(|k| parse_key(key_map, k)).collect()
}
fn parse_key_half_inverted(key_map: &HashMap<&'static str, *const c_int>, key: &str) -> HalfInvertedKey {
@ -256,7 +254,7 @@ fn parse_key_half_inverted(key_map: &HashMap<&'static str, *const c_int>, key: &
}
fn parse_keymap(key_map: &HashMap<&'static str, *const c_int>, keymap: &str) -> Vec<Box<KeyMapper + 'static>> {
keymap.split(",").map(|k|Box::new(parse_key(key_map, k)) as Box<KeyMapper>).collect()
keymap.split(",").map(|k| Box::new(parse_key(key_map, k)) as Box<KeyMapper>).collect()
}
impl KeyMaps {
@ -269,7 +267,7 @@ impl KeyMaps {
}
let base_keymap = parse_keymap_numeric(key_map, &config.keymaps[0]);
println!("base_keymap : {:?}", base_keymap);
let mut keymaps : Vec<Box<KeyMapper>>= vec!(Box::new(NOOP)); // todo: can we share the box?
let mut keymaps: Vec<Box<KeyMapper>> = vec!(Box::new(NOOP)); // todo: can we share the box?
let mut keymap_index_keys: HashMap<u16, usize> = HashMap::new();
for (x, v) in config.keymaps.iter().enumerate() {
keymap_index_keys.insert(*key_map.get(&*x.to_string()).unwrap() as u16, x);
@ -277,9 +275,8 @@ impl KeyMaps {
continue;
}
let v = v.split(",").map(|k| {
let ret : Box<KeyMapper> = if k.contains(HALF_KEY_SEPARATOR) {
let keys : Vec<&str> = k.split(HALF_KEY_SEPARATOR).collect();
let ret: Box<KeyMapper> = if k.contains(HALF_KEY_SEPARATOR) {
let keys: Vec<&str> = k.split(HALF_KEY_SEPARATOR).collect();
if keys.len() != 2 {
panic!("split key can only have 2 keys, 1 :, has {} keys", keys.len());
}
@ -314,7 +311,7 @@ impl KeyMaps {
keymap.map(*key_code, v[i]);
}
*/
let mut i : usize = 0;
let mut i: usize = 0;
for key_code in v {
keymap.map(base_keymap[i], key_code);
i = i + 1;
@ -332,8 +329,9 @@ impl KeyMaps {
KeyMaps {
keymaps: keymaps,
keymap_index_keys: keymap_index_keys,
switch_layout_keys: config.switch_layout_keys.iter().map(|k|parse_key(key_map, k) as usize).collect(),
key_state: [false; KEY_MAX], // todo: detect key state? at least CAPSLOCK...
switch_layout_keys: config.switch_layout_keys.iter().map(|k| parse_key(key_map, k) as usize).collect(),
key_state: [false; KEY_MAX],
// todo: detect key state? at least CAPSLOCK...
revert_default_key: parse_key(key_map, &config.revert_default_key),
revert_keymap_index: config.revert_keymap_index,
chosen_keymap_index: config.default_keymap_index,
@ -385,10 +383,11 @@ impl KeyMaps {
}
// 249 is one more than KEY_MICMUTE which is max key in uinput-sys event.rs
const KEY_MAX : usize = 249;
const KEY_MAX: usize = 249;
struct KeyMap {
keymap: Vec<Box<KeyMapper>>,//[Box<KeyMapper>; KEY_MAX],
keymap: Vec<Box<KeyMapper>>,
//[Box<KeyMapper>; KEY_MAX],
}
impl KeyMap {
@ -649,7 +648,6 @@ impl KeyMap {
("WWAN", KEY_WWAN),
("RFKILL", KEY_RFKILL),
("MICMUTE", KEY_MICMUTE),
// below manual shortcuts
("PSCR", KEY_SYSRQ),
("SLCK", KEY_SCROLLLOCK),
@ -668,27 +666,22 @@ impl KeyMap {
("COMM", KEY_COMMA),
("DOT", KEY_DOT),
("SLSH", KEY_SLASH),
("CAPS", KEY_CAPSLOCK),
("LSFT", KEY_LEFTSHIFT),
("RSFT", KEY_RIGHTSHIFT),
("SPC", KEY_SPACE),
("APP", KEY_COMPOSE),
("LCTL", KEY_LEFTCTRL),
("RCTL", KEY_RIGHTCTRL),
("LALT", KEY_LEFTALT),
("RALT", KEY_RIGHTALT),
("LGUI", KEY_LEFTMETA),
("RGUI", KEY_RIGHTMETA),
("INS", KEY_INSERT),
("PGUP", KEY_PAGEUP),
("PGDN", KEY_PAGEDOWN),
("DEL", KEY_DELETE),
("RGHT", KEY_RIGHT),
("NLCK", KEY_NUMLOCK),
("PSLS", KEY_KPSLASH),
("PAST", KEY_KPASTERISK),
@ -706,7 +699,6 @@ impl KeyMap {
("P0", KEY_KP0),
("PDOT", KEY_KPDOT),
("PENT", KEY_KPENTER),
].iter().cloned().map(|(m, v)| (m, v as *const c_int)).collect()
}
@ -714,7 +706,7 @@ impl KeyMap {
//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 mut keymap : Vec<Box<KeyMapper>> = Vec::with_capacity(KEY_MAX);
let mut keymap: Vec<Box<KeyMapper>> = Vec::with_capacity(KEY_MAX);
for x in 0..KEY_MAX {
keymap.push(Box::new(NOOP));
}
@ -732,12 +724,12 @@ impl KeyMap {
keymap: keymap
}
}
/*
/*
pub fn map(&mut self, from : u16, to: u16) {
self.keymap[from as usize] = to;
}
*/
pub fn map(&mut self, from : u16, to: Box<KeyMapper>) {
*/
pub fn map(&mut self, from: u16, to: Box<KeyMapper>) {
self.keymap[from as usize] = to;
}
}
@ -757,9 +749,10 @@ impl KeyMapper for u16 {
}
}
const NOOP : Noop = Noop{};
const NOOP: Noop = Noop {};
// nightly I hear... const BOX_NOOP : Box<KeyMapper> = Box::new(NOOP);
struct Noop {}
impl KeyMapper for Noop {
fn send_event(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device) {
device.write_event(event).expect("could not write event?");
@ -767,9 +760,12 @@ impl KeyMapper for Noop {
}
struct HalfInvertedKey {
code: u16, // code this is describing
invert_shift: bool, // true to invert shift for this code
capslock_nomodify: bool, // true means capslock does not normally modify this, but you would like it to
code: u16,
// code this is describing
invert_shift: bool,
// true to invert shift for this code
capslock_nomodify: bool,
// true means capslock does not normally modify this, but you would like it to
}
impl HalfInvertedKey {
@ -798,7 +794,7 @@ impl HalfInvertedKey {
event.value = value;
}
}
code.send_event(key_state,event, device);
code.send_event(key_state, event, device);
if value == UP {
if caps_lock && self.capslock_nomodify {
invert_shift = !invert_shift;
@ -845,7 +841,7 @@ impl KeyMapper for ShiftInvertedKey {
let caps_lock = key_state[CAPSLOCK_INDEX];
if caps_lock != (left_shift || right_shift) {
self.shift_half.send_key(key_state, event, device, left_shift, right_shift, caps_lock);
} else{
} else {
self.noshift_half.send_key(key_state, event, device, left_shift, right_shift, caps_lock);
}
}