cleanup kbd stub

This commit is contained in:
bunnie 2024-05-28 23:04:01 +08:00
parent 8a58db8936
commit 9a3a525314
3 changed files with 24 additions and 39 deletions

View file

@ -74,9 +74,6 @@ pub(crate) enum KeyboardOpcode {
/// request for ScanCodes
RegisterListener = 2,
/// request for raw keyups/downs
RegisterRawListener = 3,
/// request for updates for *when* keyboard is pressed
RegisterKeyObserver = 12,
@ -115,12 +112,3 @@ impl RowCol {
#[allow(dead_code)]
pub fn new(r: u8, c: u8) -> RowCol { RowCol { r, c } }
}
#[derive(Debug)]
pub struct KeyRawStates {
pub keydowns: Vec<RowCol>,
pub keyups: Vec<RowCol>,
}
impl KeyRawStates {
pub fn new() -> Self { KeyRawStates { keydowns: Vec::with_capacity(16), keyups: Vec::with_capacity(16) } }
}

View file

@ -17,8 +17,6 @@ fn keyboard_service() {
let mut listener_conn: Option<CID> = None;
let mut listener_op: Option<usize> = None;
let mut raw_listener_conn: Option<CID> = None;
let mut raw_listener_op: Option<u32> = None;
let mut observer_conn: Option<CID> = None;
let mut observer_op: Option<usize> = None;
@ -49,21 +47,6 @@ fn keyboard_service() {
}
}
}
Some(KeyboardOpcode::RegisterRawListener) => {
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap();
match xns.request_connection_blocking(kr.server_name.as_str()) {
Ok(cid) => {
raw_listener_conn = Some(cid);
raw_listener_op = Some(kr.listener_op_id as u32);
}
Err(e) => {
log::error!("couldn't connect to listener: {:?}", e);
raw_listener_conn = None;
raw_listener_op = None;
}
}
}
Some(KeyboardOpcode::RegisterKeyObserver) => {
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
let kr = buffer.as_flat::<KeyboardRegistration, _>().unwrap();
@ -143,6 +126,30 @@ fn keyboard_service() {
}
};
if let Some(conn) = listener_conn {
if key != '\u{0000}' {
if key >= '\u{f700}' && key <= '\u{f8ff}' {
log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters
} else {
log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path
xous::try_send_message(
conn,
xous::Message::new_scalar(
listener_op.unwrap(),
key as u32 as usize,
'\u{0000}' as u32 as usize,
'\u{0000}' as u32 as usize,
'\u{0000}' as u32 as usize,
),
)
.unwrap_or_else(|_| {
log::info!("Input overflow, dropping keys!");
xous::Result::Ok
});
}
}
}
if observer_conn.is_some() && observer_op.is_some() {
log::trace!("sending observer key");
xous::try_send_message(

View file

@ -26,16 +26,6 @@ impl Keyboard {
.expect("couldn't register listener");
}
pub fn register_raw_listener(&self, server_name: &str, action_opcode: usize) {
let kr = KeyboardRegistration {
server_name: String::<64>::from_str(server_name),
listener_op_id: action_opcode,
};
let buf = Buffer::into_buf(kr).unwrap();
buf.lend(self.conn, KeyboardOpcode::RegisterRawListener.to_u32().unwrap())
.expect("couldn't register listener");
}
pub fn register_observer(&self, server_name: &str, action_opcode: usize) {
let kr = KeyboardRegistration {
server_name: String::<64>::from_str(server_name),