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

Refactored presence colouring

Browse Source
This commit is contained in:
James Booth 2013-01-20 03:03:30 +00:00
parent 17ed139d96
commit 23d760137b
1 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/windows.c
View File

@ -112,6 +112,8 @@ static void _win_show_history(WINDOW *win, int win_index,
const char * const contact); const char * const contact);
static gboolean _new_release(char *found_version); static gboolean _new_release(char *found_version);
static void _ui_draw_win_title(void); static void _ui_draw_win_title(void);
static void _presence_colour_on(WINDOW *win, const char * const presence);
static void _presence_colour_off(WINDOW *win, const char * const presence);
static void _notify(const char * const message, int timeout, static void _notify(const char * const message, int timeout,
const char * const category); const char * const category);
@ -842,35 +844,9 @@ win_show_room_roster(const char * const room, GList *roster, const char * const
const char const *name = p_contact_jid(member); const char const *name = p_contact_jid(member);
const char const *show = p_contact_presence(member); const char const *show = p_contact_presence(member);
if (strcmp(show, "away") == 0) { _presence_colour_on(win, show);
wattron(win, COLOUR_AWAY);
} else if (strcmp(show, "chat") == 0) {
wattron(win, COLOUR_CHAT);
} else if (strcmp(show, "dnd") == 0) {
wattron(win, COLOUR_DND);
} else if (strcmp(show, "xa") == 0) {
wattron(win, COLOUR_XA);
} else if (strcmp(show, "online") == 0) {
wattron(win, COLOUR_ONLINE);
} else {
wattron(win, COLOUR_OFFLINE);
}
wprintw(win, "%s", name); wprintw(win, "%s", name);
_presence_colour_off(win, show);
if (strcmp(show, "away") == 0) {
wattroff(win, COLOUR_AWAY);
} else if (strcmp(show, "chat") == 0) {
wattroff(win, COLOUR_CHAT);
} else if (strcmp(show, "dnd") == 0) {
wattroff(win, COLOUR_DND);
} else if (strcmp(show, "xa") == 0) {
wattroff(win, COLOUR_XA);
} else if (strcmp(show, "online") == 0) {
wattroff(win, COLOUR_ONLINE);
} else {
wattroff(win, COLOUR_OFFLINE);
}
if (roster->next != NULL) { if (roster->next != NULL) {
wprintw(win, ", "); wprintw(win, ", ");
@ -1182,17 +1158,29 @@ cons_show_info(const char * const contact)
const char *name = p_contact_name(pcontact); const char *name = p_contact_name(pcontact);
const char *presence = p_contact_presence(pcontact); const char *presence = p_contact_presence(pcontact);
const char *status = p_contact_status(pcontact); const char *status = p_contact_status(pcontact);
const char *sub = p_contact_subscription(pcontact);
const char *caps_str = p_contact_caps_str(pcontact); const char *caps_str = p_contact_caps_str(pcontact);
GDateTime *last_activity = p_contact_last_activity(pcontact); GDateTime *last_activity = p_contact_last_activity(pcontact);
cons_show(""); cons_show("");
cons_show("JID: %s", jid); _win_show_time(console->win, '-');
_presence_colour_on(console->win, presence);
wprintw(console->win, "%s\n", jid);
_presence_colour_off(console->win, presence);
if (name != NULL) { if (name != NULL) {
cons_show("Name : %s", name); cons_show("Name : %s", name);
} }
cons_show("Presence: %s", presence); if (sub != NULL) {
cons_show("Subscription : %s", sub);
}
_win_show_time(console->win, '-');
wprintw(console->win, "Presence : ");
_presence_colour_on(console->win, presence);
wprintw(console->win, "%s\n", presence);
_presence_colour_off(console->win, presence);
if (status != NULL) { if (status != NULL) {
cons_show("Message : %s", status); cons_show("Message : %s", status);
@ -1229,8 +1217,6 @@ cons_show_info(const char * const contact)
cons_show("Client : %s", caps->client); cons_show("Client : %s", caps->client);
} }
} }
cons_show("");
} else { } else {
cons_show("No such contact \"%s\" in roster.", contact); cons_show("No such contact \"%s\" in roster.", contact);
} }
@ -2085,6 +2071,42 @@ _win_resize_all(void)
prefresh(current->win, current->y_pos, 0, 1, 0, rows-3, cols-1); prefresh(current->win, current->y_pos, 0, 1, 0, rows-3, cols-1);
} }
static void
_presence_colour_on(WINDOW *win, const char * const presence)
{
if (g_strcmp0(presence, "online") == 0) {
wattron(win, COLOUR_ONLINE);
} else if (g_strcmp0(presence, "away") == 0) {
wattron(win, COLOUR_AWAY);
} else if (g_strcmp0(presence, "chat") == 0) {
wattron(win, COLOUR_CHAT);
} else if (g_strcmp0(presence, "dnd") == 0) {
wattron(win, COLOUR_DND);
} else if (g_strcmp0(presence, "xa") == 0) {
wattron(win, COLOUR_XA);
} else {
wattron(win, COLOUR_OFFLINE);
}
}
static void
_presence_colour_off(WINDOW *win, const char * const presence)
{
if (g_strcmp0(presence, "online") == 0) {
wattroff(win, COLOUR_ONLINE);
} else if (g_strcmp0(presence, "away") == 0) {
wattroff(win, COLOUR_AWAY);
} else if (g_strcmp0(presence, "chat") == 0) {
wattroff(win, COLOUR_CHAT);
} else if (g_strcmp0(presence, "dnd") == 0) {
wattroff(win, COLOUR_DND);
} else if (g_strcmp0(presence, "xa") == 0) {
wattroff(win, COLOUR_XA);
} else {
wattroff(win, COLOUR_OFFLINE);
}
}
static void static void
_show_status_string(WINDOW *win, const char * const from, _show_status_string(WINDOW *win, const char * const from,
const char * const show, const char * const status, const char * const show, const char * const status,
@ -2194,21 +2216,7 @@ _win_show_contact(ProfWin *window, PContact contact)
GDateTime *last_activity = p_contact_last_activity(contact); GDateTime *last_activity = p_contact_last_activity(contact);
_win_show_time(window->win, '-'); _win_show_time(window->win, '-');
_presence_colour_on(window->win, presence);
if (strcmp(presence, "online") == 0) {
wattron(window->win, COLOUR_ONLINE);
} else if (strcmp(presence, "away") == 0) {
wattron(window->win, COLOUR_AWAY);
} else if (strcmp(presence, "chat") == 0) {
wattron(window->win, COLOUR_CHAT);
} else if (strcmp(presence, "dnd") == 0) {
wattron(window->win, COLOUR_DND);
} else if (strcmp(presence, "xa") == 0) {
wattron(window->win, COLOUR_XA);
} else {
wattron(window->win, COLOUR_OFFLINE);
}
wprintw(window->win, "%s", jid); wprintw(window->win, "%s", jid);
if (name != NULL) { if (name != NULL) {
@ -2242,20 +2250,7 @@ _win_show_contact(ProfWin *window, PContact contact)
} }
wprintw(window->win, "\n"); wprintw(window->win, "\n");
_presence_colour_off(window->win, presence);
if (strcmp(presence, "online") == 0) {
wattroff(window->win, COLOUR_ONLINE);
} else if (strcmp(presence, "away") == 0) {
wattroff(window->win, COLOUR_AWAY);
} else if (strcmp(presence, "chat") == 0) {
wattroff(window->win, COLOUR_CHAT);
} else if (strcmp(presence, "dnd") == 0) {
wattroff(window->win, COLOUR_DND);
} else if (strcmp(presence, "xa") == 0) {
wattroff(window->win, COLOUR_XA);
} else {
wattroff(window->win, COLOUR_OFFLINE);
}
} }
static void static void