devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 09:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed generic functions from ProfWin

Browse Source
This commit is contained in:
James Booth
2013-10-06 23:22:46 +01:00
parent dd4deafe93
commit c6c0a94bb0
5 changed files with 154 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/ui/window.c
View File

@@ -38,10 +38,6 @@
static gboolean _default_handle_error_message(ProfWin *self, const char * const from,
const char * const err_msg);
static void _win_print_time(ProfWin *self, char show_char);
static void _win_presence_colour_on(ProfWin *self, const char * const presence);
static void _win_presence_colour_off(ProfWin *self, const char * const presence);
static void _win_show_contact(ProfWin *self, PContact contact);
static void _print_incoming_message(ProfWin *self, GTimeVal *tv_stamp,
const char * const from, const char * const message);
@@ -58,13 +54,6 @@ win_create(const char * const title, int cols, win_type_t type)
new_win->history_shown = 0;
new_win->type = type;
new_win->print_time = _win_print_time;
new_win->print_line = win_print_line;
new_win->refresh_win = win_refresh;
new_win->presence_colour_on = _win_presence_colour_on;
new_win->presence_colour_off = _win_presence_colour_off;
new_win->show_contact = _win_show_contact;
switch (new_win->type)
{
case WIN_CONSOLE:
@@ -107,80 +96,80 @@ win_free(ProfWin* window)
window = NULL;
}
static void
_win_print_time(ProfWin* self, char show_char)
void
win_print_time(ProfWin* window, char show_char)
{
GDateTime *time = g_date_time_new_now_local();
gchar *date_fmt = g_date_time_format(time, "%H:%M:%S");
wattron(self->win, COLOUR_TIME);
wprintw(self->win, "%s %c ", date_fmt, show_char);
wattroff(self->win, COLOUR_TIME);
wattron(window->win, COLOUR_TIME);
wprintw(window->win, "%s %c ", date_fmt, show_char);
wattroff(window->win, COLOUR_TIME);
g_date_time_unref(time);
g_free(date_fmt);
}
void
win_print_line(ProfWin *self, const char show_char, int attrs,
win_print_line(ProfWin *window, const char show_char, int attrs,
const char * const msg, ...)
{
va_list arg;
va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
_win_print_time(self, show_char);
wattron(self->win, attrs);
wprintw(self->win, "%s\n", fmt_msg->str);
wattroff(self->win, attrs);
win_print_time(window, show_char);
wattron(window->win, attrs);
wprintw(window->win, "%s\n", fmt_msg->str);
wattroff(window->win, attrs);
g_string_free(fmt_msg, TRUE);
va_end(arg);
}
void
win_refresh(ProfWin *self)
win_refresh(ProfWin *window)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
prefresh(self->win, self->y_pos, 0, 1, 0, rows-3, cols-1);
prefresh(window->win, window->y_pos, 0, 1, 0, rows-3, cols-1);
}
static void
_win_presence_colour_on(ProfWin *self, const char * const presence)
void
win_presence_colour_on(ProfWin *window, const char * const presence)
{
if (g_strcmp0(presence, "online") == 0) {
wattron(self->win, COLOUR_ONLINE);
wattron(window->win, COLOUR_ONLINE);
} else if (g_strcmp0(presence, "away") == 0) {
wattron(self->win, COLOUR_AWAY);
wattron(window->win, COLOUR_AWAY);
} else if (g_strcmp0(presence, "chat") == 0) {
wattron(self->win, COLOUR_CHAT);
wattron(window->win, COLOUR_CHAT);
} else if (g_strcmp0(presence, "dnd") == 0) {
wattron(self->win, COLOUR_DND);
wattron(window->win, COLOUR_DND);
} else if (g_strcmp0(presence, "xa") == 0) {
wattron(self->win, COLOUR_XA);
wattron(window->win, COLOUR_XA);
} else {
wattron(self->win, COLOUR_OFFLINE);
wattron(window->win, COLOUR_OFFLINE);
}
}
static void
_win_presence_colour_off(ProfWin *self, const char * const presence)
void
win_presence_colour_off(ProfWin *window, const char * const presence)
{
if (g_strcmp0(presence, "online") == 0) {
wattroff(self->win, COLOUR_ONLINE);
wattroff(window->win, COLOUR_ONLINE);
} else if (g_strcmp0(presence, "away") == 0) {
wattroff(self->win, COLOUR_AWAY);
wattroff(window->win, COLOUR_AWAY);
} else if (g_strcmp0(presence, "chat") == 0) {
wattroff(self->win, COLOUR_CHAT);
wattroff(window->win, COLOUR_CHAT);
} else if (g_strcmp0(presence, "dnd") == 0) {
wattroff(self->win, COLOUR_DND);
wattroff(window->win, COLOUR_DND);
} else if (g_strcmp0(presence, "xa") == 0) {
wattroff(self->win, COLOUR_XA);
wattroff(window->win, COLOUR_XA);
} else {
wattroff(self->win, COLOUR_OFFLINE);
wattroff(window->win, COLOUR_OFFLINE);
}
}
static void
_win_show_contact(ProfWin *self, PContact contact)
void
win_show_contact(ProfWin *window, PContact contact)
{
const char *barejid = p_contact_barejid(contact);
const char *name = p_contact_name(contact);
@@ -188,43 +177,43 @@ _win_show_contact(ProfWin *self, PContact contact)
const char *status = p_contact_status(contact);
GDateTime *last_activity = p_contact_last_activity(contact);
_win_print_time(self, '-');
_win_presence_colour_on(self, presence);
win_print_time(window, '-');
win_presence_colour_on(window, presence);
if (name != NULL) {
wprintw(self->win, "%s", name);
wprintw(window->win, "%s", name);
} else {
wprintw(self->win, "%s", barejid);
wprintw(window->win, "%s", barejid);
}
wprintw(self->win, " is %s", presence);
wprintw(window->win, " is %s", presence);
if (last_activity != NULL) {
GDateTime *now = g_date_time_new_now_local();
GTimeSpan span = g_date_time_difference(now, last_activity);
wprintw(self->win, ", idle ");
wprintw(window->win, ", idle ");
int hours = span / G_TIME_SPAN_HOUR;
span = span - hours * G_TIME_SPAN_HOUR;
if (hours > 0) {
wprintw(self->win, "%dh", hours);
wprintw(window->win, "%dh", hours);
}
int minutes = span / G_TIME_SPAN_MINUTE;
span = span - minutes * G_TIME_SPAN_MINUTE;
wprintw(self->win, "%dm", minutes);
wprintw(window->win, "%dm", minutes);
int seconds = span / G_TIME_SPAN_SECOND;
wprintw(self->win, "%ds", seconds);
wprintw(window->win, "%ds", seconds);
}
if (status != NULL) {
wprintw(self->win, ", \"%s\"", p_contact_status(contact));
wprintw(window->win, ", \"%s\"", p_contact_status(contact));
}
wprintw(self->win, "\n");
_win_presence_colour_off(self, presence);
wprintw(window->win, "\n");
win_presence_colour_off(window, presence);
}
static gboolean
@@ -239,7 +228,7 @@ _print_incoming_message(ProfWin *self, GTimeVal *tv_stamp,
const char * const from, const char * const message)
{
if (tv_stamp == NULL) {
self->print_time(self, '-');
win_print_time(self, '-');
} else {
GDateTime *time = g_date_time_new_from_timeval_utc(tv_stamp);
gchar *date_fmt = g_date_time_format(time, "%H:%M:%S");