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 status when show presence disabled

Browse Source
This commit is contained in:
James Booth 2015-11-18 23:00:06 +00:00
parent 8e84d160e6
commit 522b9ab6be
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/ui/rosterwin.c
View File

@ -45,29 +45,45 @@
static void static void
_rosterwin_presence(ProfLayoutSplit *layout, int indent, theme_item_t colour, const char *presence, const char *status) _rosterwin_presence(ProfLayoutSplit *layout, int indent, theme_item_t colour, const char *presence, const char *status)
{ {
// don't show presence for offline contacts
gboolean is_offline = g_strcmp0(presence, "offline") == 0;
if (is_offline) {
return;
}
char *by = prefs_get_string(PREF_ROSTER_BY); char *by = prefs_get_string(PREF_ROSTER_BY);
gboolean by_presence = g_strcmp0(by, "presence") == 0; gboolean by_presence = g_strcmp0(by, "presence") == 0;
gboolean has_status = status != NULL;
gboolean show_status = prefs_get_boolean(PREF_ROSTER_STATUS); // show only status when grouped by presence
gboolean is_offline = g_strcmp0(presence, "offline") == 0; if (by_presence) {
if (!is_offline && (!by_presence || (has_status && show_status))) { if (status && prefs_get_boolean(PREF_ROSTER_STATUS)) {
wattron(layout->subwin, theme_attrs(colour)); wattron(layout->subwin, theme_attrs(colour));
GString *msg = g_string_new(" "); GString *msg = g_string_new(" ");
while (indent > 0) { while (indent > 0) {
g_string_append(msg, " "); g_string_append(msg, " ");
indent--; indent--;
} }
if (!by_presence) { g_string_append_printf(msg, "\"%s\"", status);
g_string_append(msg, presence); win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(colour));
} }
if (has_status && show_status) {
if (!by_presence) { // show both presence and status when not grouped by presence
g_string_append(msg, ", \"");
} else { } else {
g_string_append(msg, "\""); wattron(layout->subwin, theme_attrs(colour));
GString *msg = g_string_new(" ");
while (indent > 0) {
g_string_append(msg, " ");
indent--;
} }
g_string_append(msg, status); if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
g_string_append(msg, "\""); g_string_append(msg, presence);
if (status && prefs_get_boolean(PREF_ROSTER_STATUS)) {
g_string_append_printf(msg, " \"%s\"", status);
}
} else if (status && prefs_get_boolean(PREF_ROSTER_STATUS)) {
g_string_append_printf(msg, "\"%s\"", status);
} }
win_printline_nowrap(layout->subwin, msg->str); win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE); g_string_free(msg, TRUE);
@ -96,13 +112,13 @@ _rosterwin_resource(ProfLayoutSplit *layout, PContact contact)
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) || prefs_get_boolean(PREF_ROSTER_STATUS)) {
_rosterwin_presence(layout, 6, resource_presence_colour, resource_presence, resource->status); _rosterwin_presence(layout, 6, resource_presence_colour, resource_presence, resource->status);
} }
curr_resource = g_list_next(curr_resource); curr_resource = g_list_next(curr_resource);
} }
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) { } else if (prefs_get_boolean(PREF_ROSTER_PRESENCE) || prefs_get_boolean(PREF_ROSTER_STATUS)) {
const char *presence = p_contact_presence(contact); const char *presence = p_contact_presence(contact);
const char *status = p_contact_status(contact); const char *status = p_contact_status(contact);
theme_item_t presence_colour = theme_main_presence_attrs(presence); theme_item_t presence_colour = theme_main_presence_attrs(presence);
@ -130,7 +146,7 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact)
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) { if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
_rosterwin_resource(layout, contact); _rosterwin_resource(layout, contact);
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) { } else if (prefs_get_boolean(PREF_ROSTER_PRESENCE) || prefs_get_boolean(PREF_ROSTER_STATUS)) {
_rosterwin_presence(layout, 4, presence_colour, presence, status); _rosterwin_presence(layout, 4, presence_colour, presence, status);
} }
} }