From 917558dc87116775a4ebb4a81db64e5f62ff5983 Mon Sep 17 00:00:00 2001 From: John Hernandez <129467592+H3rnand3zzz@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:58:46 +0100 Subject: [PATCH] Separate new tabmode in a setting Return static tabmode as default, separate previous change in `dynamic` mode. Despite usefulness of the solution, it was not approved to be a new default. Vote (link below) amongst users to change default has shown inconclusive result and it was not representative, as it had low number of participants. https://github.com/profanity-im/profanity/pull/1912#issuecomment-1816232546 --- src/command/cmd_ac.c | 1 + src/command/cmd_defs.c | 4 ++-- src/command/cmd_funcs.c | 7 ++----- src/ui/statusbar.c | 23 +++++++++++++---------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 7dcd65f6..1d1bca0e 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -1068,6 +1068,7 @@ cmd_ac_init(void) statusbar_tabmode_ac = autocomplete_new(); autocomplete_add(statusbar_tabmode_ac, "actlist"); + autocomplete_add(statusbar_tabmode_ac, "dynamic"); autocomplete_add(statusbar_tabmode_ac, "default"); status_ac = autocomplete_new(); diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index e5d997b9..727b8dd1 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -1289,7 +1289,7 @@ static const struct cmd_t command_defs[] = { "/statusbar hide name|number|read", "/statusbar maxtabs ", "/statusbar tablen ", - "/statusbar tabmode default|actlist", + "/statusbar tabmode default|dynamic|actlist", "/statusbar self user|barejid|fulljid|off", "/statusbar chat user|jid", "/statusbar room title bookmark|jid|localpart|name", @@ -1300,7 +1300,7 @@ static const struct cmd_t command_defs[] = { CMD_ARGS( { "maxtabs ", "Set the maximum number of tabs to display, must be between 0 and 10." }, { "tablen ", "Set the maximum number of characters to show as the tab name, 0 sets to unlimited." }, - { "tabmode default|actlist", "Set the mode how the 'active tabs' are shown." }, + { "tabmode default|dynamic|actlist", "Set the mode tabs are shown. `dynamic` is a mode that displays tabs conveniently around current tab, thus providing proper pagination. `actlist` setting shows only active tabs. `default` setting always shows tabs in 1 to max_tabs range." }, { "show|hide name", "Show or hide names in tabs." }, { "show|hide number", "Show or hide numbers in tabs." }, { "show|hide read", "Show or hide inactive tabs." }, diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 4c39d040..5f9eaf66 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -6273,14 +6273,11 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args) } if (g_strcmp0(args[0], "tabmode") == 0) { - char* tabmode = NULL; - if ((g_strcmp0(args[1], "default") == 0) || (g_strcmp0(args[1], "actlist") == 0)) { - tabmode = args[1]; - } - if (tabmode == NULL) { + if ((g_strcmp0(args[1], "default") != 0) && (g_strcmp0(args[1], "actlist") != 0) && (g_strcmp0(args[1], "dynamic") != 0)) { cons_bad_cmd_usage(command); return TRUE; } + char* tabmode = args[1]; prefs_set_string(PREF_STATUSBAR_TABMODE, tabmode); cons_show("Using \"%s\" tabmode for statusbar.", tabmode); ui_resize(); diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 281550f7..05bc4b44 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -78,11 +78,11 @@ static GTimeZone* tz; static StatusBar* statusbar; static WINDOW* statusbar_win; -void _get_range_bounds(int* start, int* end); +void _get_range_bounds(int* start, int* end, gboolean is_static); static int _status_bar_draw_time(int pos); static int _status_bar_draw_maintext(int pos); static int _status_bar_draw_bracket(gboolean current, int pos, const char* ch); -static int _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end); +static int _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gboolean is_static); static int _status_bar_draw_tab(StatusBarTab* tab, int pos, int num); static int _status_bar_draw_tabs(int pos); static void _destroy_tab(StatusBarTab* tab); @@ -300,16 +300,19 @@ status_bar_draw(void) static int _status_bar_draw_tabs(int pos) { - if (!_tabmode_is_actlist()) { + auto_gchar gchar* tabmode = prefs_get_string(PREF_STATUSBAR_TABMODE); + + if (g_strcmp0(tabmode, "actlist") != 0) { int start, end; - _get_range_bounds(&start, &end); + gboolean is_static = g_strcmp0(tabmode, "dynamic") != 0; + _get_range_bounds(&start, &end, is_static); pos = getmaxx(stdscr) - _tabs_width(start, end); if (pos < 0) { pos = 0; } - pos = _status_bar_draw_extended_tabs(pos, TRUE, start, end); + pos = _status_bar_draw_extended_tabs(pos, TRUE, start, end, is_static); for (int i = start; i <= end; i++) { StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i)); @@ -318,7 +321,7 @@ _status_bar_draw_tabs(int pos) } } - pos = _status_bar_draw_extended_tabs(pos, FALSE, start, end); + pos = _status_bar_draw_extended_tabs(pos, FALSE, start, end, is_static); } else { pos++; guint print_act = 0; @@ -384,7 +387,7 @@ _has_new_msgs_beyond_range_on_side(gboolean left_side, int display_tabs_start, i } static int -_status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end) +_status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gboolean is_static) { gint max_tabs = prefs_get_statusbartabs(); if (max_tabs == 0) { @@ -402,7 +405,7 @@ _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end) if (!prefix && end > opened_tabs - 1) { return pos; } - gboolean is_current = FALSE; + gboolean is_current = is_static && statusbar->current_tab > max_tabs; pos = _status_bar_draw_bracket(is_current, pos, "["); @@ -712,7 +715,7 @@ _display_name(StatusBarTab* tab) } void -_get_range_bounds(int* start, int* end) +_get_range_bounds(int* start, int* end, gboolean is_static) { int current_tab = statusbar->current_tab; gint display_range = prefs_get_statusbartabs(); @@ -722,7 +725,7 @@ _get_range_bounds(int* start, int* end) if (total_tabs <= display_range) { *start = 1; *end = total_tabs; - } else if (current_tab - side_range <= 1) { + } else if (current_tab - side_range <= 1 || is_static) { *start = 1; *end = display_range; } else if (current_tab + side_range >= total_tabs) {