ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve trailing blank line on resize always

Browse source 
No sense in restricting it to just lines marked as output and only on
main screen.
This commit is contained in:
Kovid Goyal 2024-10-19 14:15:45 +05:30
parent 66251f8fd5
commit 002d0a0403
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kitty/screen.c
View file

@ -343,7 +343,7 @@ found:
static bool
preserve_blank_output_start_line(Cursor *cursor, LineBuf *linebuf) {
if (cursor->x == 0 && cursor->y < linebuf->ynum && linebuf->line_attrs[cursor->y].prompt_kind == OUTPUT_START) {
if (cursor->x == 0 && cursor->y < linebuf->ynum && !linebuf->line_attrs[cursor->y].is_continued) {
linebuf_init_line(linebuf, cursor->y);
if (!linebuf->line->cpu_cells[0].ch) {
// we have a blank output start line, we need it to be preserved by
@ -371,9 +371,14 @@ screen_resize(Screen *self, unsigned int lines, unsigned int columns) {
bool is_main = self->linebuf == self->main_linebuf;
index_type num_content_lines_before, num_content_lines_after;
bool dummy_output_inserted = false;
if (is_main) dummy_output_inserted = preserve_blank_output_start_line(self->cursor, self->linebuf);
else if (self->main_savepoint.is_valid) dummy_output_inserted = preserve_blank_output_start_line(&self->main_savepoint.cursor, self->main_linebuf);
bool main_has_blank_line = false, alt_has_blank_line = false;
if (is_main) {
main_has_blank_line = preserve_blank_output_start_line(self->cursor, self->linebuf);
if (self->alt_savepoint.is_valid) alt_has_blank_line = preserve_blank_output_start_line(&self->alt_savepoint.cursor, self->alt_linebuf);
} else {
if (self->main_savepoint.is_valid) main_has_blank_line = preserve_blank_output_start_line(&self->main_savepoint.cursor, self->main_linebuf);
alt_has_blank_line = preserve_blank_output_start_line(self->cursor, self->linebuf);
}
unsigned int lines_after_cursor_before_resize = self->lines - self->cursor->y;
CursorTrack cursor = {.before = {self->cursor->x, self->cursor->y}};
CursorTrack main_saved_cursor = {.before = {self->main_savepoint.cursor.x, self->main_savepoint.cursor.y}};
@ -451,10 +456,8 @@ screen_resize(Screen *self, unsigned int lines, unsigned int columns) {
sp->cursor.y = MIN(sp->cursor.y + 1, self->lines - 1);
}
}
if (dummy_output_inserted) {
if (is_main) remove_blank_output_line_reservation_marker(self->cursor, self->linebuf);
else remove_blank_output_line_reservation_marker(&self->main_savepoint.cursor, self->main_linebuf);
}
if (main_has_blank_line) remove_blank_output_line_reservation_marker(is_main ? self->cursor : &self->main_savepoint.cursor, self->main_linebuf);
if (alt_has_blank_line) remove_blank_output_line_reservation_marker(is_main ? &self->alt_savepoint.cursor : self->cursor, self->alt_linebuf);
if (num_of_prompt_lines) {
// Copy the old prompt lines without any reflow this prevents
// flickering of prompt during resize. THe flicker is caused by the

16
kitty_tests/screen.py
View file

@ -280,6 +280,22 @@ def test_backspace_wide_characters(self):
self.ae(s.cursor.x, 1)
def test_resize(self):
# test that trailing blank line is preserved on resize
s = self.create_screen(cols=5, lines=5, scrollback=15)
for i in range(3):
s.draw(f'oo{i}'), s.index(), s.carriage_return()
s.draw('$ pp'), s.index(), s.carriage_return()
s.resize(s.lines, 2)
self.assertFalse(str(s.line(s.cursor.y)))
self.assertFalse(s.cursor.x)
# test that only happens when last line is not continued
s = self.create_screen(cols=5, lines=5, scrollback=15)
for i in range(3):
s.draw(f'oo{i}'), s.index(), s.carriage_return()
s.draw('p' * (s.columns + 2)), s.carriage_return()
s.resize(s.lines, 2)
self.assertTrue(str(s.line(s.cursor.y)))
s = self.create_screen(scrollback=6)
s.draw(''.join([str(i) * s.columns for i in range(s.lines)]))
s.resize(3, 10)