aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Factor out printformat_module_dest_charargs function from

Browse Source 
printformat_module_dest_args and use it in printformat_perl to remove code
duplication.


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4979 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2009-01-10 15:00:06 +00:00 committed by exg
parent edc7dc26fe
commit 5b4e05c553
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fe-common/core/printtext.c
View File

@ -49,16 +49,23 @@ void printformat_module_dest_args(const char *module, TEXT_DEST_REC *dest,
char *arglist[MAX_FORMAT_PARAMS]; char *arglist[MAX_FORMAT_PARAMS];
char buffer[DEFAULT_FORMAT_ARGLIST_SIZE]; char buffer[DEFAULT_FORMAT_ARGLIST_SIZE];
FORMAT_REC *formats; FORMAT_REC *formats;
THEME_REC *theme;
char *str;
theme = window_get_theme(dest->window);
formats = g_hash_table_lookup(default_formats, module); formats = g_hash_table_lookup(default_formats, module);
format_read_arglist(va, &formats[formatnum], format_read_arglist(va, &formats[formatnum],
arglist, sizeof(arglist)/sizeof(char *), arglist, sizeof(arglist)/sizeof(char *),
buffer, sizeof(buffer)); buffer, sizeof(buffer));
printformat_module_dest_charargs(module, dest, formatnum, arglist);
}
void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest,
int formatnum, char **arglist)
{
THEME_REC *theme;
char *str;
theme = window_get_theme(dest->window);
if (!sending_print_starting) { if (!sending_print_starting) {
sending_print_starting = TRUE; sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, dest); signal_emit_id(signal_print_starting, 1, dest);

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

@ -11,6 +11,7 @@ void printformat_module_dest(const char *module, TEXT_DEST_REC *dest, int format
void printformat_module_args(const char *module, void *server, const char *target, int level, int formatnum, va_list va); void printformat_module_args(const char *module, void *server, const char *target, int level, int formatnum, va_list va);
void printformat_module_window_args(const char *module, WINDOW_REC *window, int level, int formatnum, va_list va); void printformat_module_window_args(const char *module, WINDOW_REC *window, int level, int formatnum, va_list va);
void printformat_module_dest_args(const char *module, TEXT_DEST_REC *dest, int formatnum, va_list va); void printformat_module_dest_args(const char *module, TEXT_DEST_REC *dest, int formatnum, va_list va);
void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest, int formatnum, char **arglist);
void printtext(void *server, const char *target, int level, const char *text, ...); 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_string(void *server, const char *target, int level, const char *text);

12
src/perl/ui/Themes.xs
View File

@ -2,8 +2,7 @@
static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist) static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
{ {
THEME_REC *theme; char *module;
char *module, *str;
int formatnum; int formatnum;
module = g_strdup(perl_get_package()); module = g_strdup(perl_get_package());
@ -14,14 +13,7 @@ static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
return; return;
} }
theme = dest->window->theme == NULL ? current_theme : printformat_module_dest_charargs(module, dest, formatnum, arglist);
dest->window->theme;
signal_emit("print format", 5, theme, module,
dest, GINT_TO_POINTER(formatnum), arglist);
str = format_get_text_theme_charargs(theme, module, dest, formatnum, arglist);
if (*str != '\0') printtext_dest(dest, "%s", str);
g_free(str);
g_free(module); g_free(module);
} }