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

Fix scroll_to_prompt for prompts that have been reflowed over multiple lines

Browse Source
This commit is contained in:
Kovid Goyal
2021-07-22 08:47:51 +05:30
parent f61b8608de
commit e8832a86bb
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kitty/screen.c
View File

@@ -1805,18 +1805,29 @@ shell_prompt_marking(Screen *self, PyObject *data) {
static bool static bool
screen_history_scroll_to_prompt(Screen *self, int num_of_prompts_to_jump) { screen_history_scroll_to_prompt(Screen *self, int num_of_prompts_to_jump) {
if (self->linebuf != self->main_linebuf) return false; if (self->linebuf != self->main_linebuf || !num_of_prompts_to_jump) return false;
int delta = num_of_prompts_to_jump < 0 ? -1 : 1; int delta = num_of_prompts_to_jump < 0 ? -1 : 1;
num_of_prompts_to_jump = num_of_prompts_to_jump < 0 ? -num_of_prompts_to_jump : num_of_prompts_to_jump; num_of_prompts_to_jump = num_of_prompts_to_jump < 0 ? -num_of_prompts_to_jump : num_of_prompts_to_jump;
int y = -self->scrolled_by; int y = -self->scrolled_by;
#define ensure_y_ok if (y >= (int)self->lines || -y > (int)self->historybuf->count) return false;
#define move_y_to_start_of_promt while (-y + 1 <= (int)self->historybuf->count && range_line_(self, y - 1)->is_prompt_start) y--;
#define move_y_to_end_of_promt while (y + 1 < (int)self->lines && range_line_(self, y + 1)->is_prompt_start) y++;
ensure_y_ok;
if (range_line_(self, y)->is_prompt_start) {
if (delta < 0) { move_y_to_start_of_promt; } else { move_y_to_end_of_promt; }
}
while (num_of_prompts_to_jump) { while (num_of_prompts_to_jump) {
y += delta; y += delta;
if (y >= (int)self->lines || -y > (int)self->historybuf->count) return false; ensure_y_ok;
if (range_line_(self, y)->is_prompt_start) num_of_prompts_to_jump--; if (range_line_(self, y)->is_prompt_start) {
} num_of_prompts_to_jump--;
if (delta < 0) { if (delta < 0) { move_y_to_start_of_promt; } else { move_y_to_end_of_promt; }
while (-y + 1 <= (int)self->historybuf->count && range_line_(self, y - 1)->is_prompt_start) y--; }
} }
move_y_to_start_of_promt;
#undef ensure_y_ok
#undef move_y_to_start_of_promt
#undef move_y_to_end_of_promt
unsigned int old = self->scrolled_by; unsigned int old = self->scrolled_by;
self->scrolled_by = y >= 0 ? 0 : -y; self->scrolled_by = y >= 0 ? 0 : -y;
if (old != self->scrolled_by) self->scroll_changed = true; if (old != self->scrolled_by) self->scroll_changed = true;