zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-24 11:02:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 7762de2c6b into f24ad9a366

Browse source
This commit is contained in:
ailin-nemui 2017-05-06 18:59:43 +00:00 • committed by GitHub
commit dee91f638d
8 changed files with 81 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/fe-text/textbuffer-view.c
View file

@ -399,6 +399,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
#ifdef TERM_TRUECOLOR
unsigned int fg24, bg24;
#endif
int window_width;
if (view->dirty) /* don't bother drawing anything - redraw is coming */
return 0;
@ -407,6 +408,8 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
if (subline >= cache->count)
return 0;
term_get_window_size(view->window, &window_width, NULL);
color = ATTR_RESET;
need_move = TRUE; need_clrtoeol = FALSE;
xpos = drawcount = 0; first = TRUE;
@ -414,7 +417,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 && xpos < term_width) {
if (need_clrtoeol && xpos < window_width) {
term_set_color(view->window, ATTR_RESET);
term_clrtoeol(view->window);
}
@ -513,7 +516,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
}
xpos += char_width;
if (xpos <= term_width) {
if (xpos <= window_width) {
if (unichar_isprint(chr)) {
if (view->utf8)
term_add_unichar(view->window, chr);
@ -530,7 +533,7 @@ static int view_line_draw(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
text = end;
}
if (need_clrtoeol && xpos < term_width) {
if (need_clrtoeol && xpos < window_width) {
term_set_color(view->window, ATTR_RESET);
term_clrtoeol(view->window);
}
@ -826,23 +829,7 @@ static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
}
if (scroll_visible && realcount != 0 && view->window != NULL) {
if (realcount <= -view->height || realcount >= view->height) {
/* scrolled more than screenful, redraw the
whole view */
textbuffer_view_redraw(view);
} else {
term_set_color(view->window, ATTR_RESET);
term_window_scroll(view->window, realcount);
if (draw_nonclean) {
if (realcount < 0)
view_draw_top(view, -realcount, TRUE);
else
view_draw_bottom(view, realcount);
}
term_refresh(view->window);
}
textbuffer_view_redraw(view);
}
return realcount >= 0 ? realcount : -realcount;