Merge pull request #137 from afonsofrancof/refactor_float

Big refactor. Made floats generic, to show anything

src/float.rs

@@ -1,59 +1,91 @@
-use ratatui::layout::{Constraint, Direction, Layout, Rect};
+use crossterm::event::{KeyCode, KeyEvent};
+use ratatui::{
+    layout::{Constraint, Direction, Layout, Rect},
+    Frame,
+};
 
-/// This function just makes a given area smaller by 20 % in each direction, creating a kind of
+pub trait FloatContent {
-/// "floating window". And you don't actually need all the constraints, and layouts to do that, its
+    fn draw(&mut self, frame: &mut Frame, area: Rect);
-/// very easy to calculate it directly, but I chose to use the ratatui API
+    fn handle_key_event(&mut self, key: &KeyEvent) -> bool;
-pub fn floating_window(size: Rect) -> Rect {
+    fn is_finished(&self) -> bool;
-    // If the terminal window is small enough, just take up all the space for the command
-    if size.width < 85 || size.height < 25 {
-        return size;
-    }
-    let hor_float = Layout::default()
-        .constraints([
-            Constraint::Percentage(20),
-            Constraint::Percentage(60),
-            Constraint::Percentage(20),
-        ])
-        .direction(Direction::Horizontal)
-        .split(size)[1];
-    Layout::default()
-        .constraints([
-            Constraint::Percentage(20),
-            Constraint::Percentage(60),
-            Constraint::Percentage(20),
-        ])
-        .direction(Direction::Vertical)
-        .split(hor_float)[1]
 }
 
-/// Here is how would a purely math based function look like:
+pub struct Float<T: FloatContent> {
-/// But it might break on smaller numbers
+    content: Option<T>,
-fn _unused_manual_floating_window(size: Rect) -> Rect {
+    width_percent: u16,
-    // If the terminal window is small enough, just take up all the space for the command
+    height_percent: u16,
-    if size.width < 85 || size.height < 25 {
-        return size;
-    }
-    let new_width = size.width * 60 / 100;
-    let new_height = size.height * 60 / 100;
-    let new_x = size.x + size.width * 20 / 100;
-    let new_y = size.y + size.height * 20 / 100;
-    Rect {
-        width: new_width,
-        height: new_height,
-        x: new_x,
-        y: new_y,
-    }
 }
 
-#[test]
+impl<T: FloatContent> Float<T> {
-fn test_floating() {
+    pub fn new(width_percent: u16, height_percent: u16) -> Self {
-    let rect = Rect {
+        Self {
-        x: 10,
+            content: None,
-        y: 2,
+            width_percent,
-        width: 100,
+            height_percent,
-        height: 200,
+        }
-    };
+    }
-    let res1 = floating_window(rect);
+
-    let res2 = floating_window(rect);
+    fn floating_window(&self, size: Rect) -> Rect {
-    assert_eq!(res1, res2);
+        let hor_float = Layout::default()
+            .constraints([
+                Constraint::Percentage((100 - self.width_percent) / 2),
+                Constraint::Percentage(self.width_percent),
+                Constraint::Percentage((100 - self.width_percent) / 2),
+            ])
+            .direction(Direction::Horizontal)
+            .split(size)[1];
+
+        Layout::default()
+            .constraints([
+                Constraint::Percentage((100 - self.height_percent) / 2),
+                Constraint::Percentage(self.height_percent),
+                Constraint::Percentage((100 - self.height_percent) / 2),
+            ])
+            .direction(Direction::Vertical)
+            .split(hor_float)[1]
+    }
+
+    pub fn draw(&mut self, frame: &mut Frame, parent_area: Rect) {
+        let popup_area = self.floating_window(parent_area);
+
+        if let Some(content) = &mut self.content {
+            let content_area = Rect {
+                x: popup_area.x,
+                y: popup_area.y,
+                width: popup_area.width,
+                height: popup_area.height,
+            };
+
+            content.draw(frame, content_area);
+        }
+    }
+
+    // Returns true if the key was processed by this Float.
+    pub fn handle_key_event(&mut self, key: &KeyEvent) -> bool {
+        if let Some(content) = &mut self.content {
+            match key.code {
+                KeyCode::Enter | KeyCode::Char('p') | KeyCode::Esc | KeyCode::Char('q') => {
+                    if content.is_finished() {
+                        self.content = None;
+                    } else {
+                        content.handle_key_event(key);
+                    }
+                }
+                _ => {
+                    content.handle_key_event(key);
+                }
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn get_content(&self) -> &Option<T> {
+        &self.content
+    }
+
+    pub fn set_content(&mut self, content: Option<T>) {
+        self.content = content;
+    }
 }

src/floating_text.rs

@@ -0,0 +1,82 @@
+use crate::float::FloatContent;
+use crossterm::event::{KeyCode, KeyEvent};
+use ratatui::{
+    layout::Rect,
+    style::{Style, Stylize},
+    text::Line,
+    widgets::{Block, Borders, List},
+    Frame,
+};
+
+pub struct FloatingText {
+    text: Vec<String>,
+    scroll: usize,
+}
+
+impl FloatingText {
+    pub fn new(text: Vec<String>) -> Self {
+        Self { text, scroll: 0 }
+    }
+
+    fn scroll_down(&mut self) {
+        if self.scroll + 1 < self.text.len() {
+            self.scroll += 1;
+        }
+    }
+
+    fn scroll_up(&mut self) {
+        if self.scroll > 0 {
+            self.scroll -= 1;
+        }
+    }
+}
+
+impl FloatContent for FloatingText {
+    fn draw(&mut self, frame: &mut Frame, area: Rect) {
+        // Define the Block with a border and background color
+        let block = Block::default()
+            .borders(Borders::ALL)
+            .style(Style::default());
+
+        // Draw the Block first
+        frame.render_widget(block.clone(), area);
+
+        // Calculate the inner area to ensure text is not drawn over the border
+        let inner_area = block.inner(area);
+
+        // Create the list of lines to be displayed
+        let lines: Vec<Line> = self
+            .text
+            .iter()
+            .skip(self.scroll)
+            .take(inner_area.height as usize)
+            .map(|line| Line::from(line.as_str()))
+            .collect();
+
+        // Create list widget
+        let list = List::new(lines)
+            .block(Block::default())
+            .highlight_style(Style::default().reversed());
+
+        // Render the list inside the bordered area
+        frame.render_widget(list, inner_area);
+    }
+
+    fn handle_key_event(&mut self, key: &KeyEvent) -> bool {
+        match key.code {
+            KeyCode::Down | KeyCode::Char('j') => {
+                self.scroll_down();
+                true
+            }
+            KeyCode::Up | KeyCode::Char('k') => {
+                self.scroll_up();
+                true
+            }
+            _ => false,
+        }
+    }
+
+    fn is_finished(&self) -> bool {
+        true
+    }
+}

src/list.rs

@@ -1,4 +1,4 @@
-use crate::{float::floating_window, running_command::Command, state::AppState};
+use crate::{float::Float, floating_text::FloatingText, running_command::Command, state::AppState};
 use crossterm::event::{KeyCode, KeyEvent, KeyEventKind};
 use ego_tree::{tree, NodeId};
 use ratatui::{
@@ -26,28 +26,12 @@ pub struct CustomList {
     /// This is the state asociated with the list widget, used to display the selection in the
     /// widget
     list_state: ListState,
-    /// This stores the preview windows state. If it is None, it will not be displayed.
-    /// If it is Some, we show it with the content of the selected item
-    preview_window_state: Option<PreviewWindowState>,
     // This stores the current search query
     filter_query: String,
     // This stores the filtered tree
     filtered_items: Vec<ListNode>,
-}
+    // This is the preview window for the commands
-
+    preview_float: Float<FloatingText>,
-/// This struct stores the preview window state
-struct PreviewWindowState {
-    /// The text inside the window
-    text: Vec<String>,
-    /// The current line scroll
-    scroll: usize,
-}
-
-impl PreviewWindowState {
-    /// Create a new PreviewWindowState
-    pub fn new(text: Vec<String>) -> Self {
-        Self { text, scroll: 0 }
-    }
 }
 
 impl CustomList {
@@ -196,10 +180,9 @@ impl CustomList {
             inner_tree: tree,
             visit_stack: vec![root_id],
             list_state: ListState::default().with_selected(Some(0)),
-            // By default the PreviewWindowState is set to None, so it is not being shown
-            preview_window_state: None,
             filter_query: String::new(),
             filtered_items: vec![],
+            preview_float: Float::new(80, 80),
         }
     }
 
@@ -263,32 +246,8 @@ impl CustomList {
         // Render it
         frame.render_stateful_widget(list, area, &mut self.list_state);
 
-        // Draw the preview window if it's active
+        //Render the preview window
-        if let Some(pw_state) = &self.preview_window_state {
+        self.preview_float.draw(frame, area);
-            // Set the window to be floating
-            let floating_area = floating_window(area);
-
-            // Draw the preview windows lines
-            let lines: Vec<Line> = pw_state
-                .text
-                .iter()
-                .skip(pw_state.scroll)
-                .take(floating_area.height as usize)
-                .map(|line| Line::from(line.as_str()))
-                .collect();
-
-            // Create list widget
-            let list = List::new(lines)
-                .block(
-                    Block::default()
-                        .borders(Borders::ALL)
-                        .title("Action preview"),
-                )
-                .highlight_style(Style::default().reversed());
-
-            // Finally render the preview window
-            frame.render_widget(list, floating_area);
-        }
     }
 
     pub fn filter(&mut self, query: String) {
@@ -327,38 +286,28 @@ impl CustomList {
         if event.kind == KeyEventKind::Release {
             return None;
         }
+
+        if self.preview_float.handle_key_event(&event) {
+            return None; // If the key event was handled by the preview, don't propagate it further
+        }
+
         match event.code {
             // Damm you Up arrow, use vim lol
             KeyCode::Char('j') | KeyCode::Down => {
-                // If the preview window is active, scroll down and consume the scroll action,
+                self.list_state.select_next();
-                // so the scroll does not happen in the main window as well
-                if self.preview_window_state.is_some() {
-                    self.scroll_preview_window_down();
-                } else {
-                    self.list_state.select_next();
-                }
-
                 None
             }
             KeyCode::Char('k') | KeyCode::Up => {
-                // If the preview window is active, scroll up and consume the scroll action,
+                self.list_state.select_previous();
-                // so the scroll does not happen in the main window as well
-                if self.preview_window_state.is_some() {
-                    self.scroll_preview_window_up();
-                } else {
-                    self.list_state.select_previous();
-                }
-
                 None
             }
-            // The 'p' key toggles the preview on and off
             KeyCode::Char('p') => {
                 self.toggle_preview_window(state);
                 None
             }
 
             KeyCode::Enter | KeyCode::Right | KeyCode::Char('l') => {
-                if self.preview_window_state.is_none() {
+                if self.preview_float.get_content().is_none() {
                     self.handle_enter()
                 } else {
                     None
@@ -368,65 +317,9 @@ impl CustomList {
             _ => None,
         }
     }
-    fn toggle_preview_window(&mut self, state: &AppState) {
-        // If the preview window is active, disable it
-        if self.preview_window_state.is_some() {
-            self.preview_window_state = None;
-        } else {
-            // If the preview windows is not active, show it
 
-            // Get the selected command
-            if let Some(selected_command) = self.get_selected_command() {
-                let lines = match selected_command {
-                    Command::Raw(cmd) => {
-                        // Reconstruct the line breaks and file formatting after the
-                        // 'include_str!()' call in the node
-                        cmd.lines().map(|line| line.to_string()).collect()
-                    }
-                    Command::LocalFile(file_path) => {
-                        let mut full_path = state.temp_path.clone();
-                        full_path.push(file_path);
-                        let file_contents = std::fs::read_to_string(&full_path)
-                            .map_err(|_| format!("File not found: {:?}", &full_path))
-                            .unwrap();
-                        file_contents.lines().map(|line| line.to_string()).collect()
-                    }
-                    // If command is a folder, we don't display a preview
-                    Command::None => return,
-                };
-
-                // Show the preview window with the text lines
-                self.preview_window_state = Some(PreviewWindowState::new(lines));
-            }
-        }
-    }
-
-    /// Scroll the preview window down
-    fn scroll_preview_window_down(&mut self) {
-        if let Some(pw_state) = &mut self.preview_window_state {
-            if pw_state.scroll + 1 < pw_state.text.len() {
-                pw_state.scroll += 1;
-            }
-        }
-    }
-
-    /// Scroll the preview window up
-    fn scroll_preview_window_up(&mut self) {
-        if let Some(pw_state) = &mut self.preview_window_state {
-            if pw_state.scroll > 0 {
-                pw_state.scroll = pw_state.scroll.saturating_sub(1);
-            }
-        }
-    }
-
-    /// This method returns the currently selected command, or None if no command is selected.
-    /// It was extracted from the 'handle_enter()'
-    ///
-    /// This could probably be integrated into the 'handle_enter()' method to avoid code
-    /// duplication, but I don't want to make too major changes to the codebase.
     fn get_selected_command(&self) -> Option<Command> {
         let selected_index = self.list_state.selected().unwrap_or(0);
-        println!("Selected Index: {}", selected_index);
 
         if self.filter_query.is_empty() {
             // No filter query, use the regular tree navigation
@@ -452,7 +345,6 @@ impl CustomList {
         } else {
             // Filter query is active, use the filtered items
             if let Some(filtered_node) = self.filtered_items.get(selected_index) {
-                println!("Filtered Node Name: {}", filtered_node.name);
                 return Some(filtered_node.command.clone());
             }
         }
@@ -512,6 +404,37 @@ impl CustomList {
         None
     }
 
+    fn toggle_preview_window(&mut self, state: &AppState) {
+        if self.preview_float.get_content().is_some() {
+            // If the preview window is active, disable it
+            self.preview_float.set_content(None);
+        } else {
+            // If the preview window is not active, show it
+
+            // Get the selected command
+            if let Some(selected_command) = self.get_selected_command() {
+                let lines = match selected_command {
+                    Command::Raw(cmd) => cmd.lines().map(|line| line.to_string()).collect(),
+                    Command::LocalFile(file_path) => {
+                        if file_path.is_empty() {
+                            return;
+                        }
+                        let mut full_path = state.temp_path.clone();
+                        full_path.push(file_path);
+                        let file_contents = std::fs::read_to_string(&full_path)
+                            .map_err(|_| format!("File not found: {:?}", &full_path))
+                            .unwrap();
+                        file_contents.lines().map(|line| line.to_string()).collect()
+                    }
+                    Command::None => return,
+                };
+
+                self.preview_float
+                    .set_content(Some(FloatingText::new(lines)));
+            }
+        }
+    }
+
     /// Checks weather the current tree node is the root node (can we go up the tree or no)
     /// Returns `true` if we can't go up the tree (we are at the tree root)
     /// else returns `false`

src/main.rs

@@ -1,4 +1,5 @@
 mod float;
+mod floating_text;
 mod list;
 mod running_command;
 pub mod state;
@@ -17,6 +18,7 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
     ExecutableCommand,
 };
+use float::Float;
 use include_dir::include_dir;
 use list::CustomList;
 use ratatui::{
@@ -77,9 +79,12 @@ fn main() -> std::io::Result<()> {
 }
 
 fn run<B: Backend>(terminal: &mut Terminal<B>, state: &AppState) -> io::Result<()> {
-    let mut command_opt: Option<RunningCommand> = None;
+    //Create the search field
-    let mut custom_list = CustomList::new();
     let mut search_input = String::new();
+    //Create the command list
+    let mut custom_list = CustomList::new();
+    //Create the float to hold command output
+    let mut command_float = Float::new(60, 60);
     let mut in_search_mode = false;
 
     loop {
@@ -118,10 +123,8 @@ fn run<B: Backend>(terminal: &mut Terminal<B>, state: &AppState) -> io::Result<(
                 frame.render_widget(search_bar, chunks[0]);
                 //Render the command list (Second chunk of the screen)
                 custom_list.draw(frame, chunks[1], state);
-
+                //Render the command float in the custom_list chunk
-                if let Some(ref mut command) = &mut command_opt {
+                command_float.draw(frame, chunks[1]);
-                    command.draw(frame, state);
-                }
             })
             .unwrap();
 
@@ -137,11 +140,11 @@ fn run<B: Backend>(terminal: &mut Terminal<B>, state: &AppState) -> io::Result<(
             if key.kind != KeyEventKind::Press && key.kind != KeyEventKind::Repeat {
                 continue;
             }
-            if let Some(ref mut command) = command_opt {
+
-                if command.handle_key_event(&key) {
+            //Send the key to the float
-                    command_opt = None;
+            //If we receive true, then the float processed the input
-                }
+            //If that's the case, don't propagate input to other widgets
-            } else {
+            if !command_float.handle_key_event(&key) {
                 //Insert user input into the search bar
                 if in_search_mode {
                     match key.code {
@@ -165,7 +168,7 @@ fn run<B: Backend>(terminal: &mut Terminal<B>, state: &AppState) -> io::Result<(
                         _ => {}
                     }
                 } else if let Some(cmd) = custom_list.handle_key(key, state) {
-                    command_opt = Some(RunningCommand::new(cmd, state));
+                    command_float.set_content(Some(RunningCommand::new(cmd, state)));
                 } else {
                     // Handle keys while not in search mode
                     match key.code {

src/running_command.rs

@@ -1,28 +1,26 @@
-use std::{
+use crate::{float::FloatContent, state::AppState};
-    io::Write,
-    sync::{Arc, Mutex},
-    thread::JoinHandle,
-};
-
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use oneshot::{channel, Receiver};
 use portable_pty::{
     ChildKiller, CommandBuilder, ExitStatus, MasterPty, NativePtySystem, PtySize, PtySystem,
 };
 use ratatui::{
-    layout::Size,
+    layout::{Rect, Size},
-    style::{Style, Stylize},
+    style::{Color, Style, Stylize},
     text::{Line, Span},
     widgets::{Block, Borders},
     Frame,
 };
+use std::{
+    io::Write,
+    sync::{Arc, Mutex},
+    thread::JoinHandle,
+};
 use tui_term::{
     vt100::{self, Screen},
     widget::PseudoTerminal,
 };
 
-use crate::{float::floating_window, state::AppState};
-
 #[derive(Clone)]
 pub enum Command {
     Raw(&'static str),
@@ -30,36 +28,107 @@ pub enum Command {
     None, // Directory
 }
 
-/// This is a struct for storing everything connected to a running command
-// Create a new instance on every new command you want to run
 pub struct RunningCommand {
-    /// A buffer to save all the command output (accumulates, untill the command exits)
+    /// A buffer to save all the command output (accumulates, until the command exits)
     buffer: Arc<Mutex<Vec<u8>>>,
-
+    /// A handle for the thread running the command
-    /// A handle of the tread where the command is being executed
     command_thread: Option<JoinHandle<ExitStatus>>,
-
+    /// A handle to kill the running process; it's an option because it can only be used once
-    /// A handle to kill the running process, it's an option because it can only be used once
     child_killer: Option<Receiver<Box<dyn ChildKiller + Send + Sync>>>,
-
+    /// A join handle for the thread that reads command output and sends it to the main thread
-    /// A join handle for the thread that is reading all the command output and sending it to the
-    /// main thread
     _reader_thread: JoinHandle<()>,
-
     /// Virtual terminal (pty) handle, used for resizing the pty
     pty_master: Box<dyn MasterPty + Send>,
-
     /// Used for sending keys to the emulated terminal
     writer: Box<dyn Write + Send>,
-
     /// Only set after the process has ended
     status: Option<ExitStatus>,
 }
 
+impl FloatContent for RunningCommand {
+    fn draw(&mut self, frame: &mut Frame, area: Rect) {
+        // Calculate the inner size of the terminal area, considering borders
+        let inner_size = Size {
+            width: area.width - 2, // Adjust for border width
+            height: area.height - 2,
+        };
+
+        // Define the block for the terminal display
+        let block = if !self.is_finished() {
+            // Display a block indicating the command is running
+            Block::default()
+                .borders(Borders::ALL)
+                .title_top(Line::from("Running the command....").centered())
+                .title_style(Style::default().reversed())
+                .title_bottom(Line::from("Press Ctrl-C to KILL the command"))
+        } else {
+            // Display a block with the command's exit status
+            let mut title_line = if self.get_exit_status().success() {
+                Line::from(
+                    Span::default()
+                        .content("SUCCESS!")
+                        .style(Style::default().fg(Color::Green).reversed()),
+                )
+            } else {
+                Line::from(
+                    Span::default()
+                        .content("FAILED!")
+                        .style(Style::default().fg(Color::Red).reversed()),
+                )
+            };
+
+            title_line.push_span(
+                Span::default()
+                    .content(" press <ENTER> to close this window ")
+                    .style(Style::default()),
+            );
+
+            Block::default()
+                .borders(Borders::ALL)
+                .title_top(title_line.centered())
+        };
+
+        // Process the buffer and create the pseudo-terminal widget
+        let screen = self.screen(inner_size);
+        let pseudo_term = PseudoTerminal::new(&screen).block(block);
+
+        // Render the widget on the frame
+        frame.render_widget(pseudo_term, area);
+    }
+
+    /// Handle key events of the running command "window". Returns true when the "window" should be
+    /// closed
+    fn handle_key_event(&mut self, key: &KeyEvent) -> bool {
+        match key.code {
+            // Handle Ctrl-C to kill the command
+            KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                self.kill_child();
+            }
+            // Close the window when Enter is pressed and the command is finished
+            KeyCode::Enter if self.is_finished() => {
+                return true;
+            }
+            // Pass other key events to the terminal
+            _ => self.handle_passthrough_key_event(key),
+        }
+        false
+    }
+
+    fn is_finished(&self) -> bool {
+        // Check if the command thread has finished
+        if let Some(command_thread) = &self.command_thread {
+            command_thread.is_finished()
+        } else {
+            true
+        }
+    }
+}
+
 impl RunningCommand {
     pub fn new(command: Command, state: &AppState) -> Self {
         let pty_system = NativePtySystem::default();
 
+        // Build the command based on the provided Command enum variant
         let mut cmd = CommandBuilder::new("sh");
         match command {
             Command::Raw(prompt) => {
@@ -74,10 +143,11 @@ impl RunningCommand {
 
         cmd.cwd(&state.temp_path);
 
+        // Open a pseudo-terminal with initial size
         let pair = pty_system
             .openpty(PtySize {
-                rows: 24, // Set the initial size of the emulated terminal
+                rows: 24, // Initial number of rows (will be updated dynamically)
-                cols: 80, // We will update this later, if resized
+                cols: 80, // Initial number of columns (will be updated dynamically)
                 pixel_width: 0,
                 pixel_height: 0,
             })
@@ -129,6 +199,7 @@ impl RunningCommand {
             status: None,
         }
     }
+
     fn screen(&mut self, size: Size) -> Screen {
         // Resize the emulated pty
         self.pty_master
@@ -149,13 +220,7 @@ impl RunningCommand {
         parser.process(buffer);
         parser.screen().clone()
     }
-    pub fn is_finished(&mut self) -> bool {
+
-        if let Some(command_thread) = &self.command_thread {
-            command_thread.is_finished()
-        } else {
-            true
-        }
-    }
     /// This function will block if the command is not finished
     fn get_exit_status(&mut self) -> ExitStatus {
         if self.command_thread.is_some() {
@@ -168,57 +233,6 @@ impl RunningCommand {
         }
     }
 
-    pub fn draw(&mut self, frame: &mut Frame, state: &AppState) {
-        // Funny name
-        let floater = floating_window(frame.size());
-
-        let inner_size = Size {
-            width: floater.width - 2, // Because we add a `Block` with a border
-            height: floater.height - 2,
-        };
-
-        // When the command is running
-        let term_border = if !self.is_finished() {
-            Block::default()
-                .borders(Borders::ALL)
-                .title_top(Line::from("Running the command....").centered())
-                .title_style(Style::default().reversed())
-                .title_bottom(Line::from("Press Ctrl-C to KILL the command"))
-        } else {
-            // This portion is just for pretty colors.
-            // You can use multiple `Span`s with different styles each, to construct a line,
-            // which can be used as a list item, or in this case a `Block` title
-
-            let mut title_line = if self.get_exit_status().success() {
-                Line::from(
-                    Span::default()
-                        .content("SUCCESS!")
-                        .style(Style::default().fg(state.theme.success_color).reversed()),
-                )
-            } else {
-                Line::from(
-                    Span::default()
-                        .content("FAILED!")
-                        .style(Style::default().fg(state.theme.fail_color).reversed()),
-                )
-            };
-
-            title_line.push_span(
-                Span::default()
-                    .content(" press <ENTER> to close this window ")
-                    .style(Style::default()),
-            );
-
-            Block::default()
-                .borders(Borders::ALL)
-                .title_top(title_line.centered())
-        };
-        let screen = self.screen(inner_size); // when the terminal is changing a lot, there
-                                              // will be 1 frame of lag on resizing
-        let pseudo_term = PseudoTerminal::new(&screen).block(term_border);
-        frame.render_widget(pseudo_term, floater);
-    }
-
     /// Send SIGHUB signal, *not* SIGKILL or SIGTERM, to the child process
     pub fn kill_child(&mut self) {
         if !self.is_finished() {
@@ -227,22 +241,6 @@ impl RunningCommand {
         }
     }
 
-    /// Handle key events of the running command "window". Returns true when the "window" should be
-    /// closed
-    pub fn handle_key_event(&mut self, key: &KeyEvent) -> bool {
-        match key.code {
-            KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
-                self.kill_child()
-            }
-
-            KeyCode::Enter if self.is_finished() => {
-                return true;
-            }
-            _ => self.handle_passthrough_key_event(key),
-        };
-        false
-    }
-
     /// Convert the KeyEvent to pty key codes, and send them to the virtual terminal
     fn handle_passthrough_key_event(&mut self, key: &KeyEvent) {
         let input_bytes = match key.code {
@@ -260,9 +258,6 @@ impl RunningCommand {
                         '6' | '^' => send = vec![30],
                         '7' | '-' | '_' => send = vec![31],
                         char if ('A'..='_').contains(&char) => {
-                            // Since A == 65,
-                            // we can safely subtract 64 to get
-                            // the corresponding control character
                             let ascii_val = char as u8;
                             let ascii_to_send = ascii_val - 64;
                             send = vec![ascii_to_send];