From 547dbbfe6b91a3da1eedc40d3928a631e0b8de6d Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 6 Mar 2021 03:26:13 +0800 Subject: [PATCH] fix carriage return emulation and handling --- .../graphics-server/src/backend/minifb.rs | 1 + services/ime-frontend/src/main.rs | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs index 9802efcd1..17bba63d7 100644 --- a/services/graphics-server/src/backend/minifb.rs +++ b/services/graphics-server/src/backend/minifb.rs @@ -163,6 +163,7 @@ impl XousDisplay { Key::Home => '∴', Key::Backspace => 0x8_u8.into(), Key::Delete => 0x8_u8.into(), + Key::Enter => 0xd_u8.into(), Key::Space => ' ', Key::Comma => ',', Key::Period => '.', diff --git a/services/ime-frontend/src/main.rs b/services/ime-frontend/src/main.rs index b1d14b843..5df67c89c 100644 --- a/services/ime-frontend/src/main.rs +++ b/services/ime-frontend/src/main.rs @@ -123,7 +123,7 @@ impl InputTracker { } pub fn update(&mut self, newkeys: [char; 4]) -> Result<(), xous::Error> { - let debug1= false; + let debug1= true; // just draw a rectangle for the prediction area for now if let Some(pc) = self.pred_canvas { if debug1{info!("IMEF: updating prediction area");} @@ -146,15 +146,25 @@ impl InputTracker { TextBounds::BoundingBox(Rectangle::new(Point::new(0,1), ic_bounds))); input_tv.draw_border = false; input_tv.border_width = 1; - input_tv.clear_area = true; + input_tv.clear_area = true; // need this so that the insertion point is cleared and moved for &k in newkeys.iter() { if debug1{info!("IMEF: got key '{}'", k);} match k { '\u{0000}' => (), '\u{000d}' => { + // TODO: send string to registered listeners + // TODO: update the predictor on carriage return + // carriage return case - write!(self.line, "").expect("IMEF: can't clear line after carriage return"); + if debug1{info!("IMEF: got carriage return");} + self.line.clear(); + // clear all the temporary variables + self.insertion.pt.y = 0; + self.insertion.pt.x = 0; + self.insertion.line_height = 0; + self.charwidths = [0; 4096]; + self.clear_area().expect("IMEF: can't clear on carriage return"); }, _ => { self.line.push(k).expect("IMEF: ran out of space pushing character into input line"); @@ -186,8 +196,11 @@ impl InputTracker { } /* what else do we need: - - current string that is being built up - - cursor position in string, so we can do insertion/deletion + - backspace capability + - insertion point movement and character insert + + - height up request of canvas when string wraps + - registration for listening to string results */ Ok(()) }