Add static tabmode

As requested by some developers, obsolete static mode has been added.
profanity-im · Nov 16, 2023 · 097025b · 097025b
1 parent ed50f30
commit 097025b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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 <value>",
               "/statusbar tablen <value>",
-              "/statusbar tabmode default|actlist",
+              "/statusbar tabmode default|static|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 <value>", "Set the maximum number of tabs to display, <value> must be between 0 and 10." },
               { "tablen <value>", "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|static|actlist", "Set the mode how the 'active tabs' are shown. Static mode is an obsolete mode that displays windows always from 1 to `max_tabs` without shifting displayed tabs." },
               { "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
@@ -6274,7 +6274,7 @@ 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)) {
+        if ((g_strcmp0(args[1], "default") == 0) || (g_strcmp0(args[1], "actlist") == 0) || (g_strcmp0(args[1], "static") == 0)) {
             tabmode = args[1];
         }
         if (tabmode == NULL) {

diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
@@ -78,7 +78,7 @@ 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);
@@ -300,9 +300,12 @@ 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, "static") == 0;
+        _get_range_bounds(&start, &end, is_static);
 
         pos = getmaxx(stdscr) - _tabs_width(start, end);
         if (pos < 0) {
@@ -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) {