aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Show resource presence with /resource command

Browse Source
This commit is contained in:
James Booth 2014-12-02 21:06:29 +00:00
parent 1a8c805319
commit d652c3c7ac
1 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ui/titlebar.c
View File

@ -60,7 +60,6 @@ static GTimer *typing_elapsed;
static void _title_bar_draw(void); static void _title_bar_draw(void);
static void _show_contact_presence(void); static void _show_contact_presence(void);
static void _show_self_presence(void); static void _show_self_presence(void);
static void _show_contact_resource(void);
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
static void _show_privacy(void); static void _show_privacy(void);
#endif #endif
@ -182,13 +181,7 @@ _title_bar_draw(void)
mvwprintw(win, 0, 0, " %s", current_title); mvwprintw(win, 0, 0, " %s", current_title);
if (current && current->type == WIN_CHAT) { if (current && current->type == WIN_CHAT) {
if (TRUE) {
// if (prefs_get_boolean(PREF_RESOURCE)) {
_show_contact_resource();
}
if (prefs_get_boolean(PREF_PRESENCE)) {
_show_contact_presence(); _show_contact_presence();
}
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
_show_privacy(); _show_privacy();
#endif #endif
@ -326,36 +319,41 @@ _show_privacy(void)
#endif #endif
static void static void
_show_contact_resource(void) _show_contact_presence(void)
{ {
int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET); int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET);
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
if (current && current->chat_resource) { if (current && current->chat_resource) {
wprintw(win, " "); wprintw(win, "/");
wattron(win, bracket_attrs);
wprintw(win, "[");
wattroff(win, bracket_attrs);
wprintw(win, current->chat_resource); wprintw(win, current->chat_resource);
wattron(win, bracket_attrs);
wprintw(win, "]");
wattroff(win, bracket_attrs);
}
} }
static void if (prefs_get_boolean(PREF_PRESENCE)) {
_show_contact_presence(void)
{
int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET);
theme_item_t presence_colour = THEME_TITLE_OFFLINE; theme_item_t presence_colour = THEME_TITLE_OFFLINE;
const char *presence = "offline"; const char *presence = "offline";
if (current && current->chat_resource) {
char *barejid = roster_barejid_from_name(current_recipient);
if (barejid) {
PContact contact = roster_get_contact(barejid);
if (contact) {
Resource *resource = p_contact_get_resource(contact, current->chat_resource);
if (resource) {
presence = string_from_resource_presence(resource->presence);
}
}
}
} else {
char *barejid = roster_barejid_from_name(current_recipient); char *barejid = roster_barejid_from_name(current_recipient);
if (barejid) { if (barejid) {
PContact contact = roster_get_contact(barejid); PContact contact = roster_get_contact(barejid);
if (contact) { if (contact) {
presence = p_contact_presence(contact); presence = p_contact_presence(contact);
}
}
}
presence_colour = THEME_TITLE_ONLINE; presence_colour = THEME_TITLE_ONLINE;
if (g_strcmp0(presence, "offline") == 0) { if (g_strcmp0(presence, "offline") == 0) {
presence_colour = THEME_TITLE_OFFLINE; presence_colour = THEME_TITLE_OFFLINE;
@ -368,8 +366,6 @@ _show_contact_presence(void)
} else if (g_strcmp0(presence, "dnd") == 0) { } else if (g_strcmp0(presence, "dnd") == 0) {
presence_colour = THEME_TITLE_DND; presence_colour = THEME_TITLE_DND;
} }
}
}
int presence_attrs = theme_attrs(presence_colour); int presence_attrs = theme_attrs(presence_colour);
wprintw(win, " "); wprintw(win, " ");
@ -383,3 +379,4 @@ _show_contact_presence(void)
wprintw(win, "]"); wprintw(win, "]");
wattroff(win, bracket_attrs); wattroff(win, bracket_attrs);
} }
}