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

Show rooms in roster panel

This commit is contained in:
James Booth 2016-01-02 01:22:19 +00:00
parent f27cae68c5
commit 22a14e1240
3 changed files with 75 additions and 0 deletions

View File

@ -283,6 +283,8 @@ sv_ev_room_message(const char *const room_jid, const char *const nick,
notify_room_message(nick, jidp->localpart, ui_index, NULL); notify_room_message(nick, jidp->localpart, ui_index, NULL);
} }
jid_destroy(jidp); jid_destroy(jidp);
rosterwin_roster();
} }
void void
@ -720,6 +722,8 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c
} }
} }
rosterwin_roster();
// check for change in role/affiliation // check for change in role/affiliation
} else { } else {
ProfMucWin *mucwin = wins_get_muc(room); ProfMucWin *mucwin = wins_get_muc(room);

View File

@ -644,6 +644,7 @@ ui_focus_win(ProfWin *window)
if (i == 1) { if (i == 1) {
title_bar_console(); title_bar_console();
rosterwin_roster();
} else { } else {
title_bar_switch(); title_bar_switch();
} }

View File

@ -369,6 +369,74 @@ _rosterwin_contacts_by_no_group(ProfLayoutSplit *layout, gboolean newline)
g_slist_free(contacts); g_slist_free(contacts);
} }
void
_rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
{
GString *msg = g_string_new(" ");
theme_item_t presence_colour = theme_main_presence_attrs("online");
wattron(layout->subwin, theme_attrs(presence_colour));
int indent = prefs_get_roster_contact_indent();
int current_indent = 0;
if (indent > 0) {
current_indent += indent;
while (indent > 0) {
g_string_append(msg, " ");
indent--;
}
}
char ch = prefs_get_roster_contact_char();
if (ch) {
g_string_append_printf(msg, "%c", ch);
}
g_string_append(msg, mucwin->roomjid);
if (mucwin->unread > 0) {
g_string_append_printf(msg, " (%d)", mucwin->unread);
}
win_sub_newline_lazy(layout->subwin);
gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP);
win_sub_print(layout->subwin, msg->str, FALSE, wrap, current_indent);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(presence_colour));
}
void
_rosterwin_rooms(ProfLayoutSplit *layout, gboolean newline)
{
GList *rooms = muc_rooms();
// if this group has contacts, or if we want to show empty groups
if (rooms || prefs_get_boolean(PREF_ROSTER_EMPTY)) {
if (newline) {
win_sub_newline_lazy(layout->subwin);
}
wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
GString *title_str = g_string_new(" ");
char ch = prefs_get_roster_header_char();
if (ch) {
g_string_append_printf(title_str, "%c", ch);
}
g_string_append(title_str, "rooms");
if (prefs_get_boolean(PREF_ROSTER_COUNT)) {
g_string_append_printf(title_str, " (%d)", g_list_length(rooms));
}
gboolean wrap = prefs_get_boolean(PREF_ROSTER_WRAP);
win_sub_print(layout->subwin, title_str->str, FALSE, wrap, 1);
g_string_free(title_str, TRUE);
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
GList *curr_room = rooms;
while (curr_room) {
ProfMucWin *mucwin = wins_get_muc(curr_room->data);
_rosterwin_room(layout, mucwin);
curr_room = g_list_next(curr_room);
}
}
g_list_free(rooms);
}
void void
rosterwin_roster(void) rosterwin_roster(void)
{ {
@ -443,4 +511,6 @@ rosterwin_roster(void)
g_slist_free(contacts); g_slist_free(contacts);
} }
prefs_free_string(by); prefs_free_string(by);
_rosterwin_rooms(layout, TRUE);
} }