mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
insertion/deletion of text with back/forward buttons working now
This commit is contained in:
parent
49d6018e5e
commit
f495b40fd8
5 changed files with 94 additions and 31 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -121,7 +121,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "blitstr"
|
name = "blitstr"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
source = "git+https://github.com/betrusted-io/blitstr.git?rev=c225b2cfd9837662cdb50d0e1796ef1ec053079d#c225b2cfd9837662cdb50d0e1796ef1ec053079d"
|
source = "git+https://github.com/betrusted-io/blitstr.git?rev=a99c9ca8a820a3e152c6bdab3bd71d2b219b1505#a99c9ca8a820a3e152c6bdab3bd71d2b219b1505"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"rkyv",
|
"rkyv",
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ edition = "2018"
|
||||||
description = "blitstr import package"
|
description = "blitstr import package"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "c225b2cfd9837662cdb50d0e1796ef1ec053079d" }
|
blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "a99c9ca8a820a3e152c6bdab3bd71d2b219b1505" }
|
||||||
#blitstr = { path = "../../../blitstr" }
|
#blitstr = { path = "../../../blitstr" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@ pub struct TextView {
|
||||||
pub style: GlyphStyle,
|
pub style: GlyphStyle,
|
||||||
pub text: xous::String::<3072>,
|
pub text: xous::String::<3072>,
|
||||||
pub cursor: Cursor,
|
pub cursor: Cursor,
|
||||||
|
pub insertion: Option<u32>, // this is the insertion point offset, if it's to be drawn, on the string
|
||||||
|
|
||||||
pub draw_border: bool,
|
pub draw_border: bool,
|
||||||
pub clear_area: bool, // you almost always want this to be true
|
pub clear_area: bool, // you almost always want this to be true
|
||||||
|
|
@ -94,6 +95,7 @@ impl TextView {
|
||||||
style: GlyphStyle::Regular,
|
style: GlyphStyle::Regular,
|
||||||
text: xous::String::<3072>::new(),
|
text: xous::String::<3072>::new(),
|
||||||
cursor: Cursor::new(0,0,0),
|
cursor: Cursor::new(0,0,0),
|
||||||
|
insertion: None,
|
||||||
draw_border: true,
|
draw_border: true,
|
||||||
border_width: 1,
|
border_width: 1,
|
||||||
rounded_border: None,
|
rounded_border: None,
|
||||||
|
|
@ -136,6 +138,7 @@ impl TextView {
|
||||||
self.overflow = t.overflow;
|
self.overflow = t.overflow;
|
||||||
self.clip_rect = t.clip_rect;
|
self.clip_rect = t.clip_rect;
|
||||||
self.dry_run = t.dry_run;
|
self.dry_run = t.dry_run;
|
||||||
|
self.insertion = t.insertion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,7 @@ fn xmain() -> ! {
|
||||||
current_glyph.into(),
|
current_glyph.into(),
|
||||||
s.as_str().unwrap(),
|
s.as_str().unwrap(),
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
blitstr::xor_char
|
blitstr::xor_char
|
||||||
);
|
);
|
||||||
//info!("GFX: string painted");
|
//info!("GFX: string painted");
|
||||||
|
|
@ -128,6 +129,7 @@ fn xmain() -> ! {
|
||||||
current_glyph.into(),
|
current_glyph.into(),
|
||||||
s.as_str().unwrap(),
|
s.as_str().unwrap(),
|
||||||
true,
|
true,
|
||||||
|
None,
|
||||||
blitstr::xor_char
|
blitstr::xor_char
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
@ -243,6 +245,7 @@ fn xmain() -> ! {
|
||||||
tv.style.into(),
|
tv.style.into(),
|
||||||
tv.text.as_str().unwrap(),
|
tv.text.as_str().unwrap(),
|
||||||
false,
|
false,
|
||||||
|
tv.insertion,
|
||||||
paintfn
|
paintfn
|
||||||
);
|
);
|
||||||
// translate the cursor return value back to canvas coordinates
|
// translate the cursor return value back to canvas coordinates
|
||||||
|
|
|
||||||
|
|
@ -37,12 +37,10 @@ struct InputTracker {
|
||||||
|
|
||||||
/// track the progress of our input line
|
/// track the progress of our input line
|
||||||
line: xous::String::<4096>,
|
line: xous::String::<4096>,
|
||||||
/// we need to track character locations so we can draw a cursor, resize text boxes, etc.
|
|
||||||
char_locs: [Point; 4096],
|
|
||||||
/// length of the line in *characters*, not bytes (which is what .len() returns), used to index char_locs
|
/// length of the line in *characters*, not bytes (which is what .len() returns), used to index char_locs
|
||||||
characters: usize,
|
characters: usize,
|
||||||
/// the last computed line height, to help with drawing the insertion points
|
/// the insertion point, 0 is inserting characters before the first, 1 inserts characters after the first, etc.
|
||||||
line_height: u32,
|
insertion: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl InputTracker {
|
impl InputTracker {
|
||||||
|
|
@ -54,9 +52,8 @@ impl InputTracker {
|
||||||
predictor: None,
|
predictor: None,
|
||||||
pred_triggers: None,
|
pred_triggers: None,
|
||||||
line: xous::String::<4096>::new(),
|
line: xous::String::<4096>::new(),
|
||||||
char_locs: [Point::default(); 4096],
|
|
||||||
characters: 0,
|
characters: 0,
|
||||||
line_height: 0,
|
insertion: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn set_predictor(&mut self, predictor: PredictionPlugin) {
|
pub fn set_predictor(&mut self, predictor: PredictionPlugin) {
|
||||||
|
|
@ -151,18 +148,55 @@ impl InputTracker {
|
||||||
input_tv.border_width = 1;
|
input_tv.border_width = 1;
|
||||||
input_tv.clear_area = true; // need this so that the insertion point is cleared and moved
|
input_tv.clear_area = true; // need this so that the insertion point is cleared and moved
|
||||||
|
|
||||||
|
let mut do_redraw = false;
|
||||||
for &k in newkeys.iter() {
|
for &k in newkeys.iter() {
|
||||||
if debug1{info!("IMEF: got key '{}'", k);}
|
if debug1{info!("IMEF: got key '{}'", k);}
|
||||||
match k {
|
match k {
|
||||||
'\u{0000}' => (),
|
'\u{0000}' => (),
|
||||||
|
'←' => { // move insertion point back
|
||||||
|
if self.insertion > 0 {
|
||||||
|
info!("IMEF: moving insertion point back");
|
||||||
|
self.insertion -= 1;
|
||||||
|
}
|
||||||
|
do_redraw = true;
|
||||||
|
}
|
||||||
|
'→' => {
|
||||||
|
if self.insertion < self.characters {
|
||||||
|
self.insertion += 1;
|
||||||
|
}
|
||||||
|
do_redraw = true;
|
||||||
|
}
|
||||||
'\u{0008}' => { // backspace
|
'\u{0008}' => { // backspace
|
||||||
if self.characters > 0 {
|
if (self.characters > 0) && (self.insertion == self.characters) {
|
||||||
self.char_locs[self.characters] = Point::default();
|
|
||||||
self.line.pop();
|
self.line.pop();
|
||||||
self.characters -= 1;
|
self.characters -= 1;
|
||||||
// now re-write our string to get rid of the old character
|
self.insertion -= 1;
|
||||||
write!(input_tv.text, "{}", self.line.as_str().expect("IMEF: couldn't convert str")).expect("IMEF: couldn't update TextView string in input canvas");
|
do_redraw = true;
|
||||||
gam::post_textview(self.gam_conn, &mut input_tv).expect("IMEF: can't draw input TextView");
|
} else if (self.characters > 0) && (self.insertion > 0) {
|
||||||
|
// awful O(N) algo because we have to decode variable-length utf8 strings to figure out character boundaries
|
||||||
|
// first, make a copy of the string
|
||||||
|
let tempbytes: [u8; 4096] = self.line.as_bytes();
|
||||||
|
let tempstr = unsafe { core::str::from_utf8_unchecked(&tempbytes[0..self.line.len()]) }.clone();
|
||||||
|
// clear the string
|
||||||
|
self.line.clear();
|
||||||
|
|
||||||
|
// delete the character in the array
|
||||||
|
let mut i = 0;
|
||||||
|
for c in tempstr.chars() {
|
||||||
|
if debug1{info!("checking index {}", i);}
|
||||||
|
if i == self.insertion - 1 {
|
||||||
|
if debug1{info!("skipping char");}
|
||||||
|
} else {
|
||||||
|
if debug1{info!("copying char {}", c);}
|
||||||
|
self.line.push(c).expect("IMEF: ran out of space inserting orignial characters into input line")
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
self.insertion -= 1;
|
||||||
|
self.characters -= 1;
|
||||||
|
do_redraw = true;
|
||||||
|
} else {
|
||||||
|
// ignore, we are either at the front of the string, or the string had no characters
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'\u{000d}' => { // carriage return
|
'\u{000d}' => { // carriage return
|
||||||
|
|
@ -172,31 +206,54 @@ impl InputTracker {
|
||||||
if debug1{info!("IMEF: got carriage return");}
|
if debug1{info!("IMEF: got carriage return");}
|
||||||
self.line.clear();
|
self.line.clear();
|
||||||
// clear all the temporary variables
|
// clear all the temporary variables
|
||||||
self.line_height = 0;
|
self.characters = 0;
|
||||||
self.char_locs = [Point::default(); 4096];
|
self.insertion = 0;
|
||||||
self.clear_area().expect("IMEF: can't clear on carriage return");
|
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");
|
if self.insertion == self.characters {
|
||||||
self.characters += 1;
|
self.line.push(k).expect("IMEF: ran out of space pushing character into input line");
|
||||||
write!(input_tv.text, "{}", self.line.as_str().expect("IMEF: couldn't convert str")).expect("IMEF: couldn't update TextView string in input canvas");
|
self.characters += 1;
|
||||||
gam::post_textview(self.gam_conn, &mut input_tv).expect("IMEF: can't draw input TextView");
|
self.insertion += 1;
|
||||||
if debug1{info!("IMEF: got computed cursor of {:?}", input_tv.cursor);}
|
do_redraw = true;
|
||||||
self.char_locs[self.characters] = Point::new(input_tv.cursor.pt.x as i16, input_tv.cursor.pt.y as i16);
|
} else {
|
||||||
self.line_height = input_tv.cursor.line_height;
|
if debug1{info!("IMEF: handling case of inserting characters. insertion: {}", self.insertion)};
|
||||||
|
// awful O(N) algo because we have to decode variable-length utf8 strings to figure out character boundaries
|
||||||
|
// first, make a copy of the string
|
||||||
|
let tempbytes: [u8; 4096] = self.line.as_bytes();
|
||||||
|
let tempstr = unsafe { core::str::from_utf8_unchecked(&tempbytes[0..self.line.len()]) }.clone();
|
||||||
|
// clear the string
|
||||||
|
self.line.clear();
|
||||||
|
|
||||||
|
// insert the character in the array
|
||||||
|
let mut i = 0;
|
||||||
|
for c in tempstr.chars() {
|
||||||
|
if debug1{info!("checking index {}", i);}
|
||||||
|
if i == self.insertion {
|
||||||
|
if debug1{info!("inserting char {}", k);}
|
||||||
|
self.line.push(k).expect("IMEF: ran out of space inserting new character into input line");
|
||||||
|
self.line.push(c).expect("IMEF: ran out of space inserting orignial characters into input line")
|
||||||
|
} else {
|
||||||
|
if debug1{info!("copying char {}", c);}
|
||||||
|
self.line.push(c).expect("IMEF: ran out of space inserting orignial characters into input line")
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
self.insertion += 1;
|
||||||
|
self.characters += 1;
|
||||||
|
do_redraw = true;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw the insertion point
|
input_tv.insertion = Some(self.insertion as u32);
|
||||||
// do a manual type conversion, because external crate etc. etc.
|
info!("IMEF: insertion point is {}, characters in string {}", self.insertion, self.characters);
|
||||||
let ins_pt: Point = Point::new(self.char_locs[self.characters].x as i16, self.char_locs[self.characters].y as i16);
|
if do_redraw {
|
||||||
|
write!(input_tv.text, "{}", self.line.as_str().expect("IMEF: couldn't convert str")).expect("IMEF: couldn't update TextView string in input canvas");
|
||||||
if debug1{info!("IMEF: drawing insertion point: {:?}, height: {}", ins_pt, self.line_height);}
|
gam::post_textview(self.gam_conn, &mut input_tv).expect("IMEF: can't draw input TextView");
|
||||||
gam::draw_line(self.gam_conn, ic,
|
if debug1{info!("IMEF: got computed cursor of {:?}", input_tv.cursor);}
|
||||||
Line::new(ins_pt,
|
}
|
||||||
ins_pt + Point::new(0, self.line_height as i16 - input_tv.margin.y) ))
|
|
||||||
.expect("IMEF: can't draw insertion point");
|
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
what else do we need:
|
what else do we need:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue