1 files changed, 46 insertions, 22 deletions

diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index cb1cce8f..e9818be9 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -130,7 +130,7 @@ static char *theme_replace_expand(THEME_REC *theme, int index,
 	abstract = rec->data;
 	abstract = theme_format_expand_data(theme, (const char **) &abstract,
 					    default_fg, default_bg,
-					    last_fg, last_bg, flags);
+					    last_fg, last_bg, (flags | EXPAND_FLAG_IGNORE_REPLACES));
 	ret = parse_special_string(abstract, NULL, NULL, data, NULL,
 				   PARSE_FLAG_ONLY_ARGS);
 	g_free(abstract);
@@ -382,7 +382,8 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
 		} else {
 			theme_format_append_next(theme, str, format,
 						 reset, reset,
-						 &dummy, &dummy, 0);
+						 &dummy, &dummy,
+						 EXPAND_FLAG_IGNORE_REPLACES);
 			continue;
 		}
 
@@ -400,16 +401,19 @@ char *theme_format_expand_get(THEME_REC *theme, const char **format)
         return ret;
 }
 
+static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
+                                          theme_rm_col default_fg, theme_rm_col default_bg,
+                                          theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
+                                          int flags, GTree *block_list);
+
 /* expand a single {abstract ...data... } */
-static char *theme_format_expand_abstract(THEME_REC *theme,
-					  const char **formatp,
-					  theme_rm_col *last_fg,
-					  theme_rm_col *last_bg,
-					  int flags)
+static char *theme_format_expand_abstract(THEME_REC *theme, const char **formatp,
+                                          theme_rm_col *last_fg, theme_rm_col *last_bg, int flags,
+                                          GTree *block_list)
 {
 	GString *str;
 	const char *p, *format;
-	char *abstract, *data, *ret;
+	char *abstract, *data, *ret, *blocking;
 	theme_rm_col default_fg, default_bg;
 	int len;
 
@@ -439,12 +443,22 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 	}
 	*formatp = format+len;
 
+	if (block_list == NULL) {
+		block_list = g_tree_new_full((GCompareDataFunc) g_strcmp0, NULL, g_free, NULL);
+	} else {
+		g_tree_ref(block_list);
+	}
+
 	/* get the abstract data */
 	data = g_hash_table_lookup(theme->abstracts, abstract);
-	g_free(abstract);
-	if (data == NULL) {
+	if (data == NULL || g_tree_lookup(block_list, abstract) != NULL) {
 		/* unknown abstract, just display the data */
 		data = "$0-";
+		g_free(abstract);
+		blocking = NULL;
+	} else {
+		blocking = abstract;
+		g_tree_insert(block_list, blocking, blocking);
 	}
 	abstract = g_strdup(data);
 
@@ -473,7 +487,7 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 	str = g_string_new(NULL);
 	p = ret;
 	while (*p != '\0') {
-		if (*p == '\\') {
+		if (*p == '\\' && p[1] != '\0') {
 			int chr;
 			p++;
 			chr = expand_escape(&p);
@@ -488,18 +502,20 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 
 	/* abstract may itself contain abstracts or replaces */
 	p = abstract;
-	ret = theme_format_expand_data(theme, &p, default_fg, default_bg,
-				       last_fg, last_bg,
-				       flags | EXPAND_FLAG_LASTCOLOR_ARG);
+	ret = theme_format_expand_data_rec(theme, &p, default_fg, default_bg, last_fg, last_bg,
+	                                   flags | EXPAND_FLAG_LASTCOLOR_ARG, block_list);
 	g_free(abstract);
+	if (blocking != NULL) {
+		g_tree_remove(block_list, blocking);
+	}
+	g_tree_unref(block_list);
 	return ret;
 }
 
-/* expand the data part in {abstract data} */
-char *theme_format_expand_data(THEME_REC *theme, const char **format,
-			       theme_rm_col default_fg, theme_rm_col default_bg,
-			       theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
-			       int flags)
+static char *theme_format_expand_data_rec(THEME_REC *theme, const char **format,
+                                          theme_rm_col default_fg, theme_rm_col default_bg,
+                                          theme_rm_col *save_last_fg, theme_rm_col *save_last_bg,
+                                          int flags, GTree *block_list)
 {
 	GString *str;
 	char *ret, *abstract;
@@ -545,9 +561,8 @@ char *theme_format_expand_data(THEME_REC *theme, const char **format,
 			break; /* error */
 
 		/* get a single {...} */
-		abstract = theme_format_expand_abstract(theme, format,
-							&last_fg, &last_bg,
-							recurse_flags);
+		abstract = theme_format_expand_abstract(theme, format, &last_fg, &last_bg,
+		                                        recurse_flags, block_list);
 		if (abstract != NULL) {
 			g_string_append(str, abstract);
 			g_free(abstract);
@@ -565,6 +580,15 @@ char *theme_format_expand_data(THEME_REC *theme, const char **format,
         return ret;
 }
 
+/* expand the data part in {abstract data} */
+char *theme_format_expand_data(THEME_REC *theme, const char **format, theme_rm_col default_fg,
+                               theme_rm_col default_bg, theme_rm_col *save_last_fg,
+                               theme_rm_col *save_last_bg, int flags)
+{
+	return theme_format_expand_data_rec(theme, format, default_fg, default_bg, save_last_bg,
+	                                    save_last_bg, flags, NULL);
+}
+
 #define IS_OLD_FORMAT(code, last_fg, last_bg) \
 	(((code) == 'n' && (last_fg) == 'n' && (last_bg) == 'n') || \
 	((code) != 'n' && ((code) == (last_fg) || (code) == (last_bg))))