some ui tweaks

README.md

@@ -52,7 +52,7 @@ Just unzip/untar the `phetch` program into your $PATH and get going!
 
 ## todo
 
-- [ ] telnet
+- [ ] telnet: gopher://bitreich.org/1/lawn/bbs
 - [ ] flesh out help
 - [ ] new screenshots
 - [ ] little GIF screencast in README
@@ -60,7 +60,6 @@ Just unzip/untar the `phetch` program into your $PATH and get going!
 ## bugs
 
 - [ ] `open` silently fails on `irc://` links & friends
-- [ ] Long lines on gopher lawn shouldn't be truncated
 - [ ] gopher://1436.ninja/1/twit.cgi ("iWritten and performed by Nathaniel" weirdness)
 
 ## future features

src/help.rs

@@ -35,9 +35,8 @@ i
 i            ~ * ~
 i
 1phetch help        \x1b[90mctrl+h	/	help
-1show history       \x1b[90mctrl+e	/history	help
+1show history       \x1b[90mctrl+a	/history	help
 1show bookmarks     \x1b[90mctrl+b	/bookmarks	help
-hphetch homepage	URL:https://github.com/dvkt/phetch
 i
 ";
 

src/ui.rs

@@ -25,7 +25,7 @@ pub type Key = termion::event::Key;
 pub type Page = Box<dyn View>;
 
 pub const SCROLL_LINES: usize = 15;
-pub const MAX_COLS: usize = 80;
+pub const MAX_COLS: usize = 77;
 
 pub struct UI {
     views: Vec<Page>,         // loaded views
@@ -38,16 +38,12 @@ pub struct UI {
 
 impl UI {
     pub fn new() -> UI {
-        let mut size = (0, 0);
-        if let Ok((cols, rows)) = terminal_size() {
-            size = (cols as usize, rows as usize);
-        }
         UI {
             views: vec![],
             focused: 0,
             dirty: true,
             running: true,
-            size,
+            size: (0, 0),
             status: String::new(),
         }
     }
@@ -61,25 +57,6 @@ impl UI {
         self.shutdown();
     }
 
-    fn set_status(&mut self, status: String) {
-        self.status = status;
-        self.dirty = true;
-    }
-
-    fn render_status(&self) -> Option<String> {
-        if self.status.is_empty() {
-            None
-        } else {
-            Some(format!(
-                "{}{}{}{}",
-                termion::cursor::Goto(1, self.rows()),
-                termion::clear::CurrentLine,
-                self.status,
-                color::Fg(color::Reset)
-            ))
-        }
-    }
-
     pub fn draw(&mut self) {
         if self.dirty {
             print!(
@@ -184,6 +161,20 @@ impl UI {
         }
     }
 
+    fn rows(&self) -> u16 {
+        self.size.1 as u16
+    }
+
+    fn startup(&mut self) {}
+
+    fn shutdown(&self) {
+        history::save(&self.views);
+    }
+
+    fn term_size(&mut self, cols: usize, rows: usize) {
+        self.size = (cols, rows);
+    }
+
     // Show a spinner while running a thread. Used to make gopher requests or
     // download files.
     fn spinner<T: Send + 'static, F: 'static + Send + FnOnce() -> T>(
@@ -238,18 +229,23 @@ impl UI {
         }
     }
 
-    fn rows(&self) -> u16 {
-        self.size.1 as u16
-    }
-
-    fn startup(&mut self) {}
-
-    fn shutdown(&self) {
-        history::save(&self.views);
+    fn set_status(&mut self, status: String) {
+        self.status = status;
+        self.dirty = true;
     }
 
-    fn term_size(&mut self, cols: usize, rows: usize) {
-        self.size = (cols, rows);
+    fn render_status(&self) -> Option<String> {
+        if self.status.is_empty() {
+            None
+        } else {
+            Some(format!(
+                "{}{}{}{}",
+                termion::cursor::Goto(1, self.rows()),
+                termion::clear::CurrentLine,
+                self.status,
+                color::Fg(color::Reset)
+            ))
+        }
     }
 
     fn add_page(&mut self, page: Page) {
@@ -329,7 +325,7 @@ impl UI {
                 }
             }
             Action::Keypress(Key::Ctrl('h')) => self.open("gopher://help/")?,
-            Action::Keypress(Key::Ctrl('e')) => self.open("gopher://help/1/history")?,
+            Action::Keypress(Key::Ctrl('a')) => self.open("gopher://help/1/history")?,
             Action::Keypress(Key::Ctrl('u')) => {
                 if let Some(page) = self.views.get(self.focused) {
                     let url = page.url();
@@ -352,6 +348,7 @@ impl UI {
 impl Drop for UI {
     fn drop(&mut self) {
         print!("\x1b[?25h"); // show cursor
+        stdout().flush();
     }
 }