From c69ee40684cc107209c9d865fdbc584c5c2c899d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 1 Mar 2022 20:56:08 -0700 Subject: [PATCH] Print out selected keymap --- ps2d/src/main.rs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ps2d/src/main.rs b/ps2d/src/main.rs index 56bd0a2014..d72d9b0d4b 100644 --- a/ps2d/src/main.rs +++ b/ps2d/src/main.rs @@ -25,19 +25,24 @@ fn daemon(daemon: syscall::Daemon) -> ! { iopl(3).expect("ps2d: failed to get I/O permission"); } - let keymap = match env::args().skip(1).next() { + let (keymap, keymap_name): ( + fn(u8, bool) -> char, + &str + ) = match env::args().skip(1).next() { Some(k) => match k.to_lowercase().as_ref() { - "dvorak" => (keymap::dvorak::get_char), - "us" => (keymap::us::get_char), - "gb" => (keymap::gb::get_char), - "azerty" => (keymap::azerty::get_char), - "bepo" => (keymap::bepo::get_char), - "it" => (keymap::it::get_char), - &_ => (keymap::us::get_char) + "dvorak" => (keymap::dvorak::get_char, "dvorak"), + "us" => (keymap::us::get_char, "us"), + "gb" => (keymap::gb::get_char, "gb"), + "azerty" => (keymap::azerty::get_char, "azerty"), + "bepo" => (keymap::bepo::get_char, "bepo"), + "it" => (keymap::it::get_char, "it"), + &_ => (keymap::us::get_char, "us"), }, - None => (keymap::us::get_char) + None => (keymap::us::get_char, "us"), }; + eprintln!("p2sd: using keymap '{}'", keymap_name); + let input = OpenOptions::new() .write(true) .open("display:input")