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

Fix the logic behind clrtoeol

Browse source
This commit is contained in:
LemonBoy 2016-03-01 17:14:49 +01:00
commit 7762de2c6b
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/fe-text/mainwindows.c
View file

@ -186,6 +186,7 @@ MAIN_WINDOW_REC *mainwindow_create(void)
rec = g_new0(MAIN_WINDOW_REC, 1); rec = g_new0(MAIN_WINDOW_REC, 1);
rec->dirty = TRUE; rec->dirty = TRUE;
#if 0
rec->width = term_width; rec->width = term_width;
rec->first_column = 0; rec->first_column = 0;
rec->last_column = rec->first_column + rec->width; rec->last_column = rec->first_column + rec->width;
@ -212,6 +213,31 @@ MAIN_WINDOW_REC *mainwindow_create(void)
parent->first_line += space+1; parent->first_line += space+1;
mainwindow_resize(parent, 0, -space-1); mainwindow_resize(parent, 0, -space-1);
} }
#else
rec->first_line = screen_reserved_top;
rec->last_line = term_height-1 - screen_reserved_bottom;
rec->height = rec->last_line-rec->first_line+1;
if (mainwindows == NULL) {
active_mainwin = rec;
rec->first_column = 0;
rec->last_column = term_width - 1;
rec->width = rec->last_column - rec->first_column + 1;
} else {
parent = WINDOW_MAIN(active_win);
space = parent->width / 2;
rec->first_column = parent->first_column;
rec->last_column = rec->first_column + space;
rec->width = rec->last_column - rec->first_column + 1;
parent->first_column += space + 1;
mainwindow_resize(parent, -space-1, 0);
}
#endif
rec->screen_win = mainwindow_create_screen(rec); rec->screen_win = mainwindow_create_screen(rec);
term_refresh(NULL); term_refresh(NULL);

4
src/fe-text/term-terminfo.c
View file

@ -565,10 +565,10 @@ void term_clrtoeol(TERM_WINDOW *window)
terminfo_clrtoeol(); terminfo_clrtoeol();
if (vcx == 0) term_lines_empty[vcy] = TRUE; if (vcx == 0) term_lines_empty[vcy] = TRUE;
} }
} else if (vcx < window->width) { } else if (vcx < window->x + window->width) {
/* we'll need to fill the line ourself. */ /* we'll need to fill the line ourself. */
if (vcmove) term_move_real(); if (vcmove) term_move_real();
terminfo_repeat(' ', window->width - vcx); terminfo_repeat(' ', window->x + window->width - vcx);
terminfo_move(vcx, vcy); terminfo_move(vcx, vcy);
term_lines_empty[vcy] = FALSE; term_lines_empty[vcy] = FALSE;
} }