graphics-server: buffer keypresses

Buffer keypresses so that keys are not lost. This improves
responsiveness, although there are still kernel plumbing issues.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-03-13 17:59:48 +08:00
parent b742dcade2
commit e1890b1717
2 changed files with 169 additions and 131 deletions

View file

@ -13,14 +13,14 @@ keyboard = {path = "../keyboard"}
log = "0.4" log = "0.4"
log-server = {path = "../log-server"} log-server = {path = "../log-server"}
xous = {path = "../../xous-rs"} xous = {path = "../../xous-rs"}
rkyv = { version = "0.3.1", default_features = false } rkyv = { version = "0.3.1", default_features = false, features = ["strict"] }
xous-names = {path = "../xous-names"} xous-names = {path = "../xous-names"}
[target.'cfg(not(any(windows,unix)))'.dependencies] [target.'cfg(not(any(windows,unix)))'.dependencies]
utralib = {path = "../../utralib"} utralib = {path = "../../utralib"}
[target.'cfg(any(windows,unix))'.dependencies] [target.'cfg(any(windows,unix))'.dependencies]
minifb = {version = "0.19.2", git = "https://github.com/xobs/rust_minifb.git", rev = "bbbfc07c059919fae700fabe771346a001226dbc"} minifb = {version = "0.19.2", git = "https://github.com/xobs/rust_minifb.git", rev = "ea25c2e4843abd130d6794b2045812907a24eab2"}
[features] [features]
debugprint = [] debugprint = []

View file

