jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Added output_format_get_text() function for querying text formats.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@563 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-31 22:01:32 +00:00 committed by cras
parent 059c0f715d
commit 01a4f9fe04
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ static void create_dest_rec(TEXT_DEST_REC *dest,
} }
static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format, static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
const char *text, va_list args) const char *text, va_list va)
{ {
GString *out; GString *out;
char *arglist[10]; char *arglist[10];
@ -363,7 +363,7 @@ static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
/* read all optional arguments to arglist[] list /* read all optional arguments to arglist[] list
so they can be used in any order.. */ so they can be used in any order.. */
read_arglist(args, format, read_arglist(va, format,
arglist, sizeof(arglist)/sizeof(void*), arglist, sizeof(arglist)/sizeof(void*),
buffer, sizeof(buffer)); buffer, sizeof(buffer));
@ -405,22 +405,49 @@ static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
return ret; return ret;
} }
char *output_format_get_text(const char *module, WINDOW_REC *window,
void *server, const char *channel,
int formatnum, ...)
{
TEXT_DEST_REC dest;
THEME_REC *theme;
MODULE_THEME_REC *module_theme;
FORMAT_REC *formats;
va_list va;
char *ret;
create_dest_rec(&dest, server, channel, 0, window);
theme = dest.window->theme == NULL ? current_theme :
dest.window->theme;
module_theme = g_hash_table_lookup(theme->modules, module);
formats = g_hash_table_lookup(default_formats, module);
va_start(va, formatnum);
ret = output_format_text_args(&dest, &formats[formatnum],
module_theme == NULL ? NULL :
module_theme->formats[formatnum], va);
va_end(va);
return ret;
}
static char *output_format_text(TEXT_DEST_REC *dest, int formatnum, ...) static char *output_format_text(TEXT_DEST_REC *dest, int formatnum, ...)
{ {
THEME_REC *theme; THEME_REC *theme;
MODULE_THEME_REC *module_theme; MODULE_THEME_REC *module_theme;
va_list args; va_list va;
char *ret; char *ret;
theme = dest->window->theme == NULL ? current_theme : theme = dest->window->theme == NULL ? current_theme :
dest->window->theme; dest->window->theme;
module_theme = g_hash_table_lookup(theme->modules, MODULE_NAME); module_theme = g_hash_table_lookup(theme->modules, MODULE_NAME);
va_start(args, formatnum); va_start(va, formatnum);
ret = output_format_text_args(dest, &fecommon_core_formats[formatnum], ret = output_format_text_args(dest, &fecommon_core_formats[formatnum],
module_theme == NULL ? NULL : module_theme == NULL ? NULL :
module_theme->formats[formatnum], args); module_theme->formats[formatnum], va);
va_end(args); va_end(va);
return ret; return ret;
} }

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

@ -26,6 +26,10 @@ typedef struct {
#define PRINTFLAG_MIRC_COLOR 0x20 #define PRINTFLAG_MIRC_COLOR 0x20
#define PRINTFLAG_INDENT 0x40 #define PRINTFLAG_INDENT 0x40
char *output_format_get_text(const char *module, WINDOW_REC *window,
void *server, const char *channel,
int formatnum, ...);
void printformat_module(const char *module, void *server, const char *channel, int level, int formatnum, ...); void printformat_module(const char *module, void *server, const char *channel, int level, int formatnum, ...);
void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...); void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);