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

Refactored windows.c

Browse Source 
Most functions now use _win_show_time and cons_show where
they can.
This commit is contained in:
James Booth 2012-02-26 19:07:40 +00:00
parent 9807c15b3f
commit 98dfe8bf18
1 changed files with 32 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
windows.c
View File

@ -143,42 +143,26 @@ void win_show_outgoing_msg(char *from, char *to, char *message)
void cons_help(void) void cons_help(void)
{ {
char tstmp[80]; _win_show_time(0);
get_time(tstmp);
wprintw(_wins[0].win, " [%s] ", tstmp);
wattron(_wins[0].win, A_BOLD); wattron(_wins[0].win, A_BOLD);
wprintw(_wins[0].win, "Help:\n"); wprintw(_wins[0].win, "Help:\n");
wattroff(_wins[0].win, A_BOLD); wattroff(_wins[0].win, A_BOLD);
wprintw(_wins[0].win, cons_show(" Commands:");
" [%s] Commands:\n", tstmp); cons_show(" /help : This help.");
wprintw(_wins[0].win, cons_show(" /connect user@host : Login to jabber.");
" [%s] /help : This help.\n", tstmp); cons_show(" /who : Get roster.");
wprintw(_wins[0].win, cons_show(" /close : Close a chat window.");
" [%s] /connect user@host : Login to jabber.\n", tstmp); cons_show(" /msg user@host mesg : Send mesg to user.");
wprintw(_wins[0].win, cons_show(" /quit : Quit Profanity.");
" [%s] /who : Get roster.\n", tstmp); cons_show(" Shortcuts:");
wprintw(_wins[0].win, cons_show(" F1 : This console window.");
" [%s] /close : Close a chat window.\n", tstmp); cons_show(" F2-10 : Chat windows.");
wprintw(_wins[0].win,
" [%s] /msg user@host mesg : Send mesg to user.\n", tstmp);
wprintw(_wins[0].win,
" [%s] /quit : Quit Profanity.\n", tstmp);
wprintw(_wins[0].win,
" [%s] Shortcuts:\n", tstmp);
wprintw(_wins[0].win,
" [%s] F1 : This console window.\n", tstmp);
wprintw(_wins[0].win,
" [%s] F2-10 : Chat windows.\n", tstmp);
} }
void cons_good_show(char *msg) void cons_good_show(char *msg)
{ {
char tstmp[80]; _win_show_time(0);
get_time(tstmp);
wprintw(_wins[0].win, " [%s] ", tstmp);
wattron(_wins[0].win, A_BOLD); wattron(_wins[0].win, A_BOLD);
wattron(_wins[0].win, COLOR_PAIR(2)); wattron(_wins[0].win, COLOR_PAIR(2));
wprintw(_wins[0].win, "%s\n", msg); wprintw(_wins[0].win, "%s\n", msg);
@ -188,10 +172,7 @@ void cons_good_show(char *msg)
void cons_bad_show(char *msg) void cons_bad_show(char *msg)
{ {
char tstmp[80]; _win_show_time(0);
get_time(tstmp);
wprintw(_wins[0].win, " [%s] ", tstmp);
wattron(_wins[0].win, A_BOLD); wattron(_wins[0].win, A_BOLD);
wattron(_wins[0].win, COLOR_PAIR(6)); wattron(_wins[0].win, COLOR_PAIR(6));
wprintw(_wins[0].win, "%s\n", msg); wprintw(_wins[0].win, "%s\n", msg);
@ -199,67 +180,44 @@ void cons_bad_show(char *msg)
wattroff(_wins[0].win, COLOR_PAIR(6)); wattroff(_wins[0].win, COLOR_PAIR(6));
} }
void cons_show(char *msg)
{
_win_show_time(0);
wprintw(_wins[0].win, "%s\n", msg);
}
void cons_highlight_show(char *msg) void cons_highlight_show(char *msg)
{ {
char tstmp[80]; _win_show_time(0);
get_time(tstmp);
wprintw(_wins[0].win, " [%s] ", tstmp);
wattron(_wins[0].win, A_BOLD); wattron(_wins[0].win, A_BOLD);
wprintw(_wins[0].win, "%s\n", msg); wprintw(_wins[0].win, "%s\n", msg);
wattroff(_wins[0].win, A_BOLD); wattroff(_wins[0].win, A_BOLD);
} }
void cons_show(char *msg)
{
char tstmp[80];
get_time(tstmp);
wprintw(_wins[0].win, " [%s] %s\n", tstmp, msg);
}
void cons_bad_command(char *cmd) void cons_bad_command(char *cmd)
{ {
char tstmp[80]; _win_show_time(0);
get_time(tstmp); wprintw(_wins[0].win, "Unknown command: %s\n", cmd);
wprintw(_wins[0].win, " [%s] Unknown command: %s\n", tstmp, cmd);
} }
void cons_bad_connect(void) void cons_bad_connect(void)
{ {
char tstmp[80]; cons_show("Usage: /connect user@host");
get_time(tstmp);
wprintw(_wins[0].win,
" [%s] Usage: /connect user@host\n", tstmp);
} }
void cons_not_disconnected(void) void cons_not_disconnected(void)
{ {
char tstmp[80]; cons_show("You are either connected already, or a login is in process.");
get_time(tstmp);
wprintw(_wins[0].win,
" [%s] You are either connected already, or a login is in process.\n", tstmp);
} }
void cons_not_connected(void) void cons_not_connected(void)
{ {
char tstmp[80]; cons_show("You are not currently connected.");
get_time(tstmp);
wprintw(_wins[0].win,
" [%s] You are not currently connected.\n", tstmp);
} }
void cons_bad_message(void) void cons_bad_message(void)
{ {
char tstmp[80]; cons_show("Usage: /msg user@host message");
get_time(tstmp);
wprintw(_wins[0].win,
" [%s] Usage: /msg user@host message\n", tstmp);
} }
static void _create_windows(void) static void _create_windows(void)
@ -276,13 +234,13 @@ static void _create_windows(void)
char tstmp[80]; char tstmp[80];
get_time(tstmp); get_time(tstmp);
wprintw(cons.win, " [%s] ", tstmp);
wattron(cons.win, A_BOLD);
wprintw(cons.win, "Welcome to Profanity.\n");
wattroff(cons.win, A_BOLD);
touchwin(cons.win);
wrefresh(cons.win);
_wins[0] = cons; _wins[0] = cons;
_win_show_time(0);
wattron(_wins[0].win, A_BOLD);
wprintw(_wins[0].win, "Welcome to Profanity.\n");
wattroff(_wins[0].win, A_BOLD);
touchwin(_wins[0].win);
wrefresh(_wins[0].win);
// create the chat windows // create the chat windows
int i; int i;