1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

move no window printing code

This commit is contained in:
ailin-nemui 2018-03-16 12:44:04 +01:00
parent 3f217ae149
commit 65a139aa9e

View File

@ -249,9 +249,26 @@ static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line)
textbuffer_view_insert_line(view, *line); textbuffer_view_insert_line(view, *line);
} }
static void print_text_no_window(int flags, int fg, int bg, int attr, const char *str)
{
g_return_if_fail(next_xpos != -1);
term_set_color2(root_window, attr, fg, bg);
term_move(root_window, next_xpos, next_ypos);
if (flags & GUI_PRINT_FLAG_CLRTOEOL) {
if (clrtoeol_info->window != NULL) {
term_window_clrtoeol_abs(clrtoeol_info->window, next_ypos);
} else {
term_clrtoeol(root_window);
}
}
next_xpos += term_addstr(root_window, str);
}
static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor, static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
void *bgcolor, void *pflags, void *bgcolor, void *pflags,
char *str, TEXT_DEST_REC *dest) const char *str, TEXT_DEST_REC *dest)
{ {
GUI_WINDOW_REC *gui; GUI_WINDOW_REC *gui;
TEXT_BUFFER_VIEW_REC *view; TEXT_BUFFER_VIEW_REC *view;
@ -265,19 +282,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
get_colors(flags, &fg, &bg, &attr); get_colors(flags, &fg, &bg, &attr);
if (window == NULL) { if (window == NULL) {
g_return_if_fail(next_xpos != -1); print_text_no_window(flags, fg, bg, attr, str);
term_set_color2(root_window, attr, fg, bg);
term_move(root_window, next_xpos, next_ypos);
if (flags & GUI_PRINT_FLAG_CLRTOEOL) {
if (clrtoeol_info->window != NULL) {
term_window_clrtoeol_abs(clrtoeol_info->window, next_ypos);
} else {
term_clrtoeol(root_window);
}
}
next_xpos += term_addstr(root_window, str);
return; return;
} }