mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
gam forward ALL rawkeys to the current context even when IMEF active
Forwarding of rawkeys to upper layers is important to enable apps to layer additional functionality on top of base.
This commit is contained in:
parent
c7c0041922
commit
ce8c7f51c3
1 changed files with 15 additions and 15 deletions
|
|
@ -161,7 +161,7 @@ impl ContextManager {
|
|||
gotinput_id: registration.gotinput_id,
|
||||
audioframe_id: registration.audioframe_id,
|
||||
focuschange_id: registration.focuschange_id,
|
||||
rawkeys_id: None,
|
||||
rawkeys_id: registration.rawkeys_id,
|
||||
vibe: false,
|
||||
imef_menu_mode: false,
|
||||
// this gets initialized on the first attempt to change predictors, not here
|
||||
|
|
@ -631,21 +631,21 @@ impl ContextManager {
|
|||
if self.imef_active {
|
||||
// use the IMEF
|
||||
self.imef.send_keyevent(keys).expect("couldn't send keys to the IMEF");
|
||||
} else {
|
||||
// forward the keyboard hits without any IME to the current context
|
||||
log::debug!("forwarding raw key event");
|
||||
if let Some(context) = self.focused_context() {
|
||||
if let Some(rawkeys_id) = context.rawkeys_id {
|
||||
xous::send_message(context.listener,
|
||||
xous::Message::new_scalar(rawkeys_id as usize,
|
||||
keys[0] as u32 as usize,
|
||||
keys[1] as u32 as usize,
|
||||
keys[2] as u32 as usize,
|
||||
keys[3] as u32 as usize,
|
||||
)).expect("couldn't forward raw keys onto context listener");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// forward the keyboard hits to the current context
|
||||
log::debug!("forwarding raw key event");
|
||||
if let Some(context) = self.focused_context() {
|
||||
if let Some(rawkeys_id) = context.rawkeys_id {
|
||||
xous::send_message(context.listener,
|
||||
xous::Message::new_scalar(rawkeys_id as usize,
|
||||
keys[0] as u32 as usize,
|
||||
keys[1] as u32 as usize,
|
||||
keys[2] as u32 as usize,
|
||||
keys[3] as u32 as usize,
|
||||
)).expect("couldn't forward raw keys onto context listener");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn focused_context(&'_ self) -> Option<&'_ UxContext> {
|
||||
|
|
|
|||
Loading…
Reference in a new issue