Skip to content

Commit ac8f12e

Browse files
thejpsterthejpster
committed
Rename handler functions.
Also add one where the Alt key is the same regardless of shift status.
1 parent 9c6e395 commit ac8f12e

File tree

10 files changed

+362
-300
lines changed

10 files changed

+362
-300
lines changed

‎src/layouts/azerty.rs

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -150,40 +150,36 @@ impl KeyboardLayout for Azerty {
150150
match keycode {
151151
// ========= Row 2 (the numbers) =========
152152
KeyCode::Oem8 => DecodedKey::Unicode('²'),
153-
KeyCode::Key1 => modifiers.handle_shift('&', '1'),
154-
KeyCode::Key2 => modifiers.handle_altsh('é', '2', '~'),
155-
KeyCode::Key3 => modifiers.handle_altsh('"', '3', '#'),
156-
KeyCode::Key4 => modifiers.handle_altsh(QUO, '4', '{'),
157-
KeyCode::Key5 => modifiers.handle_altsh('(', '5', '['),
158-
KeyCode::Key6 => modifiers.handle_altsh('-', '6', '|'),
159-
KeyCode::Key7 => modifiers.handle_altsh('è', '7', '`'),
160-
KeyCode::Key8 => modifiers.handle_altsh('_', '8', SLS),
161-
KeyCode::Key9 => modifiers.handle_altsh('ç', '9', '^'),
162-
KeyCode::Key0 => modifiers.handle_altsh('à', '0', '@'),
163-
KeyCode::OemMinus => modifiers.handle_altsh(')', '°', ']'),
164-
KeyCode::OemPlus => modifiers.handle_altsh('=', '+', '}'),
165-
153+
KeyCode::Key1 => modifiers.handle_symbol2('&', '1'),
154+
KeyCode::Key2 => modifiers.handle_symbol3('é', '2', '~'),
155+
KeyCode::Key3 => modifiers.handle_symbol3('"', '3', '#'),
156+
KeyCode::Key4 => modifiers.handle_symbol3(QUO, '4', '{'),
157+
KeyCode::Key5 => modifiers.handle_symbol3('(', '5', '['),
158+
KeyCode::Key6 => modifiers.handle_symbol3('-', '6', '|'),
159+
KeyCode::Key7 => modifiers.handle_symbol3('è', '7', '`'),
160+
KeyCode::Key8 => modifiers.handle_symbol3('_', '8', SLS),
161+
KeyCode::Key9 => modifiers.handle_symbol3('ç', '9', '^'),
162+
KeyCode::Key0 => modifiers.handle_symbol3('à', '0', '@'),
163+
KeyCode::OemMinus => modifiers.handle_symbol3(')', '°', ']'),
164+
KeyCode::OemPlus => modifiers.handle_symbol3('=', '+', '}'),
166165
// ========= Row 3 (QWERTY) =========
167-
KeyCode::Q => modifiers.handle_alpha('A', handle_ctrl),
168-
KeyCode::W => modifiers.handle_alpha('Z', handle_ctrl),
169-
KeyCode::E => modifiers.handle_alalt('E', '€', '€', handle_ctrl),
170-
KeyCode::Oem4 => modifiers.handle_shift('^', '¨'),
171-
KeyCode::Oem6 => modifiers.handle_altsh('$', '£', '¤'),
172-
166+
KeyCode::Q => modifiers.handle_ascii_2('A', handle_ctrl),
167+
KeyCode::W => modifiers.handle_ascii_2('Z', handle_ctrl),
168+
KeyCode::E => modifiers.handle_ascii_3('E', '€', handle_ctrl),
169+
KeyCode::Oem4 => modifiers.handle_symbol2('^', '¨'),
170+
KeyCode::Oem6 => modifiers.handle_symbol3('$', '£', '¤'),
173171
// ========= Row 4 (ASDFG) =========
174-
KeyCode::A => modifiers.handle_alpha('Q', handle_ctrl),
175-
KeyCode::Oem1 => modifiers.handle_alpha('M', handle_ctrl),
176-
KeyCode::Oem3 => modifiers.handle_shift('ù', '%'),
177-
KeyCode::Oem7 => modifiers.handle_shift('*', 'µ'),
178-
172+
KeyCode::A => modifiers.handle_ascii_2('Q', handle_ctrl),
173+
KeyCode::Oem1 => modifiers.handle_ascii_2('M', handle_ctrl),
174+
KeyCode::Oem3 => modifiers.handle_symbol2('ù', '%'),
175+
KeyCode::Oem7 => modifiers.handle_symbol2('*', 'µ'),
179176
// ========= Row 5 (ZXCVB) =========
180-
KeyCode::Oem5 => modifiers.handle_shift('<', '>'),
181-
KeyCode::Z => modifiers.handle_alpha('W', handle_ctrl),
182-
KeyCode::M => modifiers.handle_shift(',', '?'),
183-
KeyCode::OemComma => modifiers.handle_shift(';', '.'),
184-
KeyCode::OemPeriod => modifiers.handle_shift(':', '/'),
185-
KeyCode::Oem2 => modifiers.handle_shift('!', '§'),
186-
177+
KeyCode::Oem5 => modifiers.handle_symbol2('<', '>'),
178+
KeyCode::Z => modifiers.handle_ascii_2('W', handle_ctrl),
179+
KeyCode::M => modifiers.handle_symbol2(',', '?'),
180+
KeyCode::OemComma => modifiers.handle_symbol2(';', '.'),
181+
KeyCode::OemPeriod => modifiers.handle_symbol2(':', '/'),
182+
KeyCode::Oem2 => modifiers.handle_symbol2('!', '§'),
187183
// ========= Fallback =========
188184
e => super::Us104Key.map_keycode(e, modifiers, handle_ctrl),
189185
}

‎src/layouts/colemak.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,25 +146,25 @@ impl KeyboardLayout for Colemak {
146146
) -> DecodedKey {
147147
match keycode {
148148
// ========= Row 3 (QWERTY) =========
149-
KeyCode::E => modifiers.handle_alpha('F', handle_ctrl),
150-
KeyCode::R => modifiers.handle_alpha('P', handle_ctrl),
151-
KeyCode::T => modifiers.handle_alpha('G', handle_ctrl),
152-
KeyCode::Y => modifiers.handle_alpha('J', handle_ctrl),
153-
KeyCode::U => modifiers.handle_alpha('L', handle_ctrl),
154-
KeyCode::I => modifiers.handle_alpha('U', handle_ctrl),
155-
KeyCode::O => modifiers.handle_alpha('Y', handle_ctrl),
156-
KeyCode::P => modifiers.handle_shift(';', ':'),
149+
KeyCode::E => modifiers.handle_ascii_2('F', handle_ctrl),
150+
KeyCode::R => modifiers.handle_ascii_2('P', handle_ctrl),
151+
KeyCode::T => modifiers.handle_ascii_2('G', handle_ctrl),
152+
KeyCode::Y => modifiers.handle_ascii_2('J', handle_ctrl),
153+
KeyCode::U => modifiers.handle_ascii_2('L', handle_ctrl),
154+
KeyCode::I => modifiers.handle_ascii_2('U', handle_ctrl),
155+
KeyCode::O => modifiers.handle_ascii_2('Y', handle_ctrl),
156+
KeyCode::P => modifiers.handle_symbol2(';', ':'),
157157
// ========= Row 4 (ASDFG) =========
158-
KeyCode::S => modifiers.handle_alpha('R', handle_ctrl),
159-
KeyCode::D => modifiers.handle_alpha('S', handle_ctrl),
160-
KeyCode::F => modifiers.handle_alpha('T', handle_ctrl),
161-
KeyCode::G => modifiers.handle_alpha('D', handle_ctrl),
162-
KeyCode::J => modifiers.handle_alpha('N', handle_ctrl),
163-
KeyCode::K => modifiers.handle_alpha('E', handle_ctrl),
164-
KeyCode::L => modifiers.handle_alpha('I', handle_ctrl),
165-
KeyCode::Oem1 => modifiers.handle_alpha('O', handle_ctrl),
158+
KeyCode::S => modifiers.handle_ascii_2('R', handle_ctrl),
159+
KeyCode::D => modifiers.handle_ascii_2('S', handle_ctrl),
160+
KeyCode::F => modifiers.handle_ascii_2('T', handle_ctrl),
161+
KeyCode::G => modifiers.handle_ascii_2('D', handle_ctrl),
162+
KeyCode::J => modifiers.handle_ascii_2('N', handle_ctrl),
163+
KeyCode::K => modifiers.handle_ascii_2('E', handle_ctrl),
164+
KeyCode::L => modifiers.handle_ascii_2('I', handle_ctrl),
165+
KeyCode::Oem1 => modifiers.handle_ascii_2('O', handle_ctrl),
166166
// ========= Row 5 (ZXCVB) =========
167-
KeyCode::N => modifiers.handle_alpha('K', handle_ctrl),
167+
KeyCode::N => modifiers.handle_ascii_2('K', handle_ctrl),
168168
// ========= Fallback =========
169169
e => super::Us104Key.map_keycode(e, modifiers, handle_ctrl),
170170
}

‎src/layouts/de105.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -148,33 +148,33 @@ impl KeyboardLayout for De105Key {
148148
) -> DecodedKey {
149149
match keycode {
150150
// ========= Row 2 (the numbers) =========
151-
KeyCode::Oem8 => modifiers.handle_shift('^', '°'),
152-
KeyCode::Key2 => modifiers.handle_altsh('2', '"', '²'),
153-
KeyCode::Key3 => modifiers.handle_altsh('3', '§', '³'),
154-
KeyCode::Key6 => modifiers.handle_shift('6', '&'),
155-
KeyCode::Key7 => modifiers.handle_altsh('7', '/', '{'),
156-
KeyCode::Key8 => modifiers.handle_altsh('8', '(', '['),
157-
KeyCode::Key9 => modifiers.handle_altsh('9', ')', ']'),
158-
KeyCode::Key0 => modifiers.handle_altsh('0', '=', '}'),
159-
KeyCode::OemMinus => modifiers.handle_altsh('ß', '?', SLS),
160-
KeyCode::OemPlus => modifiers.handle_shift('´', '`'),
151+
KeyCode::Oem8 => modifiers.handle_symbol2('^', '°'),
152+
KeyCode::Key2 => modifiers.handle_symbol3('2', '"', '²'),
153+
KeyCode::Key3 => modifiers.handle_symbol3('3', '§', '³'),
154+
KeyCode::Key6 => modifiers.handle_symbol2('6', '&'),
155+
KeyCode::Key7 => modifiers.handle_symbol3('7', '/', '{'),
156+
KeyCode::Key8 => modifiers.handle_symbol3('8', '(', '['),
157+
KeyCode::Key9 => modifiers.handle_symbol3('9', ')', ']'),
158+
KeyCode::Key0 => modifiers.handle_symbol3('0', '=', '}'),
159+
KeyCode::OemMinus => modifiers.handle_symbol3('ß', '?', SLS),
160+
KeyCode::OemPlus => modifiers.handle_symbol2('´', '`'),
161161
// ========= Row 3 (QWERTY) =========
162-
KeyCode::Q => modifiers.handle_alalt('Q', '@', '@', handle_ctrl),
163-
KeyCode::E => modifiers.handle_alalt('E', '€', '€', handle_ctrl),
164-
KeyCode::Y => modifiers.handle_alpha('Z', handle_ctrl),
165-
KeyCode::Oem4 => modifiers.handle_accen('ü', 'Ü'),
166-
KeyCode::Oem6 => modifiers.handle_altsh('+', '*', '~'),
162+
KeyCode::Q => modifiers.handle_ascii_3('Q', '@', handle_ctrl),
163+
KeyCode::E => modifiers.handle_ascii_3('E', '€', handle_ctrl),
164+
KeyCode::Y => modifiers.handle_ascii_2('Z', handle_ctrl),
165+
KeyCode::Oem4 => modifiers.handle_letter2('ü', 'Ü'),
166+
KeyCode::Oem6 => modifiers.handle_symbol3('+', '*', '~'),
167167
// ========= Row 4 (ASDFG) =========
168-
KeyCode::Oem1 => modifiers.handle_accen('ö', 'Ö'),
169-
KeyCode::Oem3 => modifiers.handle_accen('ä', 'Ä'),
170-
KeyCode::Oem7 => modifiers.handle_shift('#', QUO),
168+
KeyCode::Oem1 => modifiers.handle_letter2('ö', 'Ö'),
169+
KeyCode::Oem3 => modifiers.handle_letter2('ä', 'Ä'),
170+
KeyCode::Oem7 => modifiers.handle_symbol2('#', QUO),
171171
// ========= Row 5 (ZXCVB) =========
172-
KeyCode::Oem5 => modifiers.handle_altsh('<', '>', '|'),
173-
KeyCode::Z => modifiers.handle_alpha('Y', handle_ctrl),
174-
KeyCode::M => modifiers.handle_alalt('M', 'µ', 'µ', handle_ctrl),
175-
KeyCode::OemComma => modifiers.handle_shift(',', ';'),
176-
KeyCode::OemPeriod => modifiers.handle_shift('.', ':'),
177-
KeyCode::Oem2 => modifiers.handle_shift('-', '_'),
172+
KeyCode::Oem5 => modifiers.handle_symbol3('<', '>', '|'),
173+
KeyCode::Z => modifiers.handle_ascii_2('Y', handle_ctrl),
174+
KeyCode::M => modifiers.handle_ascii_3('M', 'µ', handle_ctrl),
175+
KeyCode::OemComma => modifiers.handle_symbol2(',', ';'),
176+
KeyCode::OemPeriod => modifiers.handle_symbol2('.', ':'),
177+
KeyCode::Oem2 => modifiers.handle_symbol2('-', '_'),
178178
// ========= Fallback =========
179179
e => super::Us104Key.map_keycode(e, modifiers, handle_ctrl),
180180
}

‎src/layouts/dvorak104.rs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -144,42 +144,42 @@ impl KeyboardLayout for Dvorak104Key {
144144
) -> DecodedKey {
145145
match keycode {
146146
// ========= Row 2 (the numbers) =========
147-
KeyCode::OemMinus => modifiers.handle_shift('[', '{'),
148-
KeyCode::OemPlus => modifiers.handle_shift(']', '}'),
147+
KeyCode::OemMinus => modifiers.handle_symbol2('[', '{'),
148+
KeyCode::OemPlus => modifiers.handle_symbol2(']', '}'),
149149
// ========= Row 3 (QWERTY) =========
150-
KeyCode::Q => modifiers.handle_shift(QUO, '"'),
151-
KeyCode::W => modifiers.handle_shift(',', '<'),
152-
KeyCode::E => modifiers.handle_shift('.', '>'),
153-
KeyCode::R => modifiers.handle_alpha('P', handle_ctrl),
154-
KeyCode::T => modifiers.handle_alpha('Y', handle_ctrl),
155-
KeyCode::Y => modifiers.handle_alpha('F', handle_ctrl),
156-
KeyCode::U => modifiers.handle_alpha('G', handle_ctrl),
157-
KeyCode::I => modifiers.handle_alpha('C', handle_ctrl),
158-
KeyCode::O => modifiers.handle_alpha('R', handle_ctrl),
159-
KeyCode::P => modifiers.handle_alpha('L', handle_ctrl),
160-
KeyCode::Oem4 => modifiers.handle_shift('/', '?'),
161-
KeyCode::Oem6 => modifiers.handle_shift('=', '+'),
150+
KeyCode::Q => modifiers.handle_symbol2(QUO, '"'),
151+
KeyCode::W => modifiers.handle_symbol2(',', '<'),
152+
KeyCode::E => modifiers.handle_symbol2('.', '>'),
153+
KeyCode::R => modifiers.handle_ascii_2('P', handle_ctrl),
154+
KeyCode::T => modifiers.handle_ascii_2('Y', handle_ctrl),
155+
KeyCode::Y => modifiers.handle_ascii_2('F', handle_ctrl),
156+
KeyCode::U => modifiers.handle_ascii_2('G', handle_ctrl),
157+
KeyCode::I => modifiers.handle_ascii_2('C', handle_ctrl),
158+
KeyCode::O => modifiers.handle_ascii_2('R', handle_ctrl),
159+
KeyCode::P => modifiers.handle_ascii_2('L', handle_ctrl),
160+
KeyCode::Oem4 => modifiers.handle_symbol2('/', '?'),
161+
KeyCode::Oem6 => modifiers.handle_symbol2('=', '+'),
162162
// ========= Row 4 (ASDFG) =========
163-
KeyCode::S => modifiers.handle_alpha('O', handle_ctrl),
164-
KeyCode::D => modifiers.handle_alpha('E', handle_ctrl),
165-
KeyCode::F => modifiers.handle_alpha('U', handle_ctrl),
166-
KeyCode::G => modifiers.handle_alpha('I', handle_ctrl),
167-
KeyCode::H => modifiers.handle_alpha('D', handle_ctrl),
168-
KeyCode::J => modifiers.handle_alpha('H', handle_ctrl),
169-
KeyCode::K => modifiers.handle_alpha('T', handle_ctrl),
170-
KeyCode::L => modifiers.handle_alpha('N', handle_ctrl),
171-
KeyCode::Oem1 => modifiers.handle_alpha('S', handle_ctrl),
172-
KeyCode::Oem3 => modifiers.handle_shift('-', '_'),
163+
KeyCode::S => modifiers.handle_ascii_2('O', handle_ctrl),
164+
KeyCode::D => modifiers.handle_ascii_2('E', handle_ctrl),
165+
KeyCode::F => modifiers.handle_ascii_2('U', handle_ctrl),
166+
KeyCode::G => modifiers.handle_ascii_2('I', handle_ctrl),
167+
KeyCode::H => modifiers.handle_ascii_2('D', handle_ctrl),
168+
KeyCode::J => modifiers.handle_ascii_2('H', handle_ctrl),
169+
KeyCode::K => modifiers.handle_ascii_2('T', handle_ctrl),
170+
KeyCode::L => modifiers.handle_ascii_2('N', handle_ctrl),
171+
KeyCode::Oem1 => modifiers.handle_ascii_2('S', handle_ctrl),
172+
KeyCode::Oem3 => modifiers.handle_symbol2('-', '_'),
173173
// ========= Row 5 (ZXCVB) =========
174-
KeyCode::Z => modifiers.handle_shift(';', ':'),
175-
KeyCode::X => modifiers.handle_alpha('Q', handle_ctrl),
176-
KeyCode::C => modifiers.handle_alpha('J', handle_ctrl),
177-
KeyCode::V => modifiers.handle_alpha('K', handle_ctrl),
178-
KeyCode::B => modifiers.handle_alpha('X', handle_ctrl),
179-
KeyCode::N => modifiers.handle_alpha('B', handle_ctrl),
180-
KeyCode::OemComma => modifiers.handle_alpha('W', handle_ctrl),
181-
KeyCode::OemPeriod => modifiers.handle_alpha('V', handle_ctrl),
182-
KeyCode::Oem2 => modifiers.handle_alpha('Z', handle_ctrl),
174+
KeyCode::Z => modifiers.handle_symbol2(';', ':'),
175+
KeyCode::X => modifiers.handle_ascii_2('Q', handle_ctrl),
176+
KeyCode::C => modifiers.handle_ascii_2('J', handle_ctrl),
177+
KeyCode::V => modifiers.handle_ascii_2('K', handle_ctrl),
178+
KeyCode::B => modifiers.handle_ascii_2('X', handle_ctrl),
179+
KeyCode::N => modifiers.handle_ascii_2('B', handle_ctrl),
180+
KeyCode::OemComma => modifiers.handle_ascii_2('W', handle_ctrl),
181+
KeyCode::OemPeriod => modifiers.handle_ascii_2('V', handle_ctrl),
182+
KeyCode::Oem2 => modifiers.handle_ascii_2('Z', handle_ctrl),
183183
// ========= Fallback =========
184184
e => super::Us104Key.map_keycode(e, modifiers, handle_ctrl),
185185
}

0 commit comments

Comments
 (0)