diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-11-03 12:54:29 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-11-03 12:54:29 +0000 |
| commit | 8f651887767ec62e1b64ac1fa927cb0398fdf9f6 (patch) | |
| tree | 355aa282351597cbefeaff4a22f28ff5ee8cfdfb | |
| parent | 806ab849bf951558825432657fc6adad1d4fc677 (diff) | |
| download | irssi-8f651887767ec62e1b64ac1fa927cb0398fdf9f6.zip | |
Some fixes to drawing lines & handling long lines.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1958 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/fe-text/textbuffer-view.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c index 61f77989..c231de4a 100644 --- a/src/fe-text/textbuffer-view.c +++ b/src/fe-text/textbuffer-view.c @@ -320,7 +320,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, subline == 0 ? line->text : cache->lines[subline-1].start; for (;;) { if (text == text_newline) { - if (need_clrtoeol && need_move) { + if (need_clrtoeol && xpos < term_width) { term_set_color(view->window, ATTR_RESET); term_clrtoeol(view->window); } @@ -334,25 +334,27 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, } if (subline > 0) { - indent_func = cache->lines[subline-1].indent_func; + /* continuing previous line - indent it */ + indent_func = cache->lines[subline-1].indent_func; xpos = indent_func != NULL ? indent_func(view, line, ypos) : cache->lines[subline-1].indent; color = cache->lines[subline-1].color; } - if (need_move || xpos > 0) { - /* first clear the line */ - if (xpos == 0) - need_clrtoeol = TRUE; - else { - term_set_color(view->window, ATTR_RESET); - term_move(view->window, 0, ypos); - term_clrtoeol(view->window); - } + if (xpos == 0) + need_clrtoeol = TRUE; + else { + /* line was indented - need to clear the + indented area first */ + term_set_color(view->window, ATTR_RESET); + term_move(view->window, 0, ypos); + term_clrtoeol(view->window); + } + if (need_move || xpos > 0) term_move(view->window, xpos, ypos); - } + term_set_color(view->window, color); if (subline == cache->count-1) { @@ -397,9 +399,10 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, term_set_color(view->window, color); } text++; + xpos++; } - if (need_clrtoeol) { + if (need_clrtoeol && xpos < term_width) { term_set_color(view->window, ATTR_RESET); term_clrtoeol(view->window); } |