aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Refactor statusbar

Browse Source
This commit is contained in:
James Booth 2018-03-10 00:32:56 +00:00
parent 6f5c0eb525
commit 73bb628fd8
1 changed files with 113 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
src/ui/statusbar.c
View File

@ -71,6 +71,10 @@ static StatusBar *statusbar;
static WINDOW *statusbar_win; static WINDOW *statusbar_win;
static void _status_bar_draw(void); static void _status_bar_draw(void);
static int _status_bar_draw_time(int pos);
static void _status_bar_draw_message(int pos);
static int _status_bar_draw_bracket(gboolean current, int pos, char* ch);
static int _status_bar_draw_tab(StatusBarTab *tab, int pos, int display_num, gboolean is_current);
static void _destroy_tab(StatusBarTab *tab); static void _destroy_tab(StatusBarTab *tab);
static int _tabs_width(void); static int _tabs_width(void);
static char* _display_name(StatusBarTab *tab); static char* _display_name(StatusBarTab *tab);
@ -245,9 +249,92 @@ _status_bar_draw(void)
int pos = 1; int pos = 1;
pos = _status_bar_draw_time(pos);
_status_bar_draw_message(pos);
pos = getmaxx(stdscr) - _tabs_width();
gint max_tabs = prefs_get_statusbartabs();
int i = 1;
for (i = 1; i <= max_tabs; i++) {
StatusBarTab *tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) {
int display_num = i == 10 ? 0 : i;
gboolean is_current = i == statusbar->current_tab;
pos = _status_bar_draw_tab(tab, pos, display_num, is_current);
}
}
pos = _status_bar_draw_bracket(FALSE, pos, "[");
mvwprintw(statusbar_win, 0, pos, " ");
pos++;
pos = _status_bar_draw_bracket(FALSE, pos, "]");
wnoutrefresh(statusbar_win);
inp_put_back();
}
static int
_status_bar_draw_tab(StatusBarTab *tab, int pos, int display_num, gboolean is_current)
{
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
pos = _status_bar_draw_bracket(is_current, pos, "[");
int status_attrs = 0;
if (tab->highlight) {
status_attrs = theme_attrs(THEME_STATUS_NEW);
} else {
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
}
wattron(statusbar_win, status_attrs);
if (show_number) {
mvwprintw(statusbar_win, 0, pos, "%d", display_num);
pos++;
}
if (show_number && show_name) {
mvwprintw(statusbar_win, 0, pos, ":");
pos++;
}
if (show_name) {
char *display_name = _display_name(tab);
mvwprintw(statusbar_win, 0, pos, display_name);
pos += strlen(display_name);
free(display_name);
}
wattroff(statusbar_win, status_attrs);
pos = _status_bar_draw_bracket(is_current, pos, "]");
return pos;
}
static int
_status_bar_draw_bracket(gboolean current, int pos, char* ch)
{
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
wattron(statusbar_win, bracket_attrs);
if (current) {
mvwprintw(statusbar_win, 0, pos, "-");
} else {
mvwprintw(statusbar_win, 0, pos, ch);
}
wattroff(statusbar_win, bracket_attrs);
pos++;
return pos;
}
static int
_status_bar_draw_time(int pos)
{
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "off") != 0) { if (g_strcmp0(time_pref, "off") == 0) {
// time prefs_free_string(time_pref);
return pos;
}
if (statusbar->time) { if (statusbar->time) {
g_free(statusbar->time); g_free(statusbar->time);
statusbar->time = NULL; statusbar->time = NULL;
@ -275,87 +362,17 @@ _status_bar_draw(void)
wattroff(statusbar_win, bracket_attrs); wattroff(statusbar_win, bracket_attrs);
pos += 2; pos += 2;
// message
if (statusbar->message) {
mvwprintw(statusbar_win, 0, pos, statusbar->message);
}
} else {
// message
if (statusbar->message) {
mvwprintw(statusbar_win, 0, pos, statusbar->message);
}
}
prefs_free_string(time_pref); prefs_free_string(time_pref);
// tabs return pos;
int cols = getmaxx(stdscr); }
pos = cols - _tabs_width();
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER); static void
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME); _status_bar_draw_message(int pos)
gint max_tabs = prefs_get_statusbartabs(); {
if (statusbar->message) {
int i = 1; mvwprintw(statusbar_win, 0, pos, statusbar->message);
for (i = 1; i <= max_tabs; i++) {
int display_num = i == 10 ? 0 : i;
StatusBarTab *tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) {
wattron(statusbar_win, bracket_attrs);
if (i == statusbar->current_tab) {
mvwprintw(statusbar_win, 0, pos, "-");
} else {
mvwprintw(statusbar_win, 0, pos, "[");
} }
wattroff(statusbar_win, bracket_attrs);
pos++;
char *display_name = _display_name(tab);
int status_attrs = 0;
if (tab->highlight) {
status_attrs = theme_attrs(THEME_STATUS_NEW);
} else {
status_attrs = theme_attrs(THEME_STATUS_ACTIVE);
}
wattron(statusbar_win, status_attrs);
if (show_number) {
mvwprintw(statusbar_win, 0, pos, "%d", display_num);
pos++;
}
if (show_number && show_name) {
mvwprintw(statusbar_win, 0, pos, ":");
pos++;
}
if (show_name) {
mvwprintw(statusbar_win, 0, pos, display_name);
pos += strlen(display_name);
}
wattroff(statusbar_win, status_attrs);
free(display_name);
wattron(statusbar_win, bracket_attrs);
if (i == statusbar->current_tab) {
mvwprintw(statusbar_win, 0, pos, "-");
} else {
mvwprintw(statusbar_win, 0, pos, "]");
}
pos++;
wattroff(statusbar_win, bracket_attrs);
}
}
wattron(statusbar_win, bracket_attrs);
mvwprintw(statusbar_win, 0, pos, "[");
wattroff(statusbar_win, bracket_attrs);
pos++;
mvwprintw(statusbar_win, 0, pos, " ");
pos++;
wattron(statusbar_win, bracket_attrs);
mvwprintw(statusbar_win, 0, pos, "]");
wattroff(statusbar_win, bracket_attrs);
pos++;
wnoutrefresh(statusbar_win);
inp_put_back();
} }
static void static void