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

First fully working shift modifying version

Browse Source
This commit is contained in:
Travis Burtrum 2017-09-19 01:45:58 -04:00
parent f7bbc3cf92
commit 8f320174a1
2 changed files with 177 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keymap.toml
View File

@ -10,7 +10,7 @@ revert_keymap_index = 0
# this is the default index to use when the program first starts # this is the default index to use when the program first starts
# in this case, 2 means modified Progammer Dvorak # in this case, 2 means modified Progammer Dvorak
default_keymap_index = 1 default_keymap_index = 2
# these are keys that caps_lock doesn't modify by default, but that you would like it to, affects all keymaps # these are keys that caps_lock doesn't modify by default, but that you would like it to, affects all keymaps
caps_lock_modify = """ caps_lock_modify = """
@ -43,4 +43,14 @@ keymaps = [
LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, UP, P1, P2, P3, LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
""", """,
# Unix Dvorak Programmer Dvorak - for unix developers who are switching from dvorak
# https://www.moparisthebest.com/kbs/programmer-dvorak-NoSecondary-NumpadStandard-NoSwap-StandardNums-SwapAt-SwapPipe.svg
"""
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
^4:^GRV, ^7:1, LBRC:2, ^LBRC:3, ^RBRC:4, ^9:5, ^2:6, ^8:7, ^0:8, ^EQL:9, RBRC:0, ^1:^5, ^3:GRV, BSPC, INS, HOME,PGUP, NLCK, PSLS:^9, PAST:^0, PMNS:^4,
TAB, QUOT, COMM, DOT, P, Y, F, G, C, R, L, SLSH, EQL:^6, *^BSLS:*BSLS, DEL, END, PGDN, P7:^A, P8:^B, P9:^C,
CAPS, A, O, E, U, I, D, H, T, N, S, MINS, ENT, P4:^D, P5:^E, P6:^F, PPLS:COMM,
LSFT, SCLN, Q, J, K, X, B, M, W, V, Z, RSFT, UP, P1:EQL, P2:X, P3:^SCLN,
LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL, LEFT,DOWN,RGHT, P0:BSLS, PDOT:SCLN, PENT
""",
] ]

207
src/main.rs
View File

