Reset grid when running `reset`

In the current scrollback PR the `reset` command does not affect the
scrollback history. To make sure the terminal is properly reset, it
should clear the scrollback history.

To make resetting efficient, instead of resetting the history,
the scrollback history is hidden by setting `grid.scroll_limit` to `0`.
This will not clear the history but instead just make it inaccessible,
which should have the same effect.

The visible area is reset by the shell itself, so in combination this
clears the complete terminal grid from a user perspective.

This fixes #1242.
This commit is contained in:
Christian Duerr 2018-04-28 14:14:45 +00:00 committed by Joe Wilm
parent bfa9265551
commit d8bda60c3d
2 changed files with 6 additions and 3 deletions

View File

@ -403,6 +403,10 @@ impl<T> Grid<T> {
self.cols
}
pub fn reset(&mut self) {
self.scroll_limit = 0;
}
pub fn iter_from(&self, point: Point<usize>) -> GridIterator<T> {
GridIterator {
grid: self,

View File

@ -838,13 +838,11 @@ impl Term {
}
pub fn new(config: &Config, size: SizeInfo) -> Term {
let template = Cell::default();
let num_cols = size.cols();
let num_lines = size.lines();
let history_size = config.scrolling().history as usize;
let grid = Grid::new(num_lines, num_cols, history_size, template);
let grid = Grid::new(num_lines, num_cols, history_size, Cell::default());
let tabspaces = config.tabspaces();
let tabs = IndexRange::from(Column(0)..grid.num_cols())
@ -1820,6 +1818,7 @@ impl ansi::Handler for Term {
self.colors = self.original_colors;
self.color_modified = [false; color::COUNT];
self.cursor_style = None;
self.grid.reset();
}
#[inline]