james
/
bootproof
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bugs in text_display TTY driver regarding newlines.

master
James T. Martin 2020-10-24 14:40:51 -07:00
parent 3f4191b781
commit 78bb8f0fdd
Signed by: james
GPG Key ID: 4B7F3DA9351E577C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/tty/text_display.rs
View File

@ -12,7 +12,7 @@ pub struct TextDisplayTty<'display> {
impl TextDisplayTty<'_> { impl TextDisplayTty<'_> {
pub fn new<'a>(term: &'a mut dyn TextDisplay) -> TextDisplayTty<'a> { pub fn new<'a>(term: &'a mut dyn TextDisplay) -> TextDisplayTty<'a> {
TextDisplayTty { TextDisplayTty {
term: term, term,
history: { history: {
let mut vec = Vec::new(); let mut vec = Vec::new();
vec.push("".to_string()); vec.push("".to_string());
@ -52,7 +52,8 @@ impl Tty for TextDisplayTty<'_> {
let mut chars = line.chars().collect::<Vec<_>>().into_iter(); let mut chars = line.chars().collect::<Vec<_>>().into_iter();
// We iterate over all of the characters in a virtual line // We iterate over all of the characters in a virtual line
// until every character has been added to a physical line. // until every character has been added to a physical line.
while chars.len() > 0 { // It is necessary that we iterate at least once, or empty lines will not be printed.
loop {
let mut physical_line = String::new(); let mut physical_line = String::new();
// The width of a physical line may be no more than the width of the frame. // The width of a physical line may be no more than the width of the frame.
let width = chars.len().min(self.term.borrow_frame().width()); let width = chars.len().min(self.term.borrow_frame().width());
@ -60,12 +61,16 @@ impl Tty for TextDisplayTty<'_> {
physical_line.push(chars.next().unwrap()); physical_line.push(chars.next().unwrap());
} }
physical_lines.push(physical_line); physical_lines.push(physical_line);
if chars.len() == 0 {
break;
}
} }
} }
// This is how many lines on the display we'll need for all of our physical lines. // This is how many lines on the display we'll need for all of our physical lines.
// We cannot have more lines than allowed by the display. // We cannot have more lines than allowed by the display.
let mut y = physical_lines.len().min(self.term.borrow_frame().height() - 1); let mut y = physical_lines.len().min(self.term.borrow_frame().height()) - 1;
let frame = self.term.borrow_mut_frame(); let frame = self.term.borrow_mut_frame();
// We start from the lowest line and display each line until we reach the top of the screen. // We start from the lowest line and display each line until we reach the top of the screen.
// We cannot run out of physical lines because the lowest line // We cannot run out of physical lines because the lowest line