vinc
/
moros
mirror of https://github.com/vinc/moros.git
1
5
Fork 0
Code Issues Projects Releases Wiki Activity

Move dvorak layout to fork of pc-keyboard crate

This commit is contained in:
Vincent Ollivier 2020-01-03 20:43:18 +01:00
parent 6539fe0ec5
commit e87b485a86
5 changed files with 3 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -129,8 +129,7 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "pc-keyboard"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c48392db76c4e9a69e0b3be356c5f97ebb7b14413c5e4fd0af4755dbf86e2fce"
source = "git+https://github.com/vinc/pc-keyboard?branch=feature/add-dvorak-layout#ca10a42c8c3e245b1d0987874f216f8b19a94aa4"
[[package]]
name = "pic8259_simple"

2
Cargo.toml
View File

@ -14,6 +14,6 @@ volatile = "0.2.6"
spin = "0.5.2"
x86_64 = "0.8.1"
pic8259_simple = "0.1.1"
pc-keyboard = "0.5.0"
pc-keyboard = { version = "0.5.0", git = "https://github.com/vinc/pc-keyboard", branch = "feature/add-dvorak-layout" }
heapless = "0.5.1"
lazy_static = { version = "1.0", features = ["spin_no_std"] }

3
src/kernel/interrupts.rs
View File

@ -61,8 +61,7 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptSt
}
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
use crate::kernel::layouts;
use pc_keyboard::{Keyboard, ScancodeSet1, HandleControl};
use pc_keyboard::{Keyboard, ScancodeSet1, HandleControl, layouts};
use spin::Mutex;
use x86_64::instructions::port::Port;

483
src/kernel/layouts.rs
View File

@ -1,483 +0,0 @@
//! A standard United States 101-key (or 104-key including Windows keys) keyboard.
//! Has a 1-row high Enter key, with Backslash above.
use pc_keyboard::{DecodedKey, HandleControl, KeyCode, KeyboardLayout, Modifiers};
pub struct Dvorak104Key;
impl KeyboardLayout for Dvorak104Key {
fn map_keycode(
keycode: KeyCode,
modifiers: &Modifiers,
handle_ctrl: HandleControl,
) -> DecodedKey {
let map_to_unicode = handle_ctrl == HandleControl::MapLettersToUnicode;
match keycode {
KeyCode::BackTick => {
if modifiers.is_shifted() {
DecodedKey::Unicode('~')
} else {
DecodedKey::Unicode('`')
}
}
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
KeyCode::Key1 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('!')
} else {
DecodedKey::Unicode('1')
}
}
KeyCode::Key2 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('@')
} else {
DecodedKey::Unicode('2')
}
}
KeyCode::Key3 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('#')
} else {
DecodedKey::Unicode('3')
}
}
KeyCode::Key4 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('$')
} else {
DecodedKey::Unicode('4')
}
}
KeyCode::Key5 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('%')
} else {
DecodedKey::Unicode('5')
}
}
KeyCode::Key6 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('^')
} else {
DecodedKey::Unicode('6')
}
}
KeyCode::Key7 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('&')
} else {
DecodedKey::Unicode('7')
}
}
KeyCode::Key8 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('*')
} else {
DecodedKey::Unicode('8')
}
}
KeyCode::Key9 => {
if modifiers.is_shifted() {
DecodedKey::Unicode('(')
} else {
DecodedKey::Unicode('9')
}
}
KeyCode::Key0 => {
if modifiers.is_shifted() {
DecodedKey::Unicode(')')
} else {
DecodedKey::Unicode('0')
}
}
KeyCode::Minus => {
if modifiers.is_shifted() {
DecodedKey::Unicode('{')
} else {
DecodedKey::Unicode('[')
}
}
KeyCode::Equals => {
if modifiers.is_shifted() {
DecodedKey::Unicode('}')
} else {
DecodedKey::Unicode(']')
}
}
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
KeyCode::Q => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0011}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('"')
} else {
DecodedKey::Unicode('\'')
}
}
KeyCode::W => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0017}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('<')
} else {
DecodedKey::Unicode(',')
}
}
KeyCode::E => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0005}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('>')
} else {
DecodedKey::Unicode('.')
}
}
KeyCode::R => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0012}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('P')
} else {
DecodedKey::Unicode('p')
}
}
KeyCode::T => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0014}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('Y')
} else {
DecodedKey::Unicode('y')
}
}
KeyCode::Y => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0019}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('F')
} else {
DecodedKey::Unicode('f')
}
}
KeyCode::U => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0015}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('G')
} else {
DecodedKey::Unicode('g')
}
}
KeyCode::I => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0009}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('C')
} else {
DecodedKey::Unicode('c')
}
}
KeyCode::O => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000F}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('R')
} else {
DecodedKey::Unicode('r')
}
}
KeyCode::P => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0010}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('L')
} else {
DecodedKey::Unicode('l')
}
}
KeyCode::BracketSquareLeft => {
if modifiers.is_shifted() {
DecodedKey::Unicode('?')
} else {
DecodedKey::Unicode('/')
}
}
KeyCode::BracketSquareRight => {
if modifiers.is_shifted() {
DecodedKey::Unicode('+')
} else {
DecodedKey::Unicode('=')
}
}
KeyCode::BackSlash => {
if modifiers.is_shifted() {
DecodedKey::Unicode('|')
} else {
DecodedKey::Unicode('\\')
}
}
KeyCode::A => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0001}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('A')
} else {
DecodedKey::Unicode('a')
}
}
KeyCode::S => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0013}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('O')
} else {
DecodedKey::Unicode('o')
}
}
KeyCode::D => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0004}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('E')
} else {
DecodedKey::Unicode('e')
}
}
KeyCode::F => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0006}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('U')
} else {
DecodedKey::Unicode('u')
}
}
KeyCode::G => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0007}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('I')
} else {
DecodedKey::Unicode('i')
}
}
KeyCode::H => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0008}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('D')
} else {
DecodedKey::Unicode('d')
}
}
KeyCode::J => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000A}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('H')
} else {
DecodedKey::Unicode('h')
}
}
KeyCode::K => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000B}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('T')
} else {
DecodedKey::Unicode('t')
}
}
KeyCode::L => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000C}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('N')
} else {
DecodedKey::Unicode('n')
}
}
KeyCode::SemiColon => {
if modifiers.is_shifted() {
DecodedKey::Unicode('S')
} else {
DecodedKey::Unicode('s')
}
}
KeyCode::Quote => {
if modifiers.is_shifted() {
DecodedKey::Unicode('_')
} else {
DecodedKey::Unicode('-')
}
}
// Enter gives LF, not CRLF or CR
KeyCode::Enter => DecodedKey::Unicode(10.into()),
KeyCode::Z => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{001A}')
} else if modifiers.is_caps() {
DecodedKey::Unicode(':')
} else {
DecodedKey::Unicode(';')
}
}
KeyCode::X => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0018}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('Q')
} else {
DecodedKey::Unicode('q')
}
}
KeyCode::C => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0003}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('J')
} else {
DecodedKey::Unicode('j')
}
}
KeyCode::V => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0016}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('K')
} else {
DecodedKey::Unicode('k')
}
}
KeyCode::B => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0002}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('X')
} else {
DecodedKey::Unicode('x')
}
}
KeyCode::N => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000E}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('B')
} else {
DecodedKey::Unicode('b')
}
}
KeyCode::M => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{000D}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('M')
} else {
DecodedKey::Unicode('m')
}
}
KeyCode::Comma => {
if modifiers.is_shifted() {
DecodedKey::Unicode('W')
} else {
DecodedKey::Unicode('w')
}
}
KeyCode::Fullstop => {
if modifiers.is_shifted() {
DecodedKey::Unicode('V')
} else {
DecodedKey::Unicode('v')
}
}
KeyCode::Slash => {
if modifiers.is_shifted() {
DecodedKey::Unicode('Z')
} else {
DecodedKey::Unicode('z')
}
}
KeyCode::Spacebar => DecodedKey::Unicode(' '),
KeyCode::Delete => DecodedKey::Unicode(127.into()),
KeyCode::NumpadSlash => DecodedKey::Unicode('/'),
KeyCode::NumpadStar => DecodedKey::Unicode('*'),
KeyCode::NumpadMinus => DecodedKey::Unicode('-'),
KeyCode::Numpad7 => {
if modifiers.numlock {
DecodedKey::Unicode('7')
} else {
DecodedKey::RawKey(KeyCode::Home)
}
}
KeyCode::Numpad8 => {
if modifiers.numlock {
DecodedKey::Unicode('8')
} else {
DecodedKey::RawKey(KeyCode::ArrowUp)
}
}
KeyCode::Numpad9 => {
if modifiers.numlock {
DecodedKey::Unicode('9')
} else {
DecodedKey::RawKey(KeyCode::PageUp)
}
}
KeyCode::NumpadPlus => DecodedKey::Unicode('+'),
KeyCode::Numpad4 => {
if modifiers.numlock {
DecodedKey::Unicode('4')
} else {
DecodedKey::RawKey(KeyCode::ArrowLeft)
}
}
KeyCode::Numpad5 => DecodedKey::Unicode('5'),
KeyCode::Numpad6 => {
if modifiers.numlock {
DecodedKey::Unicode('6')
} else {
DecodedKey::RawKey(KeyCode::ArrowRight)
}
}
KeyCode::Numpad1 => {
if modifiers.numlock {
DecodedKey::Unicode('1')
} else {
DecodedKey::RawKey(KeyCode::End)
}
}
KeyCode::Numpad2 => {
if modifiers.numlock {
DecodedKey::Unicode('2')
} else {
DecodedKey::RawKey(KeyCode::ArrowDown)
}
}
KeyCode::Numpad3 => {
if modifiers.numlock {
DecodedKey::Unicode('3')
} else {
DecodedKey::RawKey(KeyCode::PageDown)
}
}
KeyCode::Numpad0 => {
if modifiers.numlock {
DecodedKey::Unicode('0')
} else {
DecodedKey::RawKey(KeyCode::Insert)
}
}
KeyCode::NumpadPeriod => {
if modifiers.numlock {
DecodedKey::Unicode('.')
} else {
DecodedKey::Unicode(127.into())
}
}
KeyCode::NumpadEnter => DecodedKey::Unicode(10.into()),
k => DecodedKey::RawKey(k),
}
}
}

1
src/kernel/mod.rs
View File

@ -4,6 +4,5 @@ pub mod console;
pub mod fs;
pub mod gdt;
pub mod interrupts;
pub mod layouts;
pub mod sleep;
pub mod vga;