devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #1978 from profanity-im/feat/1974-actlist

Browse Source 
Make statusbar actlist respect the /statusbar show setting
This commit is contained in:
Michael Vetter
2024-06-20 12:47:34 +02:00
committed by GitHub
parent 534c14917a ebcb198f09
commit 29fd8199f1
1 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/ui/statusbar.c
View File

@@ -83,7 +83,7 @@ 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, gboolean prefix, int start, int end, gboolean is_static); 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_tab(StatusBarTab* tab, int pos, int num, gboolean include_brackets);
static int _status_bar_draw_tabs(int pos); static int _status_bar_draw_tabs(int pos);
static void _destroy_tab(StatusBarTab* tab); static void _destroy_tab(StatusBarTab* tab);
static int _tabs_width(int start, int end); static int _tabs_width(int start, int end);
@@ -317,7 +317,7 @@ _status_bar_draw_tabs(int pos)
for (int i = start; i <= end; i++) { 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, TRUE);
} }
} }
@@ -342,14 +342,9 @@ _status_bar_draw_tabs(int pos)
for (guint i = 1; i <= tabnum && print_act; ++i) { for (guint i = 1; i <= tabnum && print_act; ++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) {
if (print_act == 1) { pos = _status_bar_draw_tab(tab, pos, i, FALSE);
mvwprintw(statusbar_win, 0, pos, "%d", i); if (print_act > 1) {
pos++; mvwprintw(statusbar_win, 0, pos, ",");
} else {
mvwprintw(statusbar_win, 0, pos, "%d,", i);
pos += 2;
}
for (guint limit = 10; i >= limit; limit *= 10) {
pos++; pos++;
} }
print_act--; print_act--;
@@ -429,7 +424,7 @@ _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gbo
} }
static int static int
_status_bar_draw_tab(StatusBarTab* tab, int pos, int num) _status_bar_draw_tab(StatusBarTab* tab, int pos, int num, gboolean include_brackets)
{ {
gboolean is_current = num == statusbar->current_tab; gboolean is_current = num == statusbar->current_tab;
@@ -441,7 +436,9 @@ _status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
if (!show_read && !is_current && !tab->highlight) if (!show_read && !is_current && !tab->highlight)
return pos; return pos;
pos = _status_bar_draw_bracket(is_current, pos, "["); if (include_brackets) {
pos = _status_bar_draw_bracket(is_current, pos, "[");
}
int status_attrs; int status_attrs;
if (is_current) { if (is_current) {
@@ -468,7 +465,9 @@ _status_bar_draw_tab(StatusBarTab* tab, int pos, int num)
} }
wattroff(statusbar_win, status_attrs); wattroff(statusbar_win, status_attrs);
pos = _status_bar_draw_bracket(is_current, pos, "]"); if (include_brackets) {
pos = _status_bar_draw_bracket(is_current, pos, "]");
}
return pos; return pos;
} }
@@ -550,39 +549,20 @@ _status_bar_draw_maintext(int pos)
return pos; return pos;
} }
if (statusbar->fulljid) { if (statusbar->fulljid == NULL) {
jidp = jid_create(statusbar->fulljid);
if (g_strcmp0(self, "user") == 0) {
maintext = jidp->localpart;
} else if (g_strcmp0(self, "barejid") == 0) {
maintext = jidp->barejid;
} else {
maintext = statusbar->fulljid;
}
}
if (maintext == NULL) {
return pos; return pos;
} }
if (statusbar->fulljid) { jidp = jid_create(statusbar->fulljid);
auto_gchar gchar* pref = prefs_get_string(PREF_STATUSBAR_SELF); if (!jidp)
return pos;
if (g_strcmp0(pref, "off") == 0) { if (g_strcmp0(self, "user") == 0) {
return pos; maintext = jidp->localpart;
} } else if (g_strcmp0(self, "barejid") == 0) {
if (g_strcmp0(pref, "user") == 0) { maintext = jidp->barejid;
auto_jid Jid* jidp = jid_create(statusbar->fulljid); } else {
mvwprintw(statusbar_win, 0, pos, "%s", jidp->localpart); maintext = statusbar->fulljid;
return pos;
}
if (g_strcmp0(pref, "barejid") == 0) {
auto_jid Jid* jidp = jid_create(statusbar->fulljid);
mvwprintw(statusbar_win, 0, pos, "%s", jidp->barejid);
return pos;
}
mvwprintw(statusbar_win, 0, pos, "%s", statusbar->fulljid);
} }
gboolean actlist_tabmode = _tabmode_is_actlist(); gboolean actlist_tabmode = _tabmode_is_actlist();