@ -208,6 +208,17 @@ impl Drop for InputDevice {
// 1 is down, 0 is up // 1 is down, 0 is up
const DOWN : i32 = 1; const DOWN : i32 = 1;
const UP : i32 = 0; 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 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 { trait KeyMapper {
fn send_event(&mut self, key_state: &mut [bool], event: input_event, device: &Device); fn send_event(&mut self, key_state: &mut [bool], event: input_event, device: &Device);
@ -226,16 +237,28 @@ struct KeyMaps {
} }
fn parse_key(key_map: &HashMap<&'static str, *const c_int>, key: &str) -> u16 { fn parse_key(key_map: &HashMap<&'static str, *const c_int>, key: &str) -> u16 {
match key_map.get(key.trim()) { 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, Some(key_code) => *key_code as u16,
None => panic!("unknown key: {}", key.trim()) None => panic!("unknown key: {}", key.trim())
} }
} }
fn parse_keymap(key_map: &HashMap<&'static str, *const c_int>, keymap: &str) -> Vec<u16> { 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 {
HalfInvertedKey {
code: parse_key(key_map, key),
invert_shift: key.contains(INVERT_KEY_FLAG),
capslock_nomodify: key.contains(CAPS_MODIFY_KEY_FLAG),
}
}
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()
}
impl KeyMaps { impl KeyMaps {
pub fn new(key_map: &HashMap<&'static str, *const c_int>, config: KeymapConfig) -> KeyMaps { pub fn new(key_map: &HashMap<&'static str, *const c_int>, config: KeymapConfig) -> KeyMaps {
if config.keymaps.len() < 2 { if config.keymaps.len() < 2 {
@ -244,7 +267,7 @@ impl KeyMaps {
if config.default_keymap_index >= config.keymaps.len() || config.revert_keymap_index >= config.keymaps.len() { if config.default_keymap_index >= config.keymaps.len() || config.revert_keymap_index >= config.keymaps.len() {
panic!("default_keymap_index ({}) and revert_keymap_index ({}) must be less than keymaps length ({}),", config.default_keymap_index, config.revert_keymap_index, config.keymaps.len()); panic!("default_keymap_index ({}) and revert_keymap_index ({}) must be less than keymaps length ({}),", config.default_keymap_index, config.revert_keymap_index, config.keymaps.len());
} }
let base_keymap = parse_keymap(key_map, &config.keymaps[0]); let base_keymap = parse_keymap_numeric(key_map, &config.keymaps[0]);
println!("base_keymap : {:?}", base_keymap); 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(); let mut keymap_index_keys: HashMap<u16, usize> = HashMap::new();
@ -253,22 +276,55 @@ impl KeyMaps {
if x == 0 { if x == 0 {
continue; continue;
} }
if v.contains(":") { 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();
if keys.len() != 2 {
panic!("split key can only have 2 keys, 1 :, has {} keys", keys.len());
}
let mut shift_half = parse_key_half_inverted(key_map, keys[1]);
shift_half.invert_shift = !shift_half.invert_shift;
Box::new(ShiftInvertedKey {
noshift_half: parse_key_half_inverted(key_map, keys[0]),
shift_half: shift_half,
})
} else if k.contains(INVERT_KEY_FLAG) || k.contains(CAPS_MODIFY_KEY_FLAG) {
Box::new(parse_key_half_inverted(key_map, k))
} else { } else {
let v = parse_keymap(key_map, v); Box::new(parse_key(key_map, k))
println!("config.keymaps[{}]: {:?}", x, v); };
ret
});//parse_keymap(key_map, v);
//println!("config.keymaps[{}]: {:?}", x, v);
/*
if v.len() != base_keymap.len() { if v.len() != base_keymap.len() {
panic!("all keymaps must be the same length, keymap index 0 length: {}, index {} length: {},", base_keymap.len(), x, v.len()); panic!("all keymaps must be the same length, keymap index 0 length: {}, index {} length: {},", base_keymap.len(), x, v.len());
} }
*/
let mut keymap = KeyMap::new(); let mut keymap = KeyMap::new();
/*
for(i, key_code) in v.iter().enumerate() { for(i, key_code) in v.iter().enumerate() {
keymap.map(base_keymap[i], *key_code); let ptr = Box::into_raw(*key_code);
//keymap.map(base_keymap[i], &key_code);
} }
println!("keymap[{}]: {:?}", x, &keymap.keymap[..]);
keymaps.push(Box::new(keymap));
for(i, key_code) in base_keymap.iter().enumerate() {
//let ptr = Box::into_raw(*key_code);
keymap.map(*key_code, v[i]);
} }
*/
let mut i : usize = 0;
for key_code in v {
keymap.map(base_keymap[i], key_code);
i = i + 1;
if i > base_keymap.len() {
panic!("all keymaps must be the same length, keymap index 0 length: {}, index {} length: {},", base_keymap.len(), x, i);
}
}
//println!("keymap[{}]: {:?}", x, &keymap.keymap[..]);
keymaps.push(Box::new(keymap));
} }
//println!("keymaps: {:?}", keymaps); //println!("keymaps: {:?}", keymaps);
//println!("keymap_index_keys: {:?}", keymap_index_keys); //println!("keymap_index_keys: {:?}", keymap_index_keys);
@ -289,10 +345,16 @@ impl KeyMaps {
//impl KeyMapper for KeyMaps { //impl KeyMapper for KeyMaps {
impl KeyMaps { impl KeyMaps {
fn send_event(&mut self, event: input_event, device: &Device) { fn send_event(&mut self, event: input_event, device: &Device) {
println!("type: {} code: {} value: {}", event.type_, event.code, event.value); //println!("type: {} code: {} value: {}", event.type_, event.code, event.value);
if event.value != 2 { if event.value != 2 {
// todo: index check here... // todo: index check here...
if event.code == KEY_CAPSLOCK_U16 {
if event.value == DOWN {
self.key_state[CAPSLOCK_INDEX] = !self.key_state[CAPSLOCK_INDEX];
}
} else {
self.key_state[event.code as usize] = event.value == DOWN; self.key_state[event.code as usize] = event.value == DOWN;
}
let mut switch_layout_keys_pressed = true; let mut switch_layout_keys_pressed = true;
for mut layout_switch_key in self.switch_layout_keys.iter_mut() { for mut layout_switch_key in self.switch_layout_keys.iter_mut() {
if !self.key_state[*layout_switch_key] { if !self.key_state[*layout_switch_key] {
@ -312,8 +374,8 @@ impl KeyMaps {
if event.code == self.revert_default_key { if event.code == self.revert_default_key {
match event.value { match event.value {
// todo: ctrl+c will get c stuck because code c value 1 will be sent, but then we'll let go of ctrl, and code j value 0 is sent, so c is never released... fix that... // todo: ctrl+c will get c stuck because code c value 1 will be sent, but then we'll let go of ctrl, and code j value 0 is sent, so c is never released... fix that...
1 => self.current_keymap_index = self.revert_keymap_index, DOWN => self.current_keymap_index = self.revert_keymap_index,
0 => self.current_keymap_index = self.chosen_keymap_index, UP => self.current_keymap_index = self.chosen_keymap_index,
_ => () // do nothing for 2 _ => () // do nothing for 2
} }
} }
@ -326,7 +388,7 @@ impl KeyMaps {
const KEY_MAX : usize = 249; const KEY_MAX : usize = 249;
struct KeyMap { struct KeyMap {
keymap: [u16; KEY_MAX], keymap: Vec<Box<KeyMapper>>,//[Box<KeyMapper>; KEY_MAX],
} }
impl KeyMap { impl KeyMap {
@ -649,25 +711,35 @@ impl KeyMap {
} }
pub fn new() -> Self { pub fn new() -> Self {
let mut keymap = [0u16; KEY_MAX]; //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);
for x in 0..KEY_MAX {
keymap.push(Box::new(NOOP));
}
// which is rustier // which is rustier
/* /*
for x in 0..KEY_MAX { for x in 0..KEY_MAX {
keymap[x as usize] = x as u16; keymap[x as usize] = x as u16;
} }
*/
for (x, v) in keymap.iter_mut().enumerate() { for (x, v) in keymap.iter_mut().enumerate() {
*v = x as u16; *v = x as u16;
} }
*/
//println!("keymap: {:?}", &keymap[..]); //println!("keymap: {:?}", &keymap[..]);
KeyMap { KeyMap {
keymap: keymap keymap: keymap
} }
} }
/*
pub fn map(&mut self, from : u16, to: u16) { pub fn map(&mut self, from : u16, to: u16) {
self.keymap[from as usize] = to; self.keymap[from as usize] = to;
} }
*/
pub fn map(&mut self, from : u16, to: Box<KeyMapper>) {
self.keymap[from as usize] = to;
}
} }
impl KeyMapper for KeyMap { impl KeyMapper for KeyMap {
@ -690,23 +762,9 @@ const NOOP : Noop = Noop{};
struct Noop {} struct Noop {}
impl KeyMapper for Noop { impl KeyMapper for Noop {
fn send_event(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device) { fn send_event(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device) {
//device.write_event(event).expect("could not write event?"); device.write_event(event).expect("could not write event?");
// todo: kind of sucks how bout we don't
let mut code = event.code;
code.send_event(key_state, event, device);
} }
} }
/*
impl InvertedKey for Noop {
fn send_event_inverted(mut self, mut event: input_event, device: &Device, shift_down: bool) {
self.send_event(event, device);
}
}
*/
trait InvertedKey {
fn send_event_inverted(self, mut event: input_event, device: &Device, shift_down: bool);
}
struct HalfInvertedKey { struct HalfInvertedKey {
code: u16, // code this is describing code: u16, // code this is describing
@ -714,10 +772,64 @@ struct HalfInvertedKey {
capslock_nomodify: bool, // true means capslock does not normally modify this, but you would like it to capslock_nomodify: bool, // true means capslock does not normally modify this, but you would like it to
} }
impl InvertedKey for HalfInvertedKey { impl HalfInvertedKey {
fn send_event_inverted(mut self, mut event: input_event, device: &Device, shift_down: bool) { fn send_key(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device, left_shift: bool, right_shift: bool, caps_lock: bool) {
// todo: shift and unshift let mut code = self.code;
//self.code.send_event(event, device); let value = event.value;
let mut invert_shift = self.invert_shift;
if value == DOWN {
if caps_lock && self.capslock_nomodify {
invert_shift = !invert_shift;
}
if invert_shift {
if left_shift {
event.code = KEY_LEFTSHIFT_U16;
event.value = UP;
} else if right_shift {
event.code = KEY_RIGHTSHIFT_U16;
event.value = UP;
} else {
event.code = KEY_LEFTSHIFT_U16;
event.value = DOWN;
}
//event.code.send_event(key_state, event, device);
device.write_event(event).expect("could not write event?");
event.code = code; // not needed since u16 does it
event.value = value;
}
}
code.send_event(key_state,event, device);
if value == UP {
if caps_lock && self.capslock_nomodify {
invert_shift = !invert_shift;
}
if invert_shift {
if left_shift {
event.code = KEY_LEFTSHIFT_U16;
event.value = DOWN;
} else if right_shift {
event.code = KEY_RIGHTSHIFT_U16;
event.value = DOWN;
} else {
event.code = KEY_LEFTSHIFT_U16;
event.value = UP;
}
//event.code.send_event(key_state, event, device);
device.write_event(event).expect("could not write event?");
// neither of these are needed now...
event.code = code; // not needed since u16 does it
event.value = value;
}
}
}
}
impl KeyMapper for HalfInvertedKey {
fn send_event(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device) {
let left_shift = key_state[LEFTSHIFT_INDEX];
let right_shift = key_state[RIGHTSHIFT_INDEX];
let caps_lock = key_state[CAPSLOCK_INDEX];
self.send_key(key_state, event, device, left_shift, right_shift, caps_lock);
} }
} }
@ -726,15 +838,16 @@ struct ShiftInvertedKey {
shift_half: HalfInvertedKey, shift_half: HalfInvertedKey,
} }
impl InvertedKey for ShiftInvertedKey { impl KeyMapper for ShiftInvertedKey {
fn send_event_inverted(self, mut event: input_event, device: &Device, shift_down: bool) { fn send_event(&mut self, key_state: &mut [bool], mut event: input_event, device: &Device) {
// returns new_code, invert_shift let left_shift = key_state[LEFTSHIFT_INDEX];
let half_key = if shift_down { let right_shift = key_state[RIGHTSHIFT_INDEX];
self.shift_half 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 self.noshift_half.send_key(key_state, event, device, left_shift, right_shift, caps_lock);
}; }
half_key.send_event_inverted(event, device, shift_down)
} }
} }
@ -754,6 +867,14 @@ struct KeymapConfig {
keymaps: Vec<String> keymaps: Vec<String>
} }
/*
‎c`p‎: no, ? converts the error with From<> in its expansion
‎c`p‎: so unless io::Error: From<toml::Error> it isnt going to work
c`p‎: the idea with your own error type is that MyError: From<io::Error> + From<toml::Error> + etc etc
‎c`p‎: ie enum MyError { Io(io::Error), Toml(toml::Error), ... }
c`p‎: error-chain does all this stuff for you
*/
use std::io::{Error, ErrorKind}; use std::io::{Error, ErrorKind};
fn parse_cfg<P: AsRef<Path>>(path: P) -> Result<KeymapConfig, Error> { fn parse_cfg<P: AsRef<Path>>(path: P) -> Result<KeymapConfig, Error> {