From 63159e50dbc15da7d75b7328aa351dffc0cc3489 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 10 Mar 2021 01:58:38 +0800 Subject: [PATCH] wire up some function keys in hosted mode, add some fun glyphs for testing --- services/graphics-server/src/backend/minifb.rs | 6 ++++++ services/keyboard/src/main.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs index 17bba63d7..56dd42b84 100644 --- a/services/graphics-server/src/backend/minifb.rs +++ b/services/graphics-server/src/backend/minifb.rs @@ -167,6 +167,12 @@ impl XousDisplay { Key::Space => ' ', Key::Comma => ',', Key::Period => '.', + Key::F1 => 0x11_u8.into(), + Key::F2 => 0x12_u8.into(), + Key::F3 => 0x13_u8.into(), + Key::F4 => 0x14_u8.into(), + Key::F5 => '😃', + Key::F6 => '福', _ => '\u{0000}', } } else { diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs index 8b2addfae..3f9f6da3c 100644 --- a/services/keyboard/src/main.rs +++ b/services/keyboard/src/main.rs @@ -144,7 +144,7 @@ fn map_qwerty(code: RowCol) -> ScanCode { (7, 9) => ScanCode{key: Some(0xd_u8.into()), shift: Some(0xd_u8.into()), hold: Some(0xd_u8.into()), alt: Some(0xd_u8.into())}, // carriage return (8, 5) => ScanCode{key: Some(0xf_u8.into()), shift: Some(0xf_u8.into()), hold: Some(0xf_u8.into()), alt: Some(0xf_u8.into())}, // shift in (blue shift) - (8, 6) => ScanCode{key: Some(','), shift: Some(0xe_u8.into()), hold: Some('富'), alt: None}, // 0xe is shift out (sym) '富' -> just for testing hanzi plane + (8, 6) => ScanCode{key: Some(','), shift: Some(0xe_u8.into()), hold: Some('福'), alt: None}, // 0xe is shift out (sym) '富' -> just for testing hanzi plane (8, 7) => ScanCode{key: Some(' '), shift: Some(' '), hold: None /* hold of none -> repeat */, alt: None}, (8, 8) => ScanCode{key: Some('.'), shift: Some('😃'), hold: Some('😃'), alt: None}, (8, 9) => ScanCode{key: Some(0xf_u8.into()), shift: Some(0xf_u8.into()), hold: Some(0xf_u8.into()), alt: Some(0xf_u8.into())}, // shift in (blue shift)