Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for stack overflow when overflowing a line

Browse source
This commit is contained in:
ridiculousfish 2012-08-04 18:41:14 -07:00
parent 35e9fd1bb0
commit ba070e21e4
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
screen.cpp
View file

@ -412,11 +412,11 @@ static void s_check_status( screen_t *s)
on. This function automatically handles linebreaks and lines longer on. This function automatically handles linebreaks and lines longer
than the screen width. than the screen width.
*/ */
static void s_desired_append_char( screen_t *s, static void s_desired_append_char( screen_t *s,
wchar_t b, wchar_t b,
int c, int c,
int indent, int indent,
size_t prompt_width ) size_t prompt_width )
{ {
int line_no = s->desired.cursor.y; int line_no = s->desired.cursor.y;
@ -434,28 +434,27 @@ static void s_desired_append_char( screen_t *s,
} }
break; break;
} }
case L'\r': case L'\r':
{ {
line_t &current = s->desired.line(line_no); line_t &current = s->desired.line(line_no);
current.clear(); current.clear();
s->desired.cursor.x = 0; s->desired.cursor.x = 0;
break; break;
} }
default: default:
{ {
int screen_width = common_get_width(); int screen_width = common_get_width();
int cw = fish_wcwidth(b); int cw = fish_wcwidth(b);
int ew = fish_wcwidth( ellipsis_char ); int ew = fish_wcwidth( ellipsis_char );
int i;
s->desired.create_line(line_no); s->desired.create_line(line_no);
/* /*
Check if we are at the end of the line. If so, print an Check if we are at the end of the line. If so, print an
ellipsis character and continue on the next line. ellipsis character and continue on the next line.
*/ */
if( s->desired.cursor.x + cw + ew > screen_width ) if( s->desired.cursor.x + cw + ew > screen_width )
{ {
s->desired.line(line_no).append(ellipsis_char, HIGHLIGHT_COMMENT); s->desired.line(line_no).append(ellipsis_char, HIGHLIGHT_COMMENT);
@ -464,10 +463,12 @@ static void s_desired_append_char( screen_t *s,
s->desired.add_line(); s->desired.add_line();
s->desired.cursor.y++; s->desired.cursor.y++;
s->desired.cursor.x=0; s->desired.cursor.x=0;
for( i=0; i < (prompt_width-ew); i++ ) if (prompt_width > ew) {
{ for( size_t i=0; i < (prompt_width-ew); i++ )
s_desired_append_char( s, L' ', 0, indent, prompt_width ); {
} s_desired_append_char( s, L' ', 0, indent, prompt_width );
}
}
s_desired_append_char( s, ellipsis_char, HIGHLIGHT_COMMENT, indent, prompt_width ); s_desired_append_char( s, ellipsis_char, HIGHLIGHT_COMMENT, indent, prompt_width );
} }