Another attempt at fixing fish cursor movement

This commit is contained in:
Kovid Goyal 2021-09-30 14:17:01 +05:30
parent 2304d0ec5c
commit 21d3856e90
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -1473,18 +1473,19 @@ screen_fake_move_cursor_to_position(Screen *self, index_type x, index_type y) {
while (x < x_limit) { while (x < x_limit) {
unsigned int w = linebuf_char_width_at(self->linebuf, x, y); unsigned int w = linebuf_char_width_at(self->linebuf, x, y);
if (w == 0) { if (w == 0) {
count += 1;
// we only stop counting the cells in the line at an empty cell // we only stop counting the cells in the line at an empty cell
// if at least one non-empty cell is found. zsh uses empty cells // if at least one non-empty cell is found. zsh uses empty cells
// between the end of the text ad the right prompt. fish uses empty // between the end of the text ad the right prompt. fish uses empty
// cells at the start of a line when editing multiline text // cells at the start of a line when editing multiline text
if (!found_non_empty_cell) { x++; continue; } if (!found_non_empty_cell) { x++; continue; }
count += 1;
break; break;
} }
found_non_empty_cell = true; found_non_empty_cell = true;
x += w; x += w;
count += 1; // zsh requires a single arrow press to move fast dualwidth chars count += 1; // zsh requires a single arrow press to move fast dualwidth chars
} }
if (!found_non_empty_cell) count++; // blank line
x = 0; x = 0;
} }
if (count) { if (count) {