KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #170

Browse Source
This commit is contained in:
Kovid Goyal
2017-11-13 19:46:20 +05:30
parent 084fb23930
commit 2b87e1f601
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.rst
View File

@@ -23,6 +23,8 @@ version 0.5.0 [future]
- Linux: Add support for startup notification on X11 desktops. kitty will - Linux: Add support for startup notification on X11 desktops. kitty will
now inform the window manager when its startup is complete. now inform the window manager when its startup is complete.
- Fix extra shell prompt being duplicated when window is resized
- Fix crash when displaying more than 64 images in the same session - Fix crash when displaying more than 64 images in the same session
- Add support for colons in SGR color codes. These are generated by some - Add support for colons in SGR color codes. These are generated by some

18
kitty/screen.c
View File

@@ -141,7 +141,8 @@ screen_resize(Screen *self, unsigned int lines, unsigned int columns) {
bool is_main = self->linebuf == self->main_linebuf; bool is_main = self->linebuf == self->main_linebuf;
index_type num_content_lines_before, num_content_lines_after; index_type num_content_lines_before, num_content_lines_after;
index_type num_content_lines = 0; index_type num_content_lines = 0, old_columns = self->columns;
bool cursor_on_last_content_line = false;
// Resize main linebuf // Resize main linebuf
HistoryBuf *nh = realloc_hb(self->historybuf, self->historybuf->ynum, columns); HistoryBuf *nh = realloc_hb(self->historybuf, self->historybuf->ynum, columns);
@@ -150,7 +151,10 @@ screen_resize(Screen *self, unsigned int lines, unsigned int columns) {
LineBuf *n = realloc_lb(self->main_linebuf, lines, columns, &num_content_lines_before, &num_content_lines_after, self->historybuf); LineBuf *n = realloc_lb(self->main_linebuf, lines, columns, &num_content_lines_before, &num_content_lines_after, self->historybuf);
if (n == NULL) return false; if (n == NULL) return false;
Py_CLEAR(self->main_linebuf); self->main_linebuf = n; Py_CLEAR(self->main_linebuf); self->main_linebuf = n;
if (is_main) num_content_lines = num_content_lines_after; if (is_main) {
num_content_lines = num_content_lines_after;
cursor_on_last_content_line = num_content_lines_before == self->cursor->y + 1 || !num_content_lines_before;
}
grman_resize(self->main_grman, self->lines, lines, self->columns, columns); grman_resize(self->main_grman, self->lines, lines, self->columns, columns);
// Resize alt linebuf // Resize alt linebuf
@@ -175,9 +179,15 @@ screen_resize(Screen *self, unsigned int lines, unsigned int columns) {
self->selection = EMPTY_SELECTION; self->selection = EMPTY_SELECTION;
self->url_range = EMPTY_SELECTION; self->url_range = EMPTY_SELECTION;
// Ensure cursor is on a blank line // Ensure cursor is on the correct line
self->cursor->x = 0; self->cursor->x = 0;
self->cursor->y = MIN(self->lines - 1, num_content_lines); if (cursor_on_last_content_line) {
index_type delta;
if (self->columns > old_columns) delta = 1;
else delta = (old_columns % self->columns) + 1;
self->cursor->y = num_content_lines > delta ? num_content_lines - delta : 0;
} else self->cursor->y = num_content_lines;
self->cursor->y = MIN(self->cursor->y, self->lines - 1);
if (num_content_lines >= self->lines) screen_index(self); if (num_content_lines >= self->lines) screen_index(self);
return true; return true;

2
kitty_tests/screen.py
View File

@@ -228,7 +228,7 @@ class TestScreen(BaseTest):
s.draw(''.join(str(i) * s.columns for i in range(s.lines*2))) s.draw(''.join(str(i) * s.columns for i in range(s.lines*2)))
self.ae(str(s.linebuf), '55555\n66666\n77777\n88888\n99999') self.ae(str(s.linebuf), '55555\n66666\n77777\n88888\n99999')
s.resize(5, 2) s.resize(5, 2)
self.ae(str(s.linebuf), '88\n99\n99\n9\n') self.ae(str(s.linebuf), '88\n88\n99\n99\n9')
def test_cursor_after_resize(self): def test_cursor_after_resize(self):
s = self.create_screen() s = self.create_screen()