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

Show presence when resource hidden

Browse Source
This commit is contained in:
James Booth 2015-11-15 22:17:36 +00:00
parent badbc3003f
commit 98a395e933
2 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/console.c
View File

@ -1207,6 +1207,16 @@ cons_roster_setting(void)
else else
cons_show("Roster resource (/roster) : hide"); cons_show("Roster resource (/roster) : hide");
if (prefs_get_boolean(PREF_ROSTER_PRESENCE))
cons_show("Roster presence (/roster) : show");
else
cons_show("Roster presence (/roster) : hide");
if (prefs_get_boolean(PREF_ROSTER_STATUS))
cons_show("Roster status (/roster) : show");
else
cons_show("Roster status (/roster) : hide");
if (prefs_get_boolean(PREF_ROSTER_EMPTY)) if (prefs_get_boolean(PREF_ROSTER_EMPTY))
cons_show("Roster empty (/roster) : show"); cons_show("Roster empty (/roster) : show");
else else

86
src/ui/rosterwin.c
View File

@ -62,45 +62,71 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact)
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) { if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
GList *resources = p_contact_get_available_resources(contact); GList *resources = p_contact_get_available_resources(contact);
GList *curr_resource = resources; if (resources) {
while (curr_resource) { GList *curr_resource = resources;
Resource *resource = curr_resource->data; while (curr_resource) {
const char *resource_presence = string_from_resource_presence(resource->presence); Resource *resource = curr_resource->data;
theme_item_t resource_presence_colour = theme_main_presence_attrs(resource_presence); const char *resource_presence = string_from_resource_presence(resource->presence);
theme_item_t resource_presence_colour = theme_main_presence_attrs(resource_presence);
wattron(layout->subwin, theme_attrs(resource_presence_colour)); wattron(layout->subwin, theme_attrs(resource_presence_colour));
GString *msg = g_string_new(" "); GString *msg = g_string_new(" ");
g_string_append(msg, resource->name); g_string_append(msg, resource->name);
win_printline_nowrap(layout->subwin, msg->str); win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE); g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(resource_presence_colour)); wattroff(layout->subwin, theme_attrs(resource_presence_colour));
if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) { if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
gboolean by_presence = g_strcmp0(by, "presence") == 0; gboolean by_presence = g_strcmp0(by, "presence") == 0;
gboolean has_status = resource->status != NULL; gboolean has_status = resource->status != NULL;
gboolean show_status = prefs_get_boolean(PREF_ROSTER_STATUS); gboolean show_status = prefs_get_boolean(PREF_ROSTER_STATUS);
if (!by_presence || (has_status && show_status)) { if (!by_presence || (has_status && show_status)) {
wattron(layout->subwin, theme_attrs(resource_presence_colour)); wattron(layout->subwin, theme_attrs(resource_presence_colour));
GString *msg = g_string_new(" "); GString *msg = g_string_new(" ");
if (!by_presence) {
g_string_append(msg, resource_presence);
}
if (has_status && show_status) {
if (!by_presence) { if (!by_presence) {
g_string_append(msg, ", \""); g_string_append(msg, resource_presence);
} else { }
if (has_status && show_status) {
if (!by_presence) {
g_string_append(msg, ", \"");
} else {
g_string_append(msg, "\"");
}
g_string_append(msg, resource->status);
g_string_append(msg, "\""); g_string_append(msg, "\"");
} }
g_string_append(msg, resource->status); win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(resource_presence_colour));
}
}
curr_resource = g_list_next(curr_resource);
}
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
gboolean by_presence = g_strcmp0(by, "presence") == 0;
gboolean has_status = p_contact_status(contact) != NULL;
gboolean show_status = prefs_get_boolean(PREF_ROSTER_STATUS);
if (!by_presence || (has_status && show_status)) {
wattron(layout->subwin, theme_attrs(presence_colour));
GString *msg = g_string_new(" ");
if (!by_presence) {
g_string_append(msg, presence);
}
if (has_status && show_status) {
if (!by_presence) {
g_string_append(msg, ", \"");
} else {
g_string_append(msg, "\""); g_string_append(msg, "\"");
} }
win_printline_nowrap(layout->subwin, msg->str); const char *status = p_contact_status(contact);
g_string_free(msg, TRUE); g_string_append(msg, status);
wattroff(layout->subwin, theme_attrs(resource_presence_colour)); g_string_append(msg, "\"");
} }
win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(presence_colour));
} }
curr_resource = g_list_next(curr_resource);
} }
g_list_free(resources); g_list_free(resources);
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) { } else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {