github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-27 11:43:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Alternate fix for cursor_down bound to "\n" and ONLCR set.

Browse Source 
See GitHub issue #4505 "Terminal mode confusion"
and commit #3f820f0 "Disable ONLCR mapping of NL output to CR-NL".
This commit is contained in:
Per Bothner 2019-04-18 19:42:18 -07:00 committed by Fabian Homborg
parent e20c08d04e
commit 50db10a422
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/screen.cpp
View File

@ -463,17 +463,20 @@ static void s_move(screen_t *s, int new_x, int new_y) {
y_steps = new_y - s->actual.cursor.y; y_steps = new_y - s->actual.cursor.y;
if (y_steps > 0 && (std::strcmp(cursor_down, "\n") == 0)) {
// This is very strange - it seems some (all?) consoles use a simple newline as the cursor
// down escape. This will of course move the cursor to the beginning of the line as well as
// moving it down one step. The cursor_up does not have this behavior...
s->actual.cursor.x = 0;
}
if (y_steps < 0) { if (y_steps < 0) {
str = cursor_up; str = cursor_up;
} else { } else {
str = cursor_down; str = cursor_down;
if ((shell_modes.c_iflag & ONLCR) != 0
&& std::strcmp(str, "\n") == 0) { // See GitHub issue #4505.
// Most consoles use a simple newline as the cursor down escape.
// If ONLCR is enabled (which it normally is) this will of course
// also move the cursor to the beginning of the line.
if (std::strcmp(cursor_up, "\x1B[A") == 0) // If VT-style terminal
str = "\x1B[B"; // ... use real cursor-down
else
s->actual.cursor.x = 0;
}
} }
for (i = 0; i < abs(y_steps); i++) { for (i = 0; i < abs(y_steps); i++) {