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

Added printtext_string() which works like printtext(), except it prints

Browse source 
text from a string, so that %s, %d, etc. don't work. Changed perl's
Irssi::print() use this instead as well as /HELP printer.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1072 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-05 08:30:01 +00:00 • committed by cras
commit 86aa2d514d
6 changed files with 24 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fe-common/core/fe-core-commands.c
View file

@ -96,14 +96,14 @@ static void help_category(GSList *cmdlist, gint items, gint max)
if (col == cols || tmp->next == NULL)
{
printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s", str->str);
printtext_string(NULL, NULL, MSGLEVEL_CLIENTCRAP, str->str);
g_string_truncate(str, 0);
col = 0; line++;
tmp = g_slist_nth(cmdlist, line-1); skip = 1;
}
}
if (str->len != 0)
printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s", str->str);
printtext_string(NULL, NULL, MSGLEVEL_CLIENTCRAP, str->str);
g_string_free(str, TRUE);
g_free(cmdbuf);
}
@ -131,7 +131,7 @@ static int show_help_rec(COMMAND_REC *cmd)
recvlen = read(f, tmpbuf, sizeof(tmpbuf));
ret = line_split(tmpbuf, recvlen, &str, &buffer);
if (ret > 0) printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s", str);
if (ret > 0) printtext_string(NULL, NULL, MSGLEVEL_CLIENTCRAP, str);
}
while (ret > 0);
line_split_free(buffer);

18
src/fe-common/core/printtext.c
View file

@ -249,6 +249,24 @@ void printtext(void *server, const char *target, int level, const char *text, ..
va_end(va);
}
/* Like printtext(), but don't handle %s etc. */
void printtext_string(void *server, const char *target, int level, const char *text)
{
TEXT_DEST_REC dest;
g_return_if_fail(text != NULL);
format_create_dest(&dest, server, target, level, NULL);
if (!sending_print_starting) {
sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, dest);
sending_print_starting = FALSE;
}
print_line(&dest, text);
}
void printtext_window(WINDOW_REC *window, int level, const char *text, ...)
{
TEXT_DEST_REC dest;

1
src/fe-common/core/printtext.h
View file

@ -10,6 +10,7 @@ void printformat_module_args(const char *module, void *server, const char *targe
void printformat_module_window_args(const char *module, WINDOW_REC *window, int level, int formatnum, va_list va);
void printtext(void *server, const char *target, int level, const char *text, ...);
void printtext_string(void *server, const char *target, int level, const char *text);
void printtext_window(WINDOW_REC *window, int level, const char *text, ...);
void printtext_multiline(void *server, const char *target, int level, const char *format, const char *text);
void printbeep(void);