mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
add input listeners to get input lines.
next up: shellchat
This commit is contained in:
parent
3cec151ffd
commit
d54b815653
5 changed files with 42 additions and 10 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -553,6 +553,7 @@ dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"rkyv",
|
"rkyv",
|
||||||
"xous",
|
"xous",
|
||||||
|
"xous-names",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ pub fn status_thread(canvas_gid: [u32; 4]) {
|
||||||
}
|
}
|
||||||
stats_phase = (stats_phase + 1) % 8;
|
stats_phase = (stats_phase + 1) % 8;
|
||||||
gam::post_textview(gam_conn, &mut battstats_tv).expect("GAM|status: can't draw battery stats");
|
gam::post_textview(gam_conn, &mut battstats_tv).expect("GAM|status: can't draw battery stats");
|
||||||
gam::redraw(gam_conn);
|
gam::redraw(gam_conn).expect("GAM|status: couldn't redraw");
|
||||||
},
|
},
|
||||||
_ => error!("GAM|status received COM event opcode that wasn't expected"),
|
_ => error!("GAM|status received COM event opcode that wasn't expected"),
|
||||||
}
|
}
|
||||||
|
|
@ -99,7 +99,7 @@ pub fn status_thread(canvas_gid: [u32; 4]) {
|
||||||
(elapsed_time / 3_600_000), (elapsed_time / 60_000) % 60, now_seconds).expect("GAM|status: can't write string");
|
(elapsed_time / 3_600_000), (elapsed_time / 60_000) % 60, now_seconds).expect("GAM|status: can't write string");
|
||||||
if debug1{info!("GAM|status: requesting draw of '{}'", uptime_tv);}
|
if debug1{info!("GAM|status: requesting draw of '{}'", uptime_tv);}
|
||||||
gam::post_textview(gam_conn, &mut uptime_tv).expect("GAM|status: can't draw uptime");
|
gam::post_textview(gam_conn, &mut uptime_tv).expect("GAM|status: can't draw uptime");
|
||||||
gam::redraw(gam_conn);
|
gam::redraw(gam_conn).expect("GAM|status: couldn't redraw");
|
||||||
}
|
}
|
||||||
|
|
||||||
if elapsed_time - last_time > 500 {
|
if elapsed_time - last_time > 500 {
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@ use ime_plugin_api::{PredictionTriggers, PredictionPlugin, PredictionApi};
|
||||||
use rkyv::Unarchive;
|
use rkyv::Unarchive;
|
||||||
use rkyv::archived_value;
|
use rkyv::archived_value;
|
||||||
|
|
||||||
|
use heapless::Vec;
|
||||||
|
use heapless::consts::*;
|
||||||
|
|
||||||
/// max number of prediction options to track/render
|
/// max number of prediction options to track/render
|
||||||
const MAX_PREDICTION_OPTIONS: usize = 4;
|
const MAX_PREDICTION_OPTIONS: usize = 4;
|
||||||
|
|
||||||
|
|
@ -209,9 +212,10 @@ impl InputTracker {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(&mut self, newkeys: [char; 4]) -> Result<(), xous::Error> {
|
pub fn update(&mut self, newkeys: [char; 4]) -> Result<Option<xous::String::<4000>>, xous::Error> {
|
||||||
let debug1= false;
|
let debug1= false;
|
||||||
let mut update_predictor = false;
|
let mut update_predictor = false;
|
||||||
|
let mut retstring: Option<xous::String::<4000>> = None;
|
||||||
if let Some(ic) = self.input_canvas {
|
if let Some(ic) = self.input_canvas {
|
||||||
if debug1{info!("IMEF: updating input area");}
|
if debug1{info!("IMEF: updating input area");}
|
||||||
let ic_bounds: Point = gam::get_canvas_bounds(self.gam_conn, ic).expect("IMEF: Couldn't get input canvas bounds");
|
let ic_bounds: Point = gam::get_canvas_bounds(self.gam_conn, ic).expect("IMEF: Couldn't get input canvas bounds");
|
||||||
|
|
@ -332,7 +336,10 @@ impl InputTracker {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'\u{000d}' => { // carriage return
|
'\u{000d}' => { // carriage return
|
||||||
// TODO: send string to registered listeners
|
let mut ret = xous::String::<4000>::new();
|
||||||
|
write!(ret, "{}", self.line.as_str().expect("IMEF: couldn't convert input line")).expect("IMEF: couldn't copy input ilne to output");
|
||||||
|
retstring = Some(ret);
|
||||||
|
|
||||||
if let Some(trigger) = self.pred_triggers {
|
if let Some(trigger) = self.pred_triggers {
|
||||||
if trigger.newline {
|
if trigger.newline {
|
||||||
self.predictor.unwrap().feedback_picked(self.line).expect("IMEF: couldn't send feedback to predictor");
|
self.predictor.unwrap().feedback_picked(self.line).expect("IMEF: couldn't send feedback to predictor");
|
||||||
|
|
@ -479,10 +486,7 @@ impl InputTracker {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
what else do we need:
|
|
||||||
- registration for listening to string results
|
|
||||||
*/
|
|
||||||
// prediction area is drawn second because the area could be cleared on behalf of a resize of the text box
|
// prediction area is drawn second because the area could be cleared on behalf of a resize of the text box
|
||||||
// just draw a rectangle for the prediction area for now
|
// just draw a rectangle for the prediction area for now
|
||||||
if let Some(pc) = self.pred_canvas {
|
if let Some(pc) = self.pred_canvas {
|
||||||
|
|
@ -558,7 +562,7 @@ impl InputTracker {
|
||||||
|
|
||||||
gam::redraw(self.gam_conn).expect("IMEF: couldn't redraw screen");
|
gam::redraw(self.gam_conn).expect("IMEF: couldn't redraw screen");
|
||||||
|
|
||||||
Ok(())
|
Ok(retstring)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -577,6 +581,9 @@ fn xmain() -> ! {
|
||||||
let mut tracker = InputTracker::new(
|
let mut tracker = InputTracker::new(
|
||||||
xous_names::request_connection_blocking(xous::names::SERVER_NAME_GAM).expect("IMEF: can't connect to GAM"),
|
xous_names::request_connection_blocking(xous::names::SERVER_NAME_GAM).expect("IMEF: can't connect to GAM"),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let mut listeners: Vec<xous::CID, U32> = Vec::new();
|
||||||
|
|
||||||
// The main lop can't start until we've been assigned Gids from the GAM, and a Predictor.
|
// The main lop can't start until we've been assigned Gids from the GAM, and a Predictor.
|
||||||
info!("IMEF: waiting for my canvas Gids");
|
info!("IMEF: waiting for my canvas Gids");
|
||||||
loop {
|
loop {
|
||||||
|
|
@ -607,6 +614,11 @@ fn xmain() -> ! {
|
||||||
_ => error!("IMEF: can't find predictive engine {}, retaining existing one.", s.as_str().expect("IMEF: SetPrediction received malformed server name")),
|
_ => error!("IMEF: can't find predictive engine {}, retaining existing one.", s.as_str().expect("IMEF: SetPrediction received malformed server name")),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
rkyv::Archived::<ImefOpcode>::RegisterListener(registration) => {
|
||||||
|
// note second copy down below, this is put in early-init because we're likely to get these requests early on
|
||||||
|
let cid = xous_names::request_connection_blocking(registration.as_str()).expect("IMEF: can't connect to requested listener for reporting events");
|
||||||
|
listeners.push(cid).expect("IMEF: probably ran out of slots for input event reporting");
|
||||||
|
},
|
||||||
_ => panic!("IME_SH: invalid response from server -- corruption occurred in MemoryMessage")
|
_ => panic!("IME_SH: invalid response from server -- corruption occurred in MemoryMessage")
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -654,12 +666,24 @@ fn xmain() -> ! {
|
||||||
_ => error!("IMEF: can't find predictive engine {}, retaining existing one.", s.as_str().expect("IMEF: SetPrediction received malformed server name")),
|
_ => error!("IMEF: can't find predictive engine {}, retaining existing one.", s.as_str().expect("IMEF: SetPrediction received malformed server name")),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
rkyv::Archived::<ImefOpcode>::RegisterListener(registration) => {
|
||||||
|
let cid = xous_names::request_connection_blocking(registration.as_str()).expect("IMEF: can't connect to requested listener for reporting events");
|
||||||
|
listeners.push(cid).expect("IMEF: probably ran out of slots for input event reporting");
|
||||||
|
},
|
||||||
_ => panic!("IME_SH: invalid response from server -- corruption occurred in MemoryMessage")
|
_ => panic!("IME_SH: invalid response from server -- corruption occurred in MemoryMessage")
|
||||||
};
|
};
|
||||||
} else if let Ok(opcode) = keyboard::api::Opcode::try_from(&envelope.body) {
|
} else if let Ok(opcode) = keyboard::api::Opcode::try_from(&envelope.body) {
|
||||||
match opcode {
|
match opcode {
|
||||||
keyboard::api::Opcode::KeyboardEvent(keys) => {
|
keyboard::api::Opcode::KeyboardEvent(keys) => {
|
||||||
tracker.update(keys).expect("IMEF: couldn't update input tracker with latest key presses");
|
if let Some(line) = tracker.update(keys).expect("IMEF: couldn't update input tracker with latest key presses") {
|
||||||
|
for &conn in listeners.iter() {
|
||||||
|
use rkyv::Write;
|
||||||
|
let mut writer = rkyv::ArchiveBuffer::new(xous::XousBuffer::new(4096));
|
||||||
|
let pos = writer.archive(&line).expect("IMEF: couldn't archive line for sending");
|
||||||
|
let xous_buffer = writer.into_inner();
|
||||||
|
xous_buffer.send(conn, pos as u32).expect("IMEF: couldn't send input line to listener");
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
_ => error!("IMEF: received KBD event opcode that wasn't expected"),
|
_ => error!("IMEF: received KBD event opcode that wasn't expected"),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,5 +9,6 @@ description = "IME Plugin Common APIs"
|
||||||
xous = { path = "../../xous-rs" }
|
xous = { path = "../../xous-rs" }
|
||||||
rkyv = { version = "0.3.1", default_features = false }
|
rkyv = { version = "0.3.1", default_features = false }
|
||||||
graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API
|
graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API
|
||||||
|
xous-names = {path="../xous-names"} # used by the IMEF for registering listeners
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -230,6 +230,12 @@ pub enum ImefOpcode {
|
||||||
|
|
||||||
/// set prediction server. Must be a String of the name of a server that is loaded in the system.
|
/// set prediction server. Must be a String of the name of a server that is loaded in the system.
|
||||||
SetPredictionServer(xous::String<256>),
|
SetPredictionServer(xous::String<256>),
|
||||||
|
|
||||||
|
/// register a listener for finalized inputs
|
||||||
|
RegisterListener(xous_names::api::XousServerName),
|
||||||
|
|
||||||
|
/// this is the event opcode used by listeners
|
||||||
|
GotInputLine(xous::String<4000>),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl core::convert::TryFrom<& Message> for ImefOpcode {
|
impl core::convert::TryFrom<& Message> for ImefOpcode {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue