Disconnect from server

Author: dantleech

CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+main
+----
+
+### Improvements
+
+- Show window "titles" at bottom of window
+- Ability to disconnect from the server (via. "d")
+
 0.2.0
 -----
 

src/view/help.rs

@@ -39,6 +39,7 @@ Key mappings (prefix with number to repeat):
 [N]     step over
 [p]     previous (switches to history mode if in current mode)
 [o]     step out
+[d]     disconnect
 [e]     enter an expression
 [j]     scroll down
 [J]     scroll down 10

src/view/layout.rs

@@ -112,7 +112,7 @@ fn status_widget(app: &App) -> Paragraph {
                         app.history.len()
                     ),
                     ListenStatus::Refusing => format!(
-                        "   {} / {} terminated [p] to go back [n] to go forwards [b] to listen",
+                        "   {} / {} disconnected [p] to go back [n] to go forwards [b] to listen",
                         app.history.offset + 1,
                         app.history.len()
                     ),

src/view/session.rs

@@ -36,7 +36,11 @@ impl View for SessionView {
             return delegate_event_to_pane(app, event);
         }
 
-        let multiplier = if KeyModifiers::SHIFT == input_event.modifiers & KeyModifiers::SHIFT { 10 } else { 1 };
+        let multiplier = if KeyModifiers::SHIFT == input_event.modifiers & KeyModifiers::SHIFT {
+            10
+        } else {
+            1
+        };
 
         // handle global session events
         match input_event.code {
@@ -73,22 +77,18 @@ impl View for SessionView {
                     'N' => Some(AppEvent::StepOver),
                     'o' => Some(AppEvent::StepOut),
                     'p' => Some(AppEvent::ChangeSessionViewMode(SessionViewMode::History)),
+                    'd' => Some(AppEvent::Disconnect),
                     _ => None,
                 },
                 _ => None,
             },
             SessionViewMode::History => match input_event.code {
-                KeyCode::Esc => Some(AppEvent::ChangeView(SelectedView::Session)),
+                KeyCode::Esc => escape(app),
                 KeyCode::Char(c) => match c {
                     'n' => Some(AppEvent::HistoryNext),
                     'p' => Some(AppEvent::HistoryPrevious),
-                    'b' => {
-                        if app.listening_status == ListenStatus::Refusing {
-                            Some(AppEvent::Listen)
-                        } else {
-                            Some(AppEvent::ChangeSessionViewMode(SessionViewMode::Current))
-                        }
-                    }
+                    'd' => Some(AppEvent::Disconnect),
+                    'b' => escape(app),
                     _ => None,
                 },
                 _ => None,
@@ -138,6 +138,14 @@ impl View for SessionView {
     }
 }
 
+fn escape(app: &App) -> Option<AppEvent> {
+    if app.listening_status == ListenStatus::Refusing {
+        Some(AppEvent::Listen)
+    } else {
+        Some(AppEvent::ChangeSessionViewMode(SessionViewMode::Current))
+    }
+}
+
 fn split_rows(panes: &Vec<&Pane>, area: Rect) -> Rc<[Rect]> {
     let mut vertical_constraints = Vec::new();