diff options
| author | Aram Drevekenin <aram@poor.dev> | 2021-04-05 16:37:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 16:37:21 +0200 |
| commit | f84d293c1bbaf55229f788f8061d7f0f033f822f (patch) | |
| tree | f617f6f3ea483954a9da3225957209ec7d7fe82e /src | |
| parent | Merge pull request #224 from a-kenji/config-file (diff) | |
| download | sl0ppij-f84d293c1bbaf55229f788f8061d7f0f033f822f.tar.gz sl0ppij-f84d293c1bbaf55229f788f8061d7f0f033f822f.tar.xz sl0ppij-f84d293c1bbaf55229f788f8061d7f0f033f822f.zip | |
fix(terminal): reset styles on cursor movement (#254)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/panes/terminal_pane.rs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/client/panes/terminal_pane.rs b/src/client/panes/terminal_pane.rs index 463a33e3..13575475 100644 --- a/src/client/panes/terminal_pane.rs +++ b/src/client/panes/terminal_pane.rs @@ -380,8 +380,7 @@ impl TerminalPane { self.mark_for_rerender(); } fn add_newline(&mut self) { - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid.add_canonical_line(pad_character); self.mark_for_rerender(); } @@ -497,8 +496,7 @@ impl vte::Perform for TerminalPane { } else { (params[0] as usize - 1, params[1] as usize - 1) }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid.move_cursor_to(col, row, pad_character); } else if c == 'A' { // move cursor up until edge of screen @@ -507,8 +505,7 @@ impl vte::Perform for TerminalPane { } else if c == 'B' { // move cursor down until edge of screen let move_down_count = if params[0] == 0 { 1 } else { params[0] }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid .move_cursor_down(move_down_count as usize, pad_character); } else if c == 'D' { @@ -600,8 +597,7 @@ impl vte::Perform for TerminalPane { } else { params[0] as usize }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid .delete_lines_in_scroll_region(line_count_to_delete, pad_character); } else if c == 'L' { @@ -611,8 +607,7 @@ impl vte::Perform for TerminalPane { } else { params[0] as usize }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid .add_empty_lines_in_scroll_region(line_count_to_add, pad_character); } else if c == 'q' { @@ -632,8 +627,7 @@ impl vte::Perform for TerminalPane { // minus 1 because this is 1 indexed params[0] as usize - 1 }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid.move_cursor_to_line(line, pad_character); } else if c == 'P' { // erase characters @@ -672,8 +666,7 @@ impl vte::Perform for TerminalPane { } else { params[0] as usize }; - let mut pad_character = EMPTY_TERMINAL_CHARACTER; - pad_character.styles = self.pending_styles; + let pad_character = EMPTY_TERMINAL_CHARACTER; self.grid .delete_lines_in_scroll_region(count, pad_character); // TODO: since delete_lines_in_scroll_region also adds lines, is the below redundant? |