From 22502abf2cda44d5311ba2fd8424bdfd99fb04c0 Mon Sep 17 00:00:00 2001 From: vague666 Date: Fri, 22 Mar 2019 19:10:10 +0100 Subject: [PATCH 1/3] Add setting to choose between window name and visible name in actlist --- src/fe-text/statusbar-items.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c index 5740a40b..bd715950 100644 --- a/src/fe-text/statusbar-items.c +++ b/src/fe-text/statusbar-items.c @@ -123,7 +123,9 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight) window->hilight_color, window->refnum); if (add_name && window->active != NULL) - g_string_append_printf(format, ":%s", window->active->visible_name); + g_string_append_printf(format, ":%s", + settings_get_bool("actlist_prefer_window_name") && + window->name != NULL ? window->name : window->active->visible_name); g_string_append_c(format, '}'); value = theme_format_expand(theme, format->str); @@ -470,6 +472,7 @@ void statusbar_items_init(void) settings_add_time("misc", "lag_min_show", "1sec"); settings_add_str("lookandfeel", "actlist_sort", "refnum"); settings_add_bool("lookandfeel", "actlist_names", FALSE); + settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE); statusbar_item_register("window", NULL, item_window_active); statusbar_item_register("window_empty", NULL, item_window_empty); From 9cdeed2894abd3b76eed91a70d02510c0f840060 Mon Sep 17 00:00:00 2001 From: vague666 Date: Tue, 2 Apr 2019 09:39:03 +0200 Subject: [PATCH 2/3] cache bool value --- src/fe-text/statusbar-items.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c index bd715950..7c86c306 100644 --- a/src/fe-text/statusbar-items.c +++ b/src/fe-text/statusbar-items.c @@ -76,7 +76,7 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight) GString *format; GList *tmp; char *ret, *name, *value; - int is_det; + int is_det, pref_name; int add_name = settings_get_bool("actlist_names"); str = g_string_new(NULL); @@ -122,10 +122,12 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight) g_string_printf(format, "{sb_act_hilight_color %s %d", window->hilight_color, window->refnum); + + pref_name = settings_get_bool("actlist_prefer_window_name"); if (add_name && window->active != NULL) g_string_append_printf(format, ":%s", - settings_get_bool("actlist_prefer_window_name") && - window->name != NULL ? window->name : window->active->visible_name); + pref_name == 1 && window->name != NULL ? + window->name : window->active->visible_name); g_string_append_c(format, '}'); value = theme_format_expand(theme, format->str); From 9d9d99eeb1c07decbe164cc18e02383f35f19689 Mon Sep 17 00:00:00 2001 From: vague666 Date: Mon, 8 Apr 2019 12:32:58 +0200 Subject: [PATCH 3/3] move caching to correct place :) --- src/fe-text/statusbar-items.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c index 7c86c306..27efcbd1 100644 --- a/src/fe-text/statusbar-items.c +++ b/src/fe-text/statusbar-items.c @@ -76,8 +76,9 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight) GString *format; GList *tmp; char *ret, *name, *value; - int is_det, pref_name; + int is_det; int add_name = settings_get_bool("actlist_names"); + int pref_name = settings_get_bool("actlist_prefer_window_name"); str = g_string_new(NULL); format = g_string_new(NULL); @@ -123,7 +124,6 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight) window->hilight_color, window->refnum); - pref_name = settings_get_bool("actlist_prefer_window_name"); if (add_name && window->active != NULL) g_string_append_printf(format, ":%s", pref_name == 1 && window->name != NULL ?