aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Implemented roster grouped by presence

Browse Source
This commit is contained in:
James Booth 2014-11-12 23:19:07 +00:00
parent 7e360dc35a
commit 15d0f679f6
4 changed files with 122 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/roster_list.c
View File

@ -265,6 +265,26 @@ roster_barejid_from_name(const char * const name)
return g_hash_table_lookup(name_to_barejid, name); return g_hash_table_lookup(name_to_barejid, name);
} }
GSList *
roster_get_contacts_by_presence(const char * const presence)
{
GSList *result = NULL;
GHashTableIter iter;
gpointer key;
gpointer value;
g_hash_table_iter_init(&iter, contacts);
while (g_hash_table_iter_next(&iter, &key, &value)) {
PContact contact = (PContact)value;
if (g_strcmp0(p_contact_presence(contact), presence) == 0) {
result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts);
}
}
// resturn all contact structs
return result;
}
GSList * GSList *
roster_get_contacts(void) roster_get_contacts(void)
{ {

1
src/roster_list.h
View File

@ -64,5 +64,6 @@ GSList * roster_get_group(const char * const group);
GSList * roster_get_groups(void); GSList * roster_get_groups(void);
char * roster_find_group(char *search_str); char * roster_find_group(char *search_str);
char * roster_find_jid(char *search_str); char * roster_find_jid(char *search_str);
GSList * roster_get_contacts_by_presence(const char * const presence);
#endif #endif

157
src/ui/core.c
View File

@ -84,6 +84,7 @@ static void _win_handle_page(const wint_t * const ch, const int result);
static void _win_show_history(WINDOW *win, int win_index, static void _win_show_history(WINDOW *win, int win_index,
const char * const contact); const char * const contact);
static void _ui_draw_term_title(void); static void _ui_draw_term_title(void);
static void _ui_roster_contact(PContact contact);
static void static void
_ui_init(void) _ui_init(void)
@ -2804,73 +2805,111 @@ _ui_show_lines(ProfWin *window, const gchar** lines)
} }
} }
static void
_ui_roster_contact(PContact contact)
{
if (p_contact_subscribed(contact)) {
ProfWin *window = wins_get_console();
const char *name = p_contact_name_or_jid(contact);
const char *presence = p_contact_presence(contact);
if ((g_strcmp0(presence, "offline") != 0) || ((g_strcmp0(presence, "offline") == 0) &&
(prefs_get_boolean(PREF_ROSTER_OFFLINE)))) {
int presence_colour = win_presence_colour(presence);
wattron(window->subwin, presence_colour);
GString *msg = g_string_new(" ");
g_string_append(msg, name);
win_printline_nowrap(window->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(window->subwin, presence_colour);
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
GList *resources = p_contact_get_available_resources(contact);
GList *ordered_resources = NULL;
// sort in order of availabiltiy
while (resources != NULL) {
Resource *resource = resources->data;
ordered_resources = g_list_insert_sorted(ordered_resources, resource, (GCompareFunc)resource_compare_availability);
resources = g_list_next(resources);
}
g_list_free(resources);
while (ordered_resources) {
Resource *resource = ordered_resources->data;
const char *resource_presence = string_from_resource_presence(resource->presence);
int resource_presence_colour = win_presence_colour(resource_presence);
wattron(window->subwin, resource_presence_colour);
GString *msg = g_string_new(" ");
g_string_append(msg, resource->name);
win_printline_nowrap(window->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(window->subwin, resource_presence_colour);
ordered_resources = g_list_next(ordered_resources);
}
g_list_free(ordered_resources);
}
}
}
}
static void
_ui_roster_contacts_by_presence(const char * const presence, char *title)
{
ProfWin *window = wins_get_console();
GSList *contacts = roster_get_contacts_by_presence(presence);
wattron(window->subwin, COLOUR_ROOMINFO);
win_printline_nowrap(window->subwin, title);
wattroff(window->subwin, COLOUR_ROOMINFO);
if (contacts) {
GSList *curr_contact = contacts;
while (curr_contact) {
PContact contact = curr_contact->data;
_ui_roster_contact(contact);
curr_contact = g_slist_next(curr_contact);
}
}
g_slist_free(contacts);
}
static void static void
_ui_roster(void) _ui_roster(void)
{ {
ProfWin *window = wins_get_console(); ProfWin *window = wins_get_console();
if (window) { if (window) {
GSList *contacts = roster_get_contacts(); if (g_strcmp0(prefs_get_string(PREF_ROSTER_BY), "presence") == 0) {
if (contacts) {
werase(window->subwin); werase(window->subwin);
wattron(window->subwin, COLOUR_ROOMINFO); _ui_roster_contacts_by_presence("chat", " -Available for chat");
win_printline_nowrap(window->subwin, " -Roster"); _ui_roster_contacts_by_presence("online", " -Online");
wattroff(window->subwin, COLOUR_ROOMINFO); _ui_roster_contacts_by_presence("away", " -Away");
GSList *curr_contact = contacts; _ui_roster_contacts_by_presence("xa", " -Extended Away");
while (curr_contact) { _ui_roster_contacts_by_presence("dnd", " -Do not disturb");
PContact contact = curr_contact->data; if (prefs_get_boolean(PREF_ROSTER_OFFLINE)) {
if (p_contact_subscribed(contact)) { _ui_roster_contacts_by_presence("offline", " -Offline");
const char *name = p_contact_name_or_jid(contact);
const char *presence = p_contact_presence(contact);
if ((g_strcmp0(presence, "offline") != 0) || ((g_strcmp0(presence, "offline") == 0) &&
(prefs_get_boolean(PREF_ROSTER_OFFLINE)))) {
int presence_colour = win_presence_colour(presence);
wattron(window->subwin, presence_colour);
GString *msg = g_string_new(" ");
g_string_append(msg, name);
win_printline_nowrap(window->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(window->subwin, presence_colour);
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
GList *resources = p_contact_get_available_resources(contact);
GList *ordered_resources = NULL;
// sort in order of availabiltiy
while (resources != NULL) {
Resource *resource = resources->data;
ordered_resources = g_list_insert_sorted(ordered_resources, resource, (GCompareFunc)resource_compare_availability);
resources = g_list_next(resources);
}
g_list_free(resources);
while (ordered_resources) {
Resource *resource = ordered_resources->data;
const char *resource_presence = string_from_resource_presence(resource->presence);
int resource_presence_colour = win_presence_colour(resource_presence);
wattron(window->subwin, resource_presence_colour);
GString *msg = g_string_new(" ");
g_string_append(msg, resource->name);
win_printline_nowrap(window->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(window->subwin, resource_presence_colour);
ordered_resources = g_list_next(ordered_resources);
}
g_list_free(ordered_resources);
}
}
}
curr_contact = g_slist_next(curr_contact);
} }
} else {
GSList *contacts = roster_get_contacts();
if (contacts) {
werase(window->subwin);
wattron(window->subwin, COLOUR_ROOMINFO);
win_printline_nowrap(window->subwin, " -Roster");
wattroff(window->subwin, COLOUR_ROOMINFO);
GSList *curr_contact = contacts;
while (curr_contact) {
PContact contact = curr_contact->data;
_ui_roster_contact(contact);
curr_contact = g_slist_next(curr_contact);
}
}
g_slist_free(contacts);
} }
g_slist_free(contacts);
} }
} }

6
themes/boothj5
View File

@ -17,9 +17,9 @@ main.splash=red
online=green online=green
away=cyan away=cyan
chat=white chat=white
dnd=red dnd=magenta
xa=cyan xa=blue
offline=blue offline=red
typing=yellow typing=yellow
gone=red gone=red
error=red error=red