summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2008-02-01 16:02:56 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2008-02-01 16:02:56 +0000
commit036b1d3300eea87bbd1666886ee843384ee0b848 (patch)
tree802b87a7b648986f8c00355356b74441872fe065
parent2fbde1a24ec1019a874234a5051bba10f585de52 (diff)
downloadirssi-036b1d3300eea87bbd1666886ee843384ee0b848.zip
Reset colors and attributes on newline.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4694 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/fe-common/core/formats.c6
-rw-r--r--src/fe-text/gui-printtext.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 93ee6211..cdc19610 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -986,8 +986,12 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
flags &= ~(GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_CLRTOEOL);
}
- if (type == '\n')
+ if (type == '\n') {
format_newline(dest->window);
+ fgcolor = theme->default_color;
+ bgcolor = -1;
+ flags &= GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_MONOSPACE;
+ }
if (*ptr == '\0')
break;
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 062c80ab..a22dfdc6 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -267,8 +267,12 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor,
insert_after = gui->use_insert_after ?
gui->insert_after : view->buffer->cur_line;
- if (flags & GUI_PRINT_FLAG_NEWLINE)
+ if (flags & GUI_PRINT_FLAG_NEWLINE) {
view_add_eol(view, &insert_after);
+ last_fg = LINE_COLOR_DEFAULT;
+ last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG;
+ last_flags = 0;
+ }
line_add_colors(view->buffer, &insert_after, fg, bg, flags);
if (flags & GUI_PRINT_FLAG_INDENT_FUNC) {