diff --git a/docs/signals.txt b/docs/signals.txt index f009a4de..897ee5ab 100644 --- a/docs/signals.txt +++ b/docs/signals.txt @@ -70,6 +70,7 @@ queries.c: "query created", QUERY_REC, int automatic "query destroyed", QUERY_REC "query nick changed", QUERY_REC, char *orignick + "window item name changed", WI_ITEM_REC "query address changed", QUERY_REC "query server changed", QUERY_REC, SERVER_REC @@ -225,7 +226,7 @@ FE common * Requires to work properly: - "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, int level + "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, TEXT_DEST_REC (Can be used to determine when all "gui print text"s are sent (not required)) "gui print text finished", WINDOW_REC diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index e014583c..2a0faa38 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -703,7 +703,7 @@ void format_newline(WINDOW_REC *window) signal_emit_id(signal_gui_print_text, 6, window, GINT_TO_POINTER(-1), GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), - "", GINT_TO_POINTER(-1)); + "", NULL); } /* parse ANSI color string */ @@ -956,7 +956,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, - dest->level); + dest); flags &= ~(GUI_PRINT_FLAG_INDENT|GUI_PRINT_FLAG_CLRTOEOL); } @@ -1009,7 +1009,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) signal_emit_id(signal_gui_print_text, 6, dest->window, NULL, NULL, GINT_TO_POINTER(GUI_PRINT_FLAG_INDENT_FUNC), - str, start, dest->level); + str, start, dest); break; } case FORMAT_STYLE_DEFAULTS: diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c index 429937a5..8509213e 100644 --- a/src/fe-text/gui-printtext.c +++ b/src/fe-text/gui-printtext.c @@ -231,7 +231,7 @@ static void view_add_eol(TEXT_BUFFER_VIEW_REC *view, LINE_REC **line) static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor, void *bgcolor, void *pflags, - char *str, void *level) + char *str, TEXT_DEST_REC *dest) { GUI_WINDOW_REC *gui; TEXT_BUFFER_VIEW_REC *view; @@ -259,7 +259,7 @@ static void sig_gui_print_text(WINDOW_REC *window, void *fgcolor, return; } - lineinfo.level = GPOINTER_TO_INT(level); + lineinfo.level = GPOINTER_TO_INT(dest->level); lineinfo.time = time(NULL); gui = WINDOW_GUI(window);