Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hopeful fix for wrapping lines issue on Linux

Browse source 
https://github.com/fish-shell/fish-shell/issues/409
This commit is contained in:
ridiculousfish 2012-12-06 02:54:25 -08:00
parent 40ec2303ff
commit c8f7d33a9a
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
screen.cpp
View file

@ -567,6 +567,22 @@ static void s_move(screen_t *s, data_buffer_t *b, int new_x, int new_y)
if (s->actual.cursor.x == new_x && s->actual.cursor.y == new_y) if (s->actual.cursor.x == new_x && s->actual.cursor.y == new_y)
return; return;
// If we are at the end of our window, then either the cursor stuck to the edge or it didn't. We don't know! We can fix it up though.
if (s->actual.cursor.x == common_get_width()) {
// Either issue a cr to go back to the beginning of this line, or a nl to go to the beginning of the next one, depending on what we think is more efficient
if (new_y <= s->actual.cursor.y)
{
b->push_back('\r');
}
else
{
b->push_back('\n');
s->actual.cursor.y++;
}
// Either way we're not in the first column
s->actual.cursor.x = 0;
}
int i; int i;
int x_steps, y_steps; int x_steps, y_steps;
@ -661,9 +677,7 @@ static void s_write_char(screen_t *s, data_buffer_t *b, wchar_t c)
s->soft_wrap_location.x = 0; s->soft_wrap_location.x = 0;
s->soft_wrap_location.y = s->actual.cursor.y + 1; s->soft_wrap_location.y = s->actual.cursor.y + 1;
/* If auto_right_margin is set, then the cursor sticks to the right edge when it's in the rightmost column, so reflect that fact */ /* Note that our cursor position may be a lie: Apple Terminal makes the right cursor stick to the margin, while Ubuntu makes it "go off the end" (but still doesn't wrap). We rely on s_move to fix this up. */
if (auto_right_margin)
s->actual.cursor.x--;
} }
else else
{ {
@ -748,16 +762,9 @@ static bool test_stuff(screen_t *scr)
const wchar_t *left = L"left"; const wchar_t *left = L"left";
const wchar_t *right = L"right"; const wchar_t *right = L"right";
for (size_t idx = 0; left[idx]; idx++) for (size_t idx = 0; idx < 80; idx++)
{ {
s_write_char(scr, &output, left[idx]); output.push_back('A');
}
s_move(scr, &output, screen_width - wcslen(right), 0);
for (size_t idx = 0; right[idx]; idx++)
{
s_write_char(scr, &output, right[idx]);
} }
if (! output.empty()) if (! output.empty())
@ -879,10 +886,22 @@ static void s_update(screen_t *scr, const wchar_t *left_prompt, const wchar_t *r
skip_remaining = prefix_width; skip_remaining = prefix_width;
} }
/* Don't skip over the last two characters in a soft-wrapped line, so that we maintain soft-wrapping */ /* If we're soft wrapped, and if we're going to change the first character of the next line, don't skip over the last two characters so that we maintain soft-wrapping */
if (o_line.is_soft_wrapped) if (o_line.is_soft_wrapped && i + 1 < scr->desired.line_count()) {
bool first_character_of_next_line_will_change = true;
if (i + 1 < scr->actual.line_count())
{
if (line_shared_prefix(scr->desired.line(i+1), scr->actual.line(i+1)) > 0)
{
first_character_of_next_line_will_change = false;
}
}
if (first_character_of_next_line_will_change)
{
skip_remaining = mini(skip_remaining, (size_t)(scr->actual_width - 2)); skip_remaining = mini(skip_remaining, (size_t)(scr->actual_width - 2));
} }
}
}
/* Skip over skip_remaining width worth of characters */ /* Skip over skip_remaining width worth of characters */
size_t j = 0; size_t j = 0;