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

Merge pull request #61 from ailin-nemui/actlist_separator

Browse Source 
Actlist separator

(cherry picked from commit d523ceacf0)
This commit is contained in:
ailin-nemui 2022-02-06 14:38:57 +01:00 committed by Ailin Nemui
parent 5997b2654b
commit dc15cc3969
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fe-text/statusbar-items.c
View File

@ -33,6 +33,7 @@
static GList *activity_list; static GList *activity_list;
static guint8 actlist_sort; static guint8 actlist_sort;
static char *actlist_separator;
static GSList *more_visible; /* list of MAIN_WINDOW_RECs which have --more-- */ static GSList *more_visible; /* list of MAIN_WINDOW_RECs which have --more-- */
static GHashTable *input_entries; static GHashTable *input_entries;
static int last_lag, last_lag_unknown, lag_timeout_tag; static int last_lag, last_lag_unknown, lag_timeout_tag;
@ -96,7 +97,8 @@ static char *get_activity_list(MAIN_WINDOW_REC *window, int normal, int hilight)
/* comma separator */ /* comma separator */
if (str->len > 0) { if (str->len > 0) {
value = theme_format_expand(theme, "{sb_act_sep ,}"); g_string_printf(format, "{sb_act_sep %s}", actlist_separator);
value = theme_format_expand(theme, format->str);
g_string_append(str, value); g_string_append(str, value);
g_free(value); g_free(value);
} }
@ -451,10 +453,18 @@ static void item_input(SBAR_ITEM_REC *item, int get_size_only)
static void read_settings(void) static void read_settings(void)
{ {
const char *sep;
if (active_entry != NULL) if (active_entry != NULL)
gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8); gui_entry_set_utf8(active_entry, term_type == TERM_TYPE_UTF8);
actlist_sort = settings_get_choice("actlist_sort"); actlist_sort = settings_get_choice("actlist_sort");
sep = settings_get_str("actlist_separator");
if (g_strcmp0(actlist_separator, sep) != 0) {
g_free(actlist_separator);
actlist_separator = g_strdup(sep);
statusbar_items_redraw("act");
}
} }
void statusbar_items_init(void) void statusbar_items_init(void)
@ -462,6 +472,7 @@ void statusbar_items_init(void)
settings_add_time("misc", "lag_min_show", "1sec"); settings_add_time("misc", "lag_min_show", "1sec");
settings_add_choice("lookandfeel", "actlist_sort", 0, "refnum;recent;level;level,recent"); settings_add_choice("lookandfeel", "actlist_sort", 0, "refnum;recent;level;level,recent");
settings_add_bool("lookandfeel", "actlist_names", FALSE); settings_add_bool("lookandfeel", "actlist_names", FALSE);
settings_add_str("lookandfeel", "actlist_separator", ",");
settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE); settings_add_bool("lookandfeel", "actlist_prefer_window_name", FALSE);
statusbar_item_register("window", NULL, item_window_active); statusbar_item_register("window", NULL, item_window_active);