@ -1,5 +1,5 @@
use minifb::{Key, Window, WindowOptions, KeyRepeat};
use crate::api::Point; use crate::api::Point;
use minifb::{Key, Window, WindowOptions};
const WIDTH: usize = 336; const WIDTH: usize = 336;
const HEIGHT: usize = 536; const HEIGHT: usize = 536;
@ -16,7 +16,12 @@ pub struct XousDisplay {
native_buffer: Vec<u32>, //[u32; WIDTH * HEIGHT], native_buffer: Vec<u32>, //[u32; WIDTH * HEIGHT],
emulated_buffer: [u32; FB_SIZE], emulated_buffer: [u32; FB_SIZE],
window: Window, window: Window,
}
struct XousKeyboardHandler {
kbd_conn: xous::CID, kbd_conn: xous::CID,
left_shift: bool,
right_shift: bool,
} }
impl XousDisplay { impl XousDisplay {
@ -45,17 +50,25 @@ impl XousDisplay {
.update_with_buffer(&native_buffer, WIDTH, HEIGHT) .update_with_buffer(&native_buffer, WIDTH, HEIGHT)
.unwrap(); .unwrap();
let kbd_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_KBD).expect("GFX|hosted: can't connect to KBD for emulation"); let kbd_conn = xous_names::request_connection_blocking(xous::names::SERVER_NAME_KBD)
.expect("GFX|hosted: can't connect to KBD for emulation");
let keyboard_handler = Box::new(XousKeyboardHandler {
kbd_conn: kbd_conn,
left_shift: false,
right_shift: false,
});
window.set_input_callback(keyboard_handler);
XousDisplay { XousDisplay {
native_buffer, native_buffer,
window, window,
emulated_buffer: [0u32; FB_SIZE], emulated_buffer: [0u32; FB_SIZE],
kbd_conn,
} }
} }
pub fn screen_size(&self) -> Point { Point::new(WIDTH as i16, HEIGHT as i16) } pub fn screen_size(&self) -> Point {
Point::new(WIDTH as i16, HEIGHT as i16)
}
pub fn blit_screen(&mut self, bmp: [u32; FB_SIZE]) { pub fn blit_screen(&mut self, bmp: [u32; FB_SIZE]) {
for (dest, src) in self.emulated_buffer.iter_mut().zip(bmp.iter()) { for (dest, src) in self.emulated_buffer.iter_mut().zip(bmp.iter()) {
@ -80,17 +93,16 @@ impl XousDisplay {
if !self.window.is_open() || self.window.is_key_down(Key::Escape) { if !self.window.is_open() || self.window.is_key_down(Key::Escape) {
std::process::exit(0); std::process::exit(0);
} }
// let pressed = self.window.get_keys_pressed(KeyRepeat::No);
let pressed = self.window.get_keys_pressed(KeyRepeat::No); // if let Some(keys) = pressed {
if let Some(keys) = pressed { // for k in keys {
for k in keys { // log::info!("GFX|hosted: sending key {:?}", k);
log::info!("GFX|hosted: sending key {:?}", k); // let c = self.decode_key(k);
let c = self.decode_key(k); // if c != '\u{0000}' {
if c != '\u{0000}' { // xous::send_message(self.kbd_conn, keyboard::api::Opcode::HostModeInjectKey(c).into()).map(|_| ()).unwrap();
xous::send_message(self.kbd_conn, keyboard::api::Opcode::HostModeInjectKey(c).into()).map(|_| ()).unwrap(); // }
} // }
} // }
}
} }
fn emulated_to_native(&mut self) { fn emulated_to_native(&mut self) {
@ -110,122 +122,148 @@ impl XousDisplay {
} }
} }
} }
}
impl XousKeyboardHandler {
fn decode_key(&mut self, k: Key) -> char { fn decode_key(&mut self, k: Key) -> char {
let mut shift = false; let shift = self.left_shift || self.right_shift;
if self.window.is_key_pressed(Key::LeftShift, KeyRepeat::Yes) || let base: char = if shift == false {
self.window.is_key_pressed(Key::RightShift, KeyRepeat::Yes) { match k {
shift = true; Key::A => 'a',
} Key::B => 'b',
let base: char = Key::C => 'c',
if shift == false { Key::D => 'd',
match k { Key::E => 'e',
Key::A => 'a', Key::F => 'f',
Key::B => 'b', Key::G => 'g',
Key::C => 'c', Key::H => 'h',
Key::D => 'd', Key::I => 'i',
Key::E => 'e', Key::J => 'j',
Key::F => 'f', Key::K => 'k',
Key::G => 'g', Key::L => 'l',
Key::H => 'h', Key::M => 'm',
Key::I => 'i', Key::N => 'n',
Key::J => 'j', Key::O => 'o',
Key::K => 'k', Key::P => 'p',
Key::L => 'l', Key::Q => 'q',
Key::M => 'm', Key::R => 'r',
Key::N => 'n', Key::S => 's',
Key::O => 'o', Key::T => 't',
Key::P => 'p', Key::U => 'u',
Key::Q => 'q', Key::V => 'v',
Key::R => 'r', Key::W => 'w',
Key::S => 's', Key::X => 'x',
Key::T => 't', Key::Y => 'y',
Key::U => 'u', Key::Z => 'z',
Key::V => 'v', Key::Key0 => '0',
Key::W => 'w', Key::Key1 => '1',
Key::X => 'x', Key::Key2 => '2',
Key::Y => 'y', Key::Key3 => '3',
Key::Z => 'z', Key::Key4 => '4',
Key::Key0 => '0', Key::Key5 => '5',
Key::Key1 => '1', Key::Key6 => '6',
Key::Key2 => '2', Key::Key7 => '7',
Key::Key3 => '3', Key::Key8 => '8',
Key::Key4 => '4', Key::Key9 => '9',
Key::Key5 => '5', Key::Left => '←',
Key::Key6 => '6', Key::Right => '→',
Key::Key7 => '7', Key::Up => '↑',
Key::Key8 => '8', Key::Down => '↓',
Key::Key9 => '9', Key::Home => '∴',
Key::Left => '←', Key::Backspace => 0x8_u8.into(),
Key::Right => '→', Key::Delete => 0x8_u8.into(),
Key::Up => '↑', Key::Enter => 0xd_u8.into(),
Key::Down => '↓', Key::Space => ' ',
Key::Home => '∴', Key::Comma => ',',
Key::Backspace => 0x8_u8.into(), Key::Period => '.',
Key::Delete => 0x8_u8.into(), Key::F1 => 0x11_u8.into(),
Key::Enter => 0xd_u8.into(), Key::F2 => 0x12_u8.into(),
Key::Space => ' ', Key::F3 => 0x13_u8.into(),
Key::Comma => ',', Key::F4 => 0x14_u8.into(),
Key::Period => '.', Key::F5 => '😃',
Key::F1 => 0x11_u8.into(), Key::F6 => '福',
Key::F2 => 0x12_u8.into(), _ => '\u{0000}',
Key::F3 => 0x13_u8.into(), }
Key::F4 => 0x14_u8.into(), } else {
Key::F5 => '😃', match k {
Key::F6 => '福', Key::A => 'A',
_ => '\u{0000}', Key::B => 'B',
} Key::C => 'C',
} else { Key::D => 'D',
match k { Key::E => 'E',
Key::A => 'A', Key::F => 'F',
Key::B => 'B', Key::G => 'G',
Key::C => 'C', Key::H => 'H',
Key::D => 'D', Key::I => 'I',
Key::E => 'E', Key::J => 'J',
Key::F => 'F', Key::K => 'K',
Key::G => 'G', Key::L => 'L',
Key::H => 'H', Key::M => 'M',
Key::I => 'I', Key::N => 'N',
Key::J => 'J', Key::O => 'O',
Key::K => 'K', Key::P => 'P',
Key::L => 'L', Key::Q => 'Q',
Key::M => 'M', Key::R => 'R',
Key::N => 'N', Key::S => 'S',
Key::O => 'O', Key::T => 'T',
Key::P => 'P', Key::U => 'U',
Key::Q => 'Q', Key::V => 'V',
Key::R => 'R', Key::W => 'W',
Key::S => 'S', Key::X => 'X',
Key::T => 'T', Key::Y => 'Y',
Key::U => 'U', Key::Z => 'Z',
Key::V => 'V', Key::Key0 => ')',
Key::W => 'W', Key::Key1 => '!',
Key::X => 'X', Key::Key2 => '@',
Key::Y => 'Y', Key::Key3 => '#',
Key::Z => 'Z', Key::Key4 => '$',
Key::Key0 => ')', Key::Key5 => '%',
Key::Key1 => '!', Key::Key6 => '^',
Key::Key2 => '@', Key::Key7 => '&',
Key::Key3 => '#', Key::Key8 => '*',
Key::Key4 => '$', Key::Key9 => '(',
Key::Key5 => '%', Key::Left => '←',
Key::Key6 => '^', Key::Right => '→',
Key::Key7 => '&', Key::Up => '↑',
Key::Key8 => '*', Key::Down => '↓',
Key::Key9 => '(', Key::Home => '∴',
Key::Left => '←', Key::Backspace => 0x8_u8.into(),
Key::Right => '→', Key::Delete => 0x8_u8.into(),
Key::Up => '↑', Key::Space => ' ',
Key::Down => '↓', Key::Comma => '<',
Key::Home => '∴', Key::Period => '>',
Key::Backspace => 0x8_u8.into(), _ => '\u{0000}',
Key::Delete => 0x8_u8.into(), }
Key::Space => ' ', };
Key::Comma => '<',
Key::Period => '>',
_ => '\u{0000}',
}
};
base base
} }
} }
impl minifb::InputCallback for XousKeyboardHandler {
fn add_char(&mut self, _uni_char: u32) {}
fn set_key_state(&mut self, key: minifb::Key, state: bool) {
if key == Key::LeftShift {
self.left_shift = state;
return;
}
if key == Key::RightShift {
self.right_shift = state;
return;
}
if !state {
return;
}
log::info!("GFX|hosted: sending key {:?}", key);
let c = self.decode_key(key);
if c != '\u{0000}' {
xous::send_message(
self.kbd_conn,
keyboard::api::Opcode::HostModeInjectKey(c).into(),
)
.map(|_| ())
.unwrap();
}
}
}