map carriage return '\r' to newline '\n', fix backspace bug

goolord · Aug 4, 2020 · bb8add1 · bb8add1
1 parent 2086767
commit bb8add1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -176,26 +176,16 @@ impl App {
 
     pub fn on_key(&mut self, key: KeyCode) {
         match key {
+            KeyCode::Char('\r') => self.put_char('\n'),
             KeyCode::Char(c) => self.put_char(c),
             KeyCode::Enter if !self.data.input.is_empty() => {
                 if let Some(idx) = self.data.channels.state.selected() {
                     self.send_input(idx)
                 }
             }
             KeyCode::Backspace => {
-                if self.data.input_cursor > 0
-                    && self.data.input_cursor < self.data.input.width() + 1
-                {
-                    self.data.input_cursor = self.data.input_cursor.saturating_sub(1);
-                    let idx = self
-                        .data
-                        .input
-                        .chars()
-                        .take(self.data.input_cursor)
-                        .map(|c| c.len_utf8())
-                        .sum();
-                    self.data.input.remove(idx);
-                }
+                self.data.input_cursor = self.data.input_cursor.saturating_sub(1);
+                self.data.input.pop();
             }
             _ => {}
         }

diff --git a/src/ui.rs b/src/ui.rs
@@ -66,7 +66,7 @@ fn draw_chat<B: Backend>(f: &mut Frame<B>, app: &mut App, area: Rect) {
                     lines.push(String::new());
                 }
                 match c {
-                    '\r' => lines.push(String::new()),
+                    '\n' => lines.push(String::new()),
                     _ => lines.last_mut().unwrap().push(c),
                 }
                 lines