ctrl+c clears error

src/gopher.rs

@@ -5,7 +5,7 @@ use std::net::TcpStream;
 use std::net::ToSocketAddrs;
 use std::time::Duration;
 
-pub const TCP_TIMEOUT_IN_SECS: u64 = 8;
+pub const TCP_TIMEOUT_IN_SECS: u64 = 1;
 pub const TCP_TIMEOUT_DURATION: Duration = Duration::from_secs(TCP_TIMEOUT_IN_SECS);
 
 #[derive(Copy, Clone, PartialEq, Debug)]

src/menu.rs

@@ -414,7 +414,7 @@ impl Menu {
                     self.input.clear();
                     self.redraw_input()
                 } else {
-                    Action::None
+                    Action::Keypress(key)
                 }
             }
             Key::Ctrl('c') => {
@@ -422,7 +422,7 @@ impl Menu {
                     self.input.clear();
                     self.redraw_input()
                 } else {
-                    Action::Quit
+                    Action::Keypress(key)
                 }
             }
             Key::Char('-') => {

src/ui.rs

@@ -34,7 +34,7 @@ pub struct UI {
     dirty: bool,              // redraw?
     running: bool,            // main ui loop running?
     pub size: (usize, usize), // cols, rows
-    error: String,            // error string, if any
+    status: String,           // status message, if any
 }
 
 impl UI {
@@ -49,7 +49,7 @@ impl UI {
             dirty: true,
             running: true,
             size,
-            error: String::new(),
+            status: String::new(),
         }
     }
 
@@ -62,29 +62,30 @@ impl UI {
         self.shutdown();
     }
 
+    fn render_status(&self) -> Option<String> {
+        if self.status.is_empty() {
+            None
+        } else {
+            Some(format!(
+                "{}{}{}{}{}",
+                color::Fg(color::LightRed),
+                termion::cursor::Goto(1, self.rows()),
+                termion::clear::CurrentLine,
+                self.status,
+                color::Fg(color::Reset)
+            ))
+        }
+    }
+
     pub fn draw(&mut self) {
         if self.dirty {
-            let error = if self.error.is_empty() {
-                "".into()
-            } else {
-                let e = format!(
-                    "{}{}{}{}{}",
-                    color::Fg(color::LightRed),
-                    termion::cursor::Goto(1, self.rows()),
-                    termion::clear::CurrentLine,
-                    self.error,
-                    color::Fg(color::Reset)
-                );
-                self.error.clear();
-                e
-            };
             print!(
                 "{}{}{}{}{}",
                 termion::clear::All,
                 termion::cursor::Goto(1, 1),
                 termion::cursor::Hide,
                 self.render(),
-                error
+                self.render_status().unwrap_or("".into()),
             );
 
             self.dirty = false;
@@ -97,11 +98,13 @@ impl UI {
 
         let action = self.process_page_input();
         if let Err(e) = self.process_action(action) {
-            self.error = e.to_string();
+            self.status = format!("{}{}", color::Fg(color::LightRed), e);
         }
     }
 
     pub fn open(&mut self, url: &str) -> io::Result<()> {
+        self.status.clear();
+
         // no open loops
         if let Some(page) = self.views.get(self.focused) {
             if &page.url() == url {
@@ -299,9 +302,16 @@ impl UI {
 
     fn process_action(&mut self, action: Action) -> io::Result<()> {
         match action {
-            Action::Quit | Action::Keypress(Key::Ctrl('q')) | Action::Keypress(Key::Ctrl('c')) => {
-                self.running = false
+            Action::Keypress(Key::Esc) => self.status.clear(),
+            Action::Keypress(Key::Ctrl('c')) => {
+                if self.status.is_empty() {
+                    self.running = false
+                } else {
+                    self.dirty = true;
+                    self.status.clear();
+                }
             }
+            Action::Keypress(Key::Ctrl('q')) => self.running = false,
             Action::Error(e) => return Err(io_error(e)),
             Action::Redraw => self.dirty = true,
             Action::Open(url) => self.open(&url)?,

src/ui/action.rs

@@ -6,6 +6,5 @@ pub enum Action {
     Open(String),  // open url
     Keypress(Key), // unknown keypress
     Redraw,        // redraw everything
-    Quit,          // yup
     Error(String), // error message
 }