From 74396476bb793e12789d1fd1c6bcbea963929a5a Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Wed, 4 Dec 2002 20:19:51 +0000 Subject: [PATCH] Wed Dec 4 21:08:52 CET 2002 Jochen Eisinger * Fixed bugs in Irssi's theme parsing. Affected files irssi/src/fe-common/core/themes.c --- apps/irssi/src/fe-common/core/themes.c | 39 ++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/apps/irssi/src/fe-common/core/themes.c b/apps/irssi/src/fe-common/core/themes.c index baa1d3e5..06880060 100644 --- a/apps/irssi/src/fe-common/core/themes.c +++ b/apps/irssi/src/fe-common/core/themes.c @@ -301,6 +301,40 @@ static int data_is_empty(const char **data) return FALSE; } +/* return "data" from {abstract data} string */ +char *theme_format_expand_get(THEME_REC *theme, const char **format) +{ + GString *str; + char *ret, dummy; + int braces = 1; /* we start with one brace opened */ + + str = g_string_new(NULL); + while ((**format != '\0') && (braces)) { + if (**format == '{') + braces++; + else if (**format == '}') + braces--; + else { + theme_format_append_next(theme, str, format, + 'n', 'n', + &dummy, &dummy, 0); + continue; + } + + if (!braces) { + (*format)++; + break; + } + + g_string_append_c(str, **format); + (*format)++; + } + + ret = str->str; + g_string_free(str, FALSE); + return ret; +} + /* expand a single {abstract ...data... } */ static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp, @@ -345,9 +379,8 @@ static char *theme_format_expand_abstract(THEME_REC *theme, abstract = g_strdup(data); /* we'll need to get the data part. it may contain - more abstracts, they are automatically expanded. */ - data = theme_format_expand_data(theme, formatp, default_fg, default_bg, - NULL, NULL, flags); + more abstracts, they are _NOT_ expanded. */ + data = theme_format_expand_get(theme, formatp); len = strlen(data); if (len > 1 && i_isdigit(data[len-1]) && data[len-2] == '$') { -- 2.24.0