Rename 'english' keymap to 'us'
This keyboard layout is only used in the United States, other english-speaking countries may have their own standard keyboard layouts. This commit changes the name of the 'english' layout to 'us' to match X11.
This commit is contained in:
+3
-3
@@ -1,5 +1,5 @@
|
||||
pub mod english {
|
||||
static ENGLISH: [[char; 2]; 58] = [
|
||||
pub mod us {
|
||||
static US: [[char; 2]; 58] = [
|
||||
['\0', '\0'],
|
||||
['\x1B', '\x1B'],
|
||||
['1', '!'],
|
||||
@@ -61,7 +61,7 @@ pub mod english {
|
||||
];
|
||||
|
||||
pub fn get_char(scancode: u8, shift: bool) -> char {
|
||||
if let Some(c) = ENGLISH.get(scancode as usize) {
|
||||
if let Some(c) = US.get(scancode as usize) {
|
||||
if shift {
|
||||
c[1]
|
||||
} else {
|
||||
|
||||
+3
-3
@@ -197,12 +197,12 @@ fn daemon(input: File) {
|
||||
let keymap = match env::args().skip(1).next() {
|
||||
Some(k) => match k.to_lowercase().as_ref() {
|
||||
"dvorak" => (keymap::dvorak::get_char),
|
||||
"english" => (keymap::english::get_char),
|
||||
"us" => (keymap::us::get_char),
|
||||
"azerty" => (keymap::azerty::get_char),
|
||||
"bepo" => (keymap::bepo::get_char),
|
||||
&_ => (keymap::english::get_char)
|
||||
&_ => (keymap::us::get_char)
|
||||
},
|
||||
None => (keymap::english::get_char)
|
||||
None => (keymap::us::get_char)
|
||||
};
|
||||
let ps2d = Arc::new(RefCell::new(Ps2d::new(input, keymap)));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user