Naming of statics

This commit is contained in:
James Booth
2012-02-12 22:09:07 +00:00
parent b71f61d400
commit 7aa1d931a0
6 changed files with 164 additions and 150 deletions

162
windows.c
View File

@@ -3,10 +3,10 @@
#include "windows.h"
#include "util.h"
static struct prof_win wins[10];
static int curr_win = 0;
static struct prof_win _wins[10];
static int _curr_win = 0;
static void create_windows(void);
static void _create_windows(void);
void gui_init(void)
{
@@ -31,7 +31,7 @@ void gui_init(void)
create_input_bar();
create_input_window();
create_windows();
_create_windows();
}
void gui_close(void)
@@ -39,54 +39,54 @@ void gui_close(void)
endwin();
}
int is_active(int i)
int win_is_active(int i)
{
if (strcmp(wins[i].from, "") == 0)
if (strcmp(_wins[i].from, "") == 0)
return FALSE;
else
return TRUE;
}
void switch_to(int i)
void win_switch_to(int i)
{
touchwin(wins[i].win);
wrefresh(wins[i].win);
curr_win = i;
touchwin(_wins[i].win);
wrefresh(_wins[i].win);
_curr_win = i;
if (i == 0) {
title_bar_show("Console, type /help for help information");
win_title_bar_show("Console, type /help for help information");
} else {
title_bar_show(wins[i].from);
win_title_bar_show(_wins[i].from);
}
}
void close_win(void)
void win_close_win(void)
{
// reset the chat win to unused
strcpy(wins[curr_win].from, "");
wclear(wins[curr_win].win);
strcpy(_wins[_curr_win].from, "");
wclear(_wins[_curr_win].win);
// set it as inactive in the status bar
inp_bar_inactive(curr_win);
inp_bar_inactive(_curr_win);
// go back to console window
touchwin(wins[0].win);
wrefresh(wins[0].win);
touchwin(_wins[0].win);
wrefresh(_wins[0].win);
title_bar_show("Console, type /help for help information");
win_title_bar_show("Console, type /help for help information");
}
int in_chat(void)
int win_in_chat(void)
{
return ((curr_win != 0) && (strcmp(wins[curr_win].from, "") != 0));
return ((_curr_win != 0) && (strcmp(_wins[_curr_win].from, "") != 0));
}
void get_recipient(char *recipient)
void win_get_recipient(char *recipient)
{
strcpy(recipient, wins[curr_win].from);
strcpy(recipient, _wins[_curr_win].from);
}
void show_incomming_msg(char *from, char *message)
void win_show_incomming_msg(char *from, char *message)
{
char from_cpy[100];
strcpy(from_cpy, from);
@@ -101,47 +101,47 @@ void show_incomming_msg(char *from, char *message)
// find the chat window for sender
int i;
for (i = 1; i < 10; i++)
if (strcmp(wins[i].from, short_from) == 0)
if (strcmp(_wins[i].from, short_from) == 0)
break;
// if we didn't find a window
if (i == 10) {
// find the first unused one
for (i = 1; i < 10; i++)
if (strcmp(wins[i].from, "") == 0)
if (strcmp(_wins[i].from, "") == 0)
break;
// set it up and print the message to it
strcpy(wins[i].from, short_from);
wclear(wins[i].win);
wprintw(wins[i].win, line);
strcpy(_wins[i].from, short_from);
wclear(_wins[i].win);
wprintw(_wins[i].win, line);
// signify active window in status bar
inp_bar_active(i);
// if its the current window, draw it
if (curr_win == i) {
touchwin(wins[i].win);
wrefresh(wins[i].win);
if (_curr_win == i) {
touchwin(_wins[i].win);
wrefresh(_wins[i].win);
}
}
// otherwise
else {
// add the line to the senders window
wprintw(wins[i].win, line);
wprintw(_wins[i].win, line);
// signify active window in status bar
inp_bar_active(i);
// if its the current window, draw it
if (curr_win == i) {
touchwin(wins[i].win);
wrefresh(wins[i].win);
if (_curr_win == i) {
touchwin(_wins[i].win);
wrefresh(_wins[i].win);
}
}
}
void show_outgoing_msg(char *from, char *to, char *message)
void win_show_outgoing_msg(char *from, char *to, char *message)
{
char line[100];
char tstmp[80];
@@ -151,98 +151,108 @@ void show_outgoing_msg(char *from, char *to, char *message)
// find the chat window for recipient
int i;
for (i = 1; i < 10; i++)
if (strcmp(wins[i].from, to) == 0)
if (strcmp(_wins[i].from, to) == 0)
break;
// if we didn't find a window
if (i == 10) {
// find the first unused one
for (i = 1; i < 10; i++)
if (strcmp(wins[i].from, "") == 0)
if (strcmp(_wins[i].from, "") == 0)
break;
// set it up and print the message to it
strcpy(wins[i].from, to);
wclear(wins[i].win);
wprintw(wins[i].win, line);
strcpy(_wins[i].from, to);
wclear(_wins[i].win);
wprintw(_wins[i].win, line);
// signify active window in status bar
inp_bar_active(i);
// if its the current window, draw it
if (curr_win == i) {
touchwin(wins[i].win);
wrefresh(wins[i].win);
if (_curr_win == i) {
touchwin(_wins[i].win);
wrefresh(_wins[i].win);
}
}
// otherwise
else {
// add the line to the senders window
wprintw(wins[i].win, line);
wprintw(_wins[i].win, line);
// signify active window in status bar
inp_bar_active(i);
// if its the current window, draw it
if (curr_win == i) {
touchwin(wins[i].win);
wrefresh(wins[i].win);
if (_curr_win == i) {
touchwin(_wins[i].win);
wrefresh(_wins[i].win);
}
}
}
void cons_help(void)
void win_cons_help(void)
{
char tstmp[80];
get_time(tstmp);
wprintw(wins[0].win, " [%s] Help:\n", tstmp);
wprintw(wins[0].win, " [%s] Commands:\n", tstmp);
wprintw(wins[0].win, " [%s] /help : This help.\n", tstmp);
wprintw(wins[0].win, " [%s] /connect <username@host> : Login to jabber.\n", tstmp);
wprintw(wins[0].win, " [%s] /who : Get roster.\n", tstmp);
wprintw(wins[0].win, " [%s] /close : Close a chat window.\n", tstmp);
wprintw(wins[0].win, " [%s] /quit : Quits Profanity.\n", tstmp);
wprintw(wins[0].win, " [%s] Shortcuts:\n", tstmp);
wprintw(wins[0].win, " [%s] F1 : Console window.\n", tstmp);
wprintw(wins[0].win, " [%s] F2-10 : Chat windows.\n", tstmp);
wprintw(_wins[0].win,
" [%s] Help:\n", tstmp);
wprintw(_wins[0].win,
" [%s] Commands:\n", tstmp);
wprintw(_wins[0].win,
" [%s] /help : This help.\n", tstmp);
wprintw(_wins[0].win,
" [%s] /connect <username@host> : Login to jabber.\n", tstmp);
wprintw(_wins[0].win,
" [%s] /who : Get roster.\n", tstmp);
wprintw(_wins[0].win,
" [%s] /close : Close a chat window.\n", tstmp);
wprintw(_wins[0].win,
" [%s] /quit : Quits Profanity.\n", tstmp);
wprintw(_wins[0].win,
" [%s] Shortcuts:\n", tstmp);
wprintw(_wins[0].win,
" [%s] F1 : Console window.\n", tstmp);
wprintw(_wins[0].win,
" [%s] F2-10 : Chat windows.\n", tstmp);
// if its the current window, draw it
if (curr_win == 0) {
touchwin(wins[0].win);
wrefresh(wins[0].win);
if (_curr_win == 0) {
touchwin(_wins[0].win);
wrefresh(_wins[0].win);
}
}
void cons_show(char *msg)
void win_cons_show(char *msg)
{
char tstmp[80];
get_time(tstmp);
wprintw(wins[0].win, " [%s] %s\n", tstmp, msg);
wprintw(_wins[0].win, " [%s] %s\n", tstmp, msg);
// if its the current window, draw it
if (curr_win == 0) {
touchwin(wins[0].win);
wrefresh(wins[0].win);
if (_curr_win == 0) {
touchwin(_wins[0].win);
wrefresh(_wins[0].win);
}
}
void cons_bad_command(char *cmd)
void win_cons_bad_command(char *cmd)
{
char tstmp[80];
get_time(tstmp);
wprintw(wins[0].win, " [%s] Unknown command: %s\n", tstmp, cmd);
wprintw(_wins[0].win, " [%s] Unknown command: %s\n", tstmp, cmd);
// if its the current window, draw it
if (curr_win == 0) {
touchwin(wins[0].win);
wrefresh(wins[0].win);
if (_curr_win == 0) {
touchwin(_wins[0].win);
wrefresh(_wins[0].win);
}
}
static void create_windows(void)
static void _create_windows(void)
{
int rows, cols;
getmaxyx(stdscr, rows, cols);
@@ -259,7 +269,7 @@ static void create_windows(void)
wprintw(cons.win, " [%s] Welcome to Profanity.\n", tstmp);
touchwin(cons.win);
wrefresh(cons.win);
wins[0] = cons;
_wins[0] = cons;
// create the chat windows
int i;
@@ -268,6 +278,6 @@ static void create_windows(void)
strcpy(chat.from, "");
chat.win = newwin(rows-3, cols, 1, 0);
scrollok(chat.win, TRUE);
wins[i] = chat;
_wins[i] = chat;
}
}