diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index 3a1be90ae..baeb41272 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -452,26 +452,10 @@ fn xmain() -> ! { }, Some(Opcode::KeyboardEvent) => msg_scalar_unpack!(msg, k1, k2, k3, k4, { let keys = [ - if let Some(a) = core::char::from_u32(k1 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k2 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k3 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k4 as u32) { - a - } else { - '\u{0000}' - }, + core::char::from_u32(k1 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k2 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k3 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k4 as u32).unwrap_or('\u{0000}'), ]; context_mgr.key_event(keys, &gfx, &mut canvases); }), diff --git a/services/gam/src/menu.rs b/services/gam/src/menu.rs index 7273d38f1..7aa43d26f 100644 --- a/services/gam/src/menu.rs +++ b/services/gam/src/menu.rs @@ -298,6 +298,7 @@ impl<'a> Menu<'a> { } self.index = 0; // reset the index to 0 self.gam.redraw().unwrap(); + break; // drop any characters that happened to trail the select key, it's probably a fat-finger error. }, '←' => { // placeholder @@ -414,26 +415,10 @@ pub fn menu_matic(items: Vec::, menu_name: &'static str, maybe_manager }, Some(MenuOpcode::Rawkeys) => xous::msg_scalar_unpack!(msg, k1, k2, k3, k4, { let keys = [ - if let Some(a) = core::char::from_u32(k1 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k2 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k3 as u32) { - a - } else { - '\u{0000}' - }, - if let Some(a) = core::char::from_u32(k4 as u32) { - a - } else { - '\u{0000}' - }, + core::char::from_u32(k1 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k2 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k3 as u32).unwrap_or('\u{0000}'), + core::char::from_u32(k4 as u32).unwrap_or('\u{0000}'), ]; menu.lock().unwrap().key_event(keys); }), diff --git a/services/gam/src/modal.rs b/services/gam/src/modal.rs index e522b0864..a4720ac09 100644 --- a/services/gam/src/modal.rs +++ b/services/gam/src/modal.rs @@ -436,6 +436,7 @@ impl<'a> Modal<'a> { log::debug!("closing modal"); // if it's a "close" button, invoke the GAM to put our box away self.gam.relinquish_focus().unwrap(); + break; // don't process any more keys after a close message } } }