mirror of
https://github.com/profanity-im/profanity.git
synced 2024-11-03 19:37:16 -05:00
Fix pagination in statusbar
This commit changes the current behaviour which displays always the first tabs until `maxtabs` to display N tabs around the currently selected tab. So if we are having a maxtab of 1 and the actively selected window is 2, then 2 is displayed only. So far we have only displayed `>` to indicate that there are more windows. Since this PR shifts the range of tabs that are displayed we also add `<` indicator now to indicate windows to the left of the currently displayed. Fix https://github.com/profanity-im/profanity/issues/1283 Fix https://github.com/profanity-im/profanity/issues/1764
This commit is contained in:
parent
62e1de0f51
commit
619309ad9b
@ -78,15 +78,18 @@ static GTimeZone* tz;
|
|||||||
static StatusBar* statusbar;
|
static StatusBar* statusbar;
|
||||||
static WINDOW* statusbar_win;
|
static WINDOW* statusbar_win;
|
||||||
|
|
||||||
|
void _get_range_bounds(int* start, int* end);
|
||||||
static int _status_bar_draw_time(int pos);
|
static int _status_bar_draw_time(int pos);
|
||||||
static int _status_bar_draw_maintext(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_bracket(gboolean current, int pos, const char* ch);
|
||||||
static int _status_bar_draw_extended_tabs(int pos);
|
static int _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end);
|
||||||
static int _status_bar_draw_tab(StatusBarTab* tab, int pos, int num);
|
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);
|
static void _destroy_tab(StatusBarTab* tab);
|
||||||
static int _tabs_width(void);
|
static int _tabs_width(int start, int end);
|
||||||
|
static unsigned int _count_digits(int number);
|
||||||
|
static unsigned int _count_digits_in_range(int start, int end);
|
||||||
static char* _display_name(StatusBarTab* tab);
|
static char* _display_name(StatusBarTab* tab);
|
||||||
static gboolean _extended_new(void);
|
|
||||||
static gboolean _tabmode_is_actlist(void);
|
static gboolean _tabmode_is_actlist(void);
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -282,26 +285,40 @@ status_bar_draw(void)
|
|||||||
werase(statusbar_win);
|
werase(statusbar_win);
|
||||||
wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));
|
wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));
|
||||||
|
|
||||||
|
gint max_tabs = prefs_get_statusbartabs();
|
||||||
int pos = 1;
|
int pos = 1;
|
||||||
|
|
||||||
pos = _status_bar_draw_time(pos);
|
pos = _status_bar_draw_time(pos);
|
||||||
|
|
||||||
pos = _status_bar_draw_maintext(pos);
|
pos = _status_bar_draw_maintext(pos);
|
||||||
|
if (max_tabs != 0)
|
||||||
|
pos = _status_bar_draw_tabs(pos);
|
||||||
|
|
||||||
|
wnoutrefresh(statusbar_win);
|
||||||
|
inp_put_back();
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_status_bar_draw_tabs(int pos)
|
||||||
|
{
|
||||||
if (!_tabmode_is_actlist()) {
|
if (!_tabmode_is_actlist()) {
|
||||||
pos = getmaxx(stdscr) - _tabs_width();
|
int start, end;
|
||||||
|
_get_range_bounds(&start, &end);
|
||||||
|
|
||||||
|
pos = getmaxx(stdscr) - _tabs_width(start, end);
|
||||||
if (pos < 0) {
|
if (pos < 0) {
|
||||||
pos = 0;
|
pos = 0;
|
||||||
}
|
}
|
||||||
gint max_tabs = prefs_get_statusbartabs();
|
|
||||||
for (int i = 1; i <= max_tabs; i++) {
|
pos = _status_bar_draw_extended_tabs(pos, TRUE, start, end);
|
||||||
|
|
||||||
|
for (int i = start; i <= end; i++) {
|
||||||
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
||||||
if (tab) {
|
if (tab) {
|
||||||
pos = _status_bar_draw_tab(tab, pos, i);
|
pos = _status_bar_draw_tab(tab, pos, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_status_bar_draw_extended_tabs(pos);
|
pos = _status_bar_draw_extended_tabs(pos, FALSE, start, end);
|
||||||
} else {
|
} else {
|
||||||
pos++;
|
pos++;
|
||||||
guint print_act = 0;
|
guint print_act = 0;
|
||||||
@ -339,13 +356,13 @@ status_bar_draw(void)
|
|||||||
pos = _status_bar_draw_bracket(FALSE, pos, "]");
|
pos = _status_bar_draw_bracket(FALSE, pos, "]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return pos;
|
||||||
wnoutrefresh(statusbar_win);
|
|
||||||
inp_put_back();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Checks if there are highlighted (unread) messages on the (left side if `left_side` is true, else right side)
|
||||||
|
// within the current displayed tabs range.
|
||||||
static gboolean
|
static gboolean
|
||||||
_extended_new(void)
|
_has_new_msgs_beyond_range_on_side(gboolean left_side, int display_tabs_start, int display_tabs_end)
|
||||||
{
|
{
|
||||||
gint max_tabs = prefs_get_statusbartabs();
|
gint max_tabs = prefs_get_statusbartabs();
|
||||||
int tabs_count = g_hash_table_size(statusbar->tabs);
|
int tabs_count = g_hash_table_size(statusbar->tabs);
|
||||||
@ -353,7 +370,10 @@ _extended_new(void)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = max_tabs + 1; i <= tabs_count; i++) {
|
int start = left_side ? 1 : display_tabs_end + 1;
|
||||||
|
int end = left_side ? display_tabs_start - 1 : tabs_count;
|
||||||
|
|
||||||
|
for (int i = start; i <= end; i++) {
|
||||||
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
||||||
if (tab && tab->highlight) {
|
if (tab && tab->highlight) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -364,36 +384,43 @@ _extended_new(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_status_bar_draw_extended_tabs(int pos)
|
_status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end)
|
||||||
{
|
{
|
||||||
gint max_tabs = prefs_get_statusbartabs();
|
gint max_tabs = prefs_get_statusbartabs();
|
||||||
if (max_tabs == 0) {
|
if (max_tabs == 0) {
|
||||||
return pos;
|
return pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_hash_table_size(statusbar->tabs) > max_tabs) {
|
guint opened_tabs = g_hash_table_size(statusbar->tabs);
|
||||||
gboolean is_current = statusbar->current_tab > max_tabs;
|
if (g_hash_table_size(statusbar->tabs) <= max_tabs) {
|
||||||
|
return pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (prefix && start < 2) {
|
||||||
|
return pos;
|
||||||
|
}
|
||||||
|
if (!prefix && end > opened_tabs - 1) {
|
||||||
|
return pos;
|
||||||
|
}
|
||||||
|
gboolean is_current = FALSE;
|
||||||
|
|
||||||
pos = _status_bar_draw_bracket(is_current, pos, "[");
|
pos = _status_bar_draw_bracket(is_current, pos, "[");
|
||||||
|
|
||||||
int status_attrs;
|
int status_attrs;
|
||||||
if (is_current) {
|
|
||||||
// currently selected
|
if (_has_new_msgs_beyond_range_on_side(prefix, start, end)) {
|
||||||
status_attrs = theme_attrs(THEME_STATUS_CURRENT);
|
// Apply theme attributes for a tab with new messages.
|
||||||
} else if (_extended_new()) {
|
|
||||||
// new one
|
|
||||||
status_attrs = theme_attrs(THEME_STATUS_NEW);
|
status_attrs = theme_attrs(THEME_STATUS_NEW);
|
||||||
} else {
|
} else {
|
||||||
// all other
|
// Apply theme attributes for a tab without new messages.
|
||||||
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
|
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
|
||||||
}
|
}
|
||||||
wattron(statusbar_win, status_attrs);
|
wattron(statusbar_win, status_attrs);
|
||||||
mvwprintw(statusbar_win, 0, pos, ">");
|
mvwprintw(statusbar_win, 0, pos, prefix ? "<" : ">");
|
||||||
wattroff(statusbar_win, status_attrs);
|
wattroff(statusbar_win, status_attrs);
|
||||||
pos++;
|
pos++;
|
||||||
|
|
||||||
pos = _status_bar_draw_bracket(is_current, pos, "]");
|
pos = _status_bar_draw_bracket(is_current, pos, "]");
|
||||||
}
|
|
||||||
|
|
||||||
return pos;
|
return pos;
|
||||||
}
|
}
|
||||||
@ -401,7 +428,6 @@ _status_bar_draw_extended_tabs(int pos)
|
|||||||
static int
|
static int
|
||||||
_status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
|
_status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
|
||||||
{
|
{
|
||||||
int display_num = num == 10 ? 0 : num;
|
|
||||||
gboolean is_current = num == statusbar->current_tab;
|
gboolean is_current = num == statusbar->current_tab;
|
||||||
|
|
||||||
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
||||||
@ -424,8 +450,9 @@ _status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
|
|||||||
}
|
}
|
||||||
wattron(statusbar_win, status_attrs);
|
wattron(statusbar_win, status_attrs);
|
||||||
if (show_number) {
|
if (show_number) {
|
||||||
mvwprintw(statusbar_win, 0, pos, "%d", display_num);
|
mvwprintw(statusbar_win, 0, pos, "%d", num);
|
||||||
pos++;
|
// calculate number of digits
|
||||||
|
pos += _count_digits(num);
|
||||||
}
|
}
|
||||||
if (show_number && show_name) {
|
if (show_number && show_name) {
|
||||||
mvwprintw(statusbar_win, 0, pos, ":");
|
mvwprintw(statusbar_win, 0, pos, ":");
|
||||||
@ -585,16 +612,19 @@ _destroy_tab(StatusBarTab* tab)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_tabs_width(void)
|
_tabs_width(int start, int end)
|
||||||
{
|
{
|
||||||
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
|
||||||
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
|
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
|
||||||
gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ);
|
gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ);
|
||||||
gint max_tabs = prefs_get_statusbartabs();
|
gint max_tabs = prefs_get_statusbartabs();
|
||||||
|
guint opened_tabs = g_hash_table_size(statusbar->tabs);
|
||||||
|
|
||||||
|
int width = start < 2 ? 1 : 4;
|
||||||
|
width += end > opened_tabs - 1 ? 0 : 3;
|
||||||
|
|
||||||
if (show_name && show_number) {
|
if (show_name && show_number) {
|
||||||
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
|
for (int i = start; i <= end; i++) {
|
||||||
for (int i = 1; i <= max_tabs; i++) {
|
|
||||||
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
||||||
if (tab) {
|
if (tab) {
|
||||||
gboolean is_current = i == statusbar->current_tab;
|
gboolean is_current = i == statusbar->current_tab;
|
||||||
@ -604,15 +634,14 @@ _tabs_width(void)
|
|||||||
|
|
||||||
auto_char char* display_name = _display_name(tab);
|
auto_char char* display_name = _display_name(tab);
|
||||||
width += utf8_display_len(display_name);
|
width += utf8_display_len(display_name);
|
||||||
width += 4;
|
width += 3 + _count_digits(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return width;
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (show_name && !show_number) {
|
if (show_name && !show_number) {
|
||||||
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
|
for (int i = start; i <= end; i++) {
|
||||||
for (int i = 1; i <= max_tabs; i++) {
|
|
||||||
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
|
||||||
if (tab) {
|
if (tab) {
|
||||||
gboolean is_current = i == statusbar->current_tab;
|
gboolean is_current = i == statusbar->current_tab;
|
||||||
@ -628,10 +657,12 @@ _tabs_width(void)
|
|||||||
return width;
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_hash_table_size(statusbar->tabs) > max_tabs) {
|
if (opened_tabs > max_tabs) {
|
||||||
return max_tabs * 3 + (g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1);
|
width += _count_digits_in_range(start, end);
|
||||||
|
width += start > end ? 0 : (end - start) * 3;
|
||||||
|
return width;
|
||||||
}
|
}
|
||||||
return g_hash_table_size(statusbar->tabs) * 3 + (g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1);
|
return opened_tabs * 3 + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char*
|
static char*
|
||||||
@ -679,3 +710,56 @@ _display_name(StatusBarTab* tab)
|
|||||||
|
|
||||||
return trimmedname;
|
return trimmedname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_get_range_bounds(int* start, int* end)
|
||||||
|
{
|
||||||
|
int current_tab = statusbar->current_tab;
|
||||||
|
gint display_range = prefs_get_statusbartabs();
|
||||||
|
int total_tabs = g_hash_table_size(statusbar->tabs);
|
||||||
|
int side_range = display_range / 2;
|
||||||
|
|
||||||
|
if (total_tabs <= display_range) {
|
||||||
|
*start = 1;
|
||||||
|
*end = total_tabs;
|
||||||
|
} else if (current_tab - side_range <= 1) {
|
||||||
|
*start = 1;
|
||||||
|
*end = display_range;
|
||||||
|
} else if (current_tab + side_range >= total_tabs) {
|
||||||
|
*start = total_tabs - display_range + 1;
|
||||||
|
*end = total_tabs;
|
||||||
|
} else {
|
||||||
|
*start = current_tab - side_range;
|
||||||
|
*end = current_tab + side_range;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Counts amount of digits in a number
|
||||||
|
static unsigned int
|
||||||
|
_count_digits(int number)
|
||||||
|
{
|
||||||
|
unsigned int digits_count = 0;
|
||||||
|
if (number < 0)
|
||||||
|
number = -number;
|
||||||
|
|
||||||
|
do {
|
||||||
|
number /= 10;
|
||||||
|
digits_count++;
|
||||||
|
} while (number != 0);
|
||||||
|
|
||||||
|
return digits_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Counts the total number of digits in a range of numbers, inclusive.
|
||||||
|
// Example: _count_digits_in_range(2, 3) returns 2, _count_digits_in_range(2, 922) returns 2657
|
||||||
|
static unsigned int
|
||||||
|
_count_digits_in_range(int start, int end)
|
||||||
|
{
|
||||||
|
int total_digits = 0;
|
||||||
|
|
||||||
|
for (int i = start; i <= end; i++) {
|
||||||
|
total_digits += _count_digits(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return total_digits;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user