deal with broken UTF8 even better

now it should self-synchronize properly if there's something really weird happening

also, that code is all refactored into encodings.rs

Force-Push: yes
Change-Id: I8bd9682448fc309b7aa6c0513e9b94cb5a4ace11

1 files changed, 6 insertions, 31 deletions

diff --git a/src/terminal.rs b/src/terminal.rs
index de3ca4f..28e83b3 100644
--- a/src/terminal.rs
+++ b/src/terminal.rs
@@ -5,6 +5,7 @@ use smol::prelude::*;
 use crate::encoding;
 
 use smol::{ unblock, Unblock };
+use smol::io::{ BoxedReader, BoxedWriter };
 use smol::lock::{ OnceCell, RwLock };
 use std::fmt::Display;
 use std::os::fd::AsRawFd;
@@ -12,8 +13,8 @@ use termios::Termios;
 
 
 pub struct Terminal {
-  pub stdin: Unblock<std::io::Stdin>,
-  pub stdout: Unblock<std::io::Stdout>,
+  pub stdin: BoxedReader,
+  pub stdout: BoxedWriter,
   pub initial_termios: OnceCell<Termios>,
   pub width: RwLock<usize>,
   pub height: RwLock<usize>,
@@ -28,8 +29,8 @@ pub enum EscapeType {
 impl Terminal {
   pub async fn new() -> Self {
     Terminal {
-      stdin: Unblock::new(std::io::stdin()),
-      stdout: Unblock::new(std::io::stdout()),
+      stdin: Unblock::new(std::io::stdin()).boxed_reader(),
+      stdout: Unblock::new(std::io::stdout()).boxed_writer(),
       initial_termios: OnceCell::new(),
       width: RwLock::new(80),
       height: RwLock::new(24),
@@ -91,33 +92,7 @@ impl Terminal {
   }
 
   pub async fn read_char(&mut self) -> Result<char> {
-    let mut buf = vec![0; 4];
-
-    loop {
-      self.stdin.read_exact(&mut buf[0 .. 1]).await?;
-
-      match encoding::get_utf8_byte_type(buf[0]) {
-        UTF8ByteType::Single => { },
-        UTF8ByteType::Introducer(2) => {
-          self.stdin.read_exact(&mut buf[1 .. 2]).await?;
-        },
-        UTF8ByteType::Introducer(3) => {
-          self.stdin.read_exact(&mut buf[1 .. 3]).await?;
-        },
-        UTF8ByteType::Introducer(4) => {
-          self.stdin.read_exact(&mut buf[1 .. 4]).await?;
-        },
-
-        /* If it's not the start of a valid character, ignore it. */
-        _ => continue,
-      }
-
-      if let Ok(string) = std::str::from_utf8(&buf)
-         && let Some(c) = string.chars().next()
-      {
-        return Ok(c);
-      }
-    }
+    encoding::read_utf8_char(&mut self.stdin).await
   }
 
   pub async fn do_escape(&mut self, escape_type: EscapeType, code: &str,