Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 16:03:27 +01:00
Code Issues Projects Releases Wiki Activity

code format/clean up

Browse Source
This commit is contained in:
Jfreegman 2013-08-06 18:27:51 -04:00
parent 2fbe37f7cf
commit 5fd1a658bc
4 changed files with 337 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
chat.c
View File

@ -16,25 +16,23 @@
typedef struct { typedef struct {
int friendnum; int friendnum;
char line[256]; char line[256];
size_t pos; size_t pos;
WINDOW* history; WINDOW* history;
WINDOW* linewin; WINDOW* linewin;
} ChatContext; } ChatContext;
extern int w_active; extern int active_window;
extern void del_window(ToxWindow *w, int f_num); extern void del_window(ToxWindow *w, int f_num);
extern void fix_name(uint8_t *name); extern void fix_name(uint8_t *name);
void print_help(ChatContext *self); void print_help(ChatContext *self);
void execute(ToxWindow *self, ChatContext *ctx, char *cmd); void execute(ToxWindow *self, ChatContext *ctx, char *cmd);
static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) { static void chat_onMessage(ToxWindow *self, int num, uint8_t *msg, uint16_t len)
{
ChatContext *ctx = (ChatContext*) self->x; ChatContext *ctx = (ChatContext*) self->x;
uint8_t nick[MAX_NAME_LENGTH] = {0}; uint8_t nick[MAX_NAME_LENGTH] = {0};
time_t now; time_t now;
time(&now); time(&now);
struct tm * timeinfo; struct tm * timeinfo;
@ -44,10 +42,8 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
return; return;
getname(num, (uint8_t*) &nick); getname(num, (uint8_t*) &nick);
msg[len-1] = '\0'; msg[len-1] = '\0';
nick[MAX_NAME_LENGTH-1] = '\0'; nick[MAX_NAME_LENGTH-1] = '\0';
fix_name(msg); fix_name(msg);
fix_name(nick); fix_name(nick);
@ -64,15 +60,14 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
flash(); flash();
} }
static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) { static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)
{
ChatContext *ctx = (ChatContext*) self->x; ChatContext *ctx = (ChatContext*) self->x;
if (ctx->friendnum != num) if (ctx->friendnum != num)
return; return;
nick[len-1] = '\0'; nick[len-1] = '\0';
fix_name(nick); fix_name(nick);
snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num); snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
wattron(ctx->history, COLOR_PAIR(3)); wattron(ctx->history, COLOR_PAIR(3));
@ -80,7 +75,8 @@ static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t
wattroff(ctx->history, COLOR_PAIR(3)); wattroff(ctx->history, COLOR_PAIR(3));
} }
static void chat_onStatusChange(ToxWindow* self, int num, uint8_t* status, uint16_t len) { static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len)
{
} }
@ -89,22 +85,20 @@ int string_is_empty(char *string)
{ {
int rc = 0; int rc = 0;
char *copy = strdup(string); char *copy = strdup(string);
rc = ((strtok(copy, " ") == NULL) ? 1:0); rc = ((strtok(copy, " ") == NULL) ? 1:0);
free(copy); free(copy);
return rc; return rc;
} }
static void chat_onKey(ToxWindow* self, int key) { static void chat_onKey(ToxWindow *self, int key)
{
ChatContext *ctx = (ChatContext*) self->x; ChatContext *ctx = (ChatContext*) self->x;
time_t now; time_t now;
time(&now); time(&now);
struct tm * timeinfo; struct tm * timeinfo;
timeinfo = localtime(&now); timeinfo = localtime(&now);
/* PRINTABLE characters: Add to line */ /* Add printable characters to line */
if (isprint(key)) { if (isprint(key)) {
if (ctx->pos != sizeof(ctx->line)-1) { if (ctx->pos != sizeof(ctx->line)-1) {
ctx->line[ctx->pos++] = key; ctx->line[ctx->pos++] = key;
@ -151,12 +145,15 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
wclear(self->window); wclear(self->window);
wclear(ctx->history); wclear(ctx->history);
} }
else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h")) else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
print_help(ctx); print_help(ctx);
else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) { else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
endwin(); endwin();
exit(0); exit(0);
} }
else if (!strncmp(cmd, "/status ", strlen("/status "))) { else if (!strncmp(cmd, "/status ", strlen("/status "))) {
char *msg; char *msg;
msg = strchr(cmd, ' '); msg = strchr(cmd, ' ');
@ -168,6 +165,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(ctx->history, "Status set to: %s\n", msg); wprintw(ctx->history, "Status set to: %s\n", msg);
} }
else if (!strncmp(cmd, "/nick ", strlen("/nick "))) { else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
char *nick; char *nick;
nick = strchr(cmd, ' '); nick = strchr(cmd, ' ');
@ -179,6 +177,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
setname((uint8_t*) nick, strlen(nick)+1); setname((uint8_t*) nick, strlen(nick)+1);
wprintw(ctx->history, "Nickname set to: %s\n", nick); wprintw(ctx->history, "Nickname set to: %s\n", nick);
} }
else if (!strcmp(cmd, "/myid")) { else if (!strcmp(cmd, "/myid")) {
char id[32*2 + 1] = {0}; char id[32*2 + 1] = {0};
int i; int i;
@ -189,48 +188,46 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
} }
wprintw(ctx->history, "Your ID: %s\n", id); wprintw(ctx->history, "Your ID: %s\n", id);
} }
else if (strcmp(ctx->line, "/close") == 0) { else if (strcmp(ctx->line, "/close") == 0) {
w_active = 0; // Go to prompt screen active_window = 0; // Go to prompt screen
int f_num = ctx->friendnum; int f_num = ctx->friendnum;
delwin(ctx->linewin); delwin(ctx->linewin);
del_window(self, f_num); del_window(self, f_num);
} }
else else
wprintw(ctx->history, "Invalid command.\n"); wprintw(ctx->history, "Invalid command.\n");
} }
static void chat_onDraw(ToxWindow* self) { static void chat_onDraw(ToxWindow *self)
{
curs_set(1); curs_set(1);
int x, y; int x, y;
ChatContext *ctx = (ChatContext*) self->x; ChatContext *ctx = (ChatContext*) self->x;
getmaxyx(self->window, y, x); getmaxyx(self->window, y, x);
(void) x; (void) x;
if(y < 3) if (y < 3) return;
return;
wclear(ctx->linewin); wclear(ctx->linewin);
mvwhline(ctx->linewin, 0, 0, '_', COLS); mvwhline(ctx->linewin, 0, 0, '_', COLS);
mvwprintw(self->window, y-1, 0, "%s\n", ctx->line); mvwprintw(self->window, y-1, 0, "%s\n", ctx->line);
wrefresh(self->window); wrefresh(self->window);
} }
static void chat_onInit(ToxWindow* self) { static void chat_onInit(ToxWindow *self)
{
int x, y; int x, y;
ChatContext *ctx = (ChatContext*) self->x; ChatContext *ctx = (ChatContext*) self->x;
getmaxyx(self->window, y, x); getmaxyx(self->window, y, x);
ctx->history = subwin(self->window, y - 4, x, 0, 0); ctx->history = subwin(self->window, y - 4, x, 0, 0);
scrollok(ctx->history, 1); scrollok(ctx->history, 1);
ctx->linewin = subwin(self->window, 2, x, y - 3, 0); ctx->linewin = subwin(self->window, 2, x, y - 3, 0);
print_help(ctx); print_help(ctx);
} }
void print_help(ChatContext* self) { void print_help(ChatContext *self)
{
wattron(self->history, COLOR_PAIR(2) | A_BOLD); wattron(self->history, COLOR_PAIR(2) | A_BOLD);
wprintw(self->history, "Commands:\n"); wprintw(self->history, "Commands:\n");
wattroff(self->history, A_BOLD); wattroff(self->history, A_BOLD);
@ -246,9 +243,9 @@ void print_help(ChatContext* self) {
wattroff(self->history, COLOR_PAIR(2)); wattroff(self->history, COLOR_PAIR(2));
} }
ToxWindow new_chat(int friendnum) { ToxWindow new_chat(int friendnum)
{
ToxWindow ret; ToxWindow ret;
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.onKey = &chat_onKey; ret.onKey = &chat_onKey;
@ -266,7 +263,6 @@ ToxWindow new_chat(int friendnum) {
ChatContext *x = calloc(1, sizeof(ChatContext)); ChatContext *x = calloc(1, sizeof(ChatContext));
x->friendnum = friendnum; x->friendnum = friendnum;
ret.x = (void*) x; ret.x = (void*) x;
return ret; return ret;
} }

72
friendlist.c
View File

@ -15,7 +15,8 @@
extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM]; extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
extern int add_window(ToxWindow w, int n); extern int add_window(ToxWindow w, int n);
extern ToxWindow new_chat(int friendnum); extern ToxWindow new_chat(int friendnum);
extern int w_active;
extern int active_window;
typedef struct { typedef struct {
uint8_t name[MAX_NAME_LENGTH]; uint8_t name[MAX_NAME_LENGTH];
@ -28,26 +29,21 @@ static friend_t friends[MAX_FRIENDS_NUM];
static int num_friends = 0; static int num_friends = 0;
static int num_selected = 0; static int num_selected = 0;
void fix_name(uint8_t *name)
void fix_name(uint8_t* name) { {
/* Remove all non alphanumeric characters */
// Remove all non alphanumeric characters.
uint8_t *p = name; uint8_t *p = name;
uint8_t *q = name; uint8_t *q = name;
while(*p != 0) { while(*p != 0) {
if(isprint(*p)) { if (isprint(*p))
*q++ = *p; *q++ = *p;
}
p++; p++;
} }
*q = 0; *q = 0;
} }
void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len) { void friendlist_onMessage(ToxWindow *self, int num, uint8_t *str, uint16_t len)
{
if (num >= num_friends) if (num >= num_friends)
return; return;
@ -55,19 +51,19 @@ void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len)
friends[num].chatwin = num; friends[num].chatwin = num;
int i; int i;
/* Find first open slot to hold chat window */ /* Find first open slot to hold chat window */
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
if (WINDOW_STATUS[i] == -1) { if (WINDOW_STATUS[i] == -1) {
WINDOW_STATUS[i] = num; WINDOW_STATUS[i] = num;
add_window(new_chat(num), i); add_window(new_chat(num), i);
w_active = i; active_window = i;
break; break;
} }
} }
} }
} }
void friendlist_onNickChange(ToxWindow* self, int num, uint8_t* str, uint16_t len) { void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
{
if (len >= MAX_NAME_LENGTH || num >= num_friends) if (len >= MAX_NAME_LENGTH || num >= num_friends)
return; return;
@ -76,8 +72,8 @@ void friendlist_onNickChange(ToxWindow* self, int num, uint8_t* str, uint16_t le
fix_name(friends[num].name); fix_name(friends[num].name);
} }
void friendlist_onStatusChange(ToxWindow* self, int num, uint8_t* str, uint16_t len) { void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t len)
{
if (len >= MAX_USERSTATUS_LENGTH || num >= num_friends) if (len >= MAX_USERSTATUS_LENGTH || num >= num_friends)
return; return;
@ -86,8 +82,8 @@ void friendlist_onStatusChange(ToxWindow* self, int num, uint8_t* str, uint16_t
fix_name(friends[num].status); fix_name(friends[num].status);
} }
int friendlist_onFriendAdded(int num) { int friendlist_onFriendAdded(int num)
{
if (num_friends == MAX_FRIENDS_NUM) if (num_friends == MAX_FRIENDS_NUM)
return -1; return -1;
@ -99,10 +95,10 @@ int friendlist_onFriendAdded(int num) {
return 0; return 0;
} }
static void friendlist_onKey(ToxWindow* self, int key) { static void friendlist_onKey(ToxWindow *self, int key)
{
if (key == KEY_UP) { if (key == KEY_UP) {
num_selected--; if (--num_selected < 0)
if (num_selected < 0)
num_selected = num_friends-1; num_selected = num_friends-1;
} }
else if (key == KEY_DOWN) { else if (key == KEY_DOWN) {
@ -113,20 +109,20 @@ static void friendlist_onKey(ToxWindow* self, int key) {
/* Jump to chat window if already open */ /* Jump to chat window if already open */
if (friends[num_selected].chatwin != -1) { if (friends[num_selected].chatwin != -1) {
int i; int i;
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
if (WINDOW_STATUS[i] == num_selected) { if (WINDOW_STATUS[i] == num_selected) {
w_active = i; active_window = i;
break; break;
} }
} }
}else { }else {
int i; int i;
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
if (WINDOW_STATUS[i] == -1) { if (WINDOW_STATUS[i] == -1) {
WINDOW_STATUS[i] = num_selected; WINDOW_STATUS[i] = num_selected;
friends[num_selected].chatwin = num_selected; friends[num_selected].chatwin = num_selected;
add_window(new_chat(num_selected), i); add_window(new_chat(num_selected), i);
w_active = i; active_window = i;
break; break;
} }
} }
@ -134,12 +130,10 @@ static void friendlist_onKey(ToxWindow* self, int key) {
} }
} }
static void friendlist_onDraw(ToxWindow* self) { static void friendlist_onDraw(ToxWindow *self)
{
curs_set(0); curs_set(0);
size_t i;
werase(self->window); werase(self->window);
if (num_friends == 0) { if (num_friends == 0) {
wprintw(self->window, "Empty. Add some friends! :-)\n"); wprintw(self->window, "Empty. Add some friends! :-)\n");
} }
@ -150,9 +144,8 @@ static void friendlist_onDraw(ToxWindow* self) {
} }
wprintw(self->window, "\n"); wprintw(self->window, "\n");
int i;
for(i=0; i<num_friends; i++) { for (i = 0; i < num_friends; ++i) {
if (i == num_selected) wattron(self->window, COLOR_PAIR(3)); if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
wprintw(self->window, " [#%d] ", friends[i].num); wprintw(self->window, " [#%d] ", friends[i].num);
if (i == num_selected) wattroff(self->window, COLOR_PAIR(3)); if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
@ -163,22 +156,21 @@ static void friendlist_onDraw(ToxWindow* self) {
wprintw(self->window, "(%s)\n", friends[i].status); wprintw(self->window, "(%s)\n", friends[i].status);
} }
wrefresh(self->window); wrefresh(self->window);
} }
void disable_chatwin(int f_num) { void disable_chatwin(int f_num)
{
friends[f_num].chatwin = -1; friends[f_num].chatwin = -1;
} }
static void friendlist_onInit(ToxWindow* self) { static void friendlist_onInit(ToxWindow *self)
{
} }
ToxWindow new_friendlist() { ToxWindow new_friendlist() {
ToxWindow ret; ToxWindow ret;
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.onKey = &friendlist_onKey; ret.onKey = &friendlist_onKey;
@ -187,7 +179,7 @@ ToxWindow new_friendlist() {
ret.onMessage = &friendlist_onMessage; ret.onMessage = &friendlist_onMessage;
ret.onNickChange = &friendlist_onNickChange; ret.onNickChange = &friendlist_onNickChange;
ret.onStatusChange = &friendlist_onStatusChange; ret.onStatusChange = &friendlist_onStatusChange;
strcpy(ret.title, "[friends]");
strcpy(ret.title, "[friends]");
return ret; return ret;
} }

151
main.c
View File

@ -20,72 +20,73 @@ extern int friendlist_onFriendAdded(int num);
extern void disable_chatwin(int f_num); extern void disable_chatwin(int f_num);
extern int add_req(uint8_t *public_key); // XXX extern int add_req(uint8_t *public_key); // XXX
char WINDOW_STATUS[MAX_WINDOW_SLOTS]; // Holds status of chat windows /* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS];
static ToxWindow windows[MAX_WINDOW_SLOTS]; static ToxWindow windows[MAX_WINDOW_SLOTS];
int w_num;
int w_active;
static ToxWindow* prompt; static ToxWindow* prompt;
// CALLBACKS START int w_num;
void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) { int active_window;
size_t i;
int n = add_req(public_key);
/* CALLBACKS START */
void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
{
int n = add_req(public_key);
wprintw(prompt->window, "\nFriend request from:\n"); wprintw(prompt->window, "\nFriend request from:\n");
for(i=0; i<32; i++) { int i;
for (i = 0; i < 32; ++i) {
wprintw(prompt->window, "%02x", public_key[i] & 0xff); wprintw(prompt->window, "%02x", public_key[i] & 0xff);
} }
wprintw(prompt->window, "\n"); wprintw(prompt->window, "\n");
wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n); wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n);
for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
for(i=0; i<MAX_WINDOW_SLOTS; i++) {
if (windows[i].onFriendRequest != NULL) if (windows[i].onFriendRequest != NULL)
windows[i].onFriendRequest(&windows[i], public_key, data, length); windows[i].onFriendRequest(&windows[i], public_key, data, length);
} }
} }
void on_message(int friendnumber, uint8_t* string, uint16_t length) { void on_message(int friendnumber, uint8_t *string, uint16_t length)
size_t i; {
wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string); wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string);
int i;
for(i=0; i<MAX_WINDOW_SLOTS; i++) { for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
if (windows[i].onMessage != NULL) if (windows[i].onMessage != NULL)
windows[i].onMessage(&windows[i], friendnumber, string, length); windows[i].onMessage(&windows[i], friendnumber, string, length);
} }
} }
void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) { void on_nickchange(int friendnumber, uint8_t *string, uint16_t length)
size_t i; {
wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string); wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
int i;
for(i=0; i<MAX_WINDOW_SLOTS; i++) { for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
if (windows[i].onNickChange != NULL) if (windows[i].onNickChange != NULL)
windows[i].onNickChange(&windows[i], friendnumber, string, length); windows[i].onNickChange(&windows[i], friendnumber, string, length);
} }
} }
void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) { void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
size_t i; {
wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string); wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
int i;
for(i=0; i<MAX_WINDOW_SLOTS; i++) { for (i=0; i<MAX_WINDOW_SLOTS; ++i) {
if (windows[i].onStatusChange != NULL) if (windows[i].onStatusChange != NULL)
windows[i].onStatusChange(&windows[i], friendnumber, string, length); windows[i].onStatusChange(&windows[i], friendnumber, string, length);
} }
} }
void on_friendadded(int friendnumber) { void on_friendadded(int friendnumber)
{
friendlist_onFriendAdded(friendnumber); friendlist_onFriendAdded(friendnumber);
} }
// CALLBACKS END /* CALLBACKS END */
static void init_term() { static void init_term()
// Setup terminal. {
/* Setup terminal */
initscr(); initscr();
cbreak(); cbreak();
keypad(stdscr, 1); keypad(stdscr, 1);
@ -99,25 +100,26 @@ static void init_term() {
init_pair(3, COLOR_RED, COLOR_BLACK); init_pair(3, COLOR_RED, COLOR_BLACK);
init_pair(4, COLOR_BLUE, COLOR_BLACK); init_pair(4, COLOR_BLUE, COLOR_BLACK);
} }
refresh(); refresh();
} }
static void init_tox() { static void init_tox()
// Init core. {
/* Init core */
initMessenger(); initMessenger();
// Callbacks. /* Callbacks */
m_callback_friendrequest(on_request); m_callback_friendrequest(on_request);
m_callback_friendmessage(on_message); m_callback_friendmessage(on_message);
m_callback_namechange(on_nickchange); m_callback_namechange(on_nickchange);
m_callback_userstatus(on_statuschange); m_callback_userstatus(on_statuschange);
} }
void init_window_status() { void init_window_status()
{
/* Default window values decrement from -2 */ /* Default window values decrement from -2 */
int i; int i;
for (i = 0; i < N_DEFAULT_WINS; i++) for (i = 0; i < N_DEFAULT_WINS; ++i)
WINDOW_STATUS[i] = -(i+2); WINDOW_STATUS[i] = -(i+2);
int j; int j;
@ -125,7 +127,8 @@ void init_window_status() {
WINDOW_STATUS[j] = -1; WINDOW_STATUS[j] = -1;
} }
int add_window(ToxWindow w, int n) { int add_window(ToxWindow w, int n)
{
if (w_num >= TOXWINDOWS_MAX_NUM) if (w_num >= TOXWINDOWS_MAX_NUM)
return -1; return -1;
@ -143,10 +146,11 @@ int add_window(ToxWindow w, int n) {
} }
/* Deletes window w and cleans up */ /* Deletes window w and cleans up */
void del_window(ToxWindow *w, int f_num) { void del_window(ToxWindow *w, int f_num)
{
delwin(w->window); delwin(w->window);
int i; int i;
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
if (WINDOW_STATUS[i] == f_num) { if (WINDOW_STATUS[i] == f_num) {
WINDOW_STATUS[i] = -1; WINDOW_STATUS[i] = -1;
disable_chatwin(f_num); disable_chatwin(f_num);
@ -157,7 +161,8 @@ void del_window(ToxWindow *w, int f_num) {
refresh(); refresh();
} }
static void init_windows() { static void init_windows()
{
w_num = 0; w_num = 0;
int n_prompt = 0; int n_prompt = 0;
int n_friendslist = 1; int n_friendslist = 1;
@ -170,9 +175,9 @@ static void init_windows() {
prompt = &windows[n_prompt]; prompt = &windows[n_prompt];
} }
static void do_tox() { static void do_tox()
{
static bool dht_on = false; static bool dht_on = false;
if (!dht_on && DHT_isconnected()) { if (!dht_on && DHT_isconnected()) {
dht_on = true; dht_on = true;
wprintw(prompt->window, "\nDHT connected!\n"); wprintw(prompt->window, "\nDHT connected!\n");
@ -181,11 +186,11 @@ static void do_tox() {
dht_on = false; dht_on = false;
wprintw(prompt->window, "\nDHT disconnected!\n"); wprintw(prompt->window, "\nDHT disconnected!\n");
} }
doMessenger(); doMessenger();
} }
static void load_data(char *path) { static void load_data(char *path)
{
FILE *fd; FILE *fd;
size_t len; size_t len;
uint8_t *buf; uint8_t *buf;
@ -196,42 +201,34 @@ static void load_data(char *path) {
fseek(fd, 0, SEEK_SET); fseek(fd, 0, SEEK_SET);
buf = malloc(len); buf = malloc(len);
if (buf == NULL) { if (buf == NULL) {
fprintf(stderr, "malloc() failed.\n"); fprintf(stderr, "malloc() failed.\n");
fclose(fd); fclose(fd);
endwin(); endwin();
exit(1); exit(1);
} }
if (fread(buf, len, 1, fd) != 1){ if (fread(buf, len, 1, fd) != 1){
fprintf(stderr, "fread() failed.\n"); fprintf(stderr, "fread() failed.\n");
free(buf); free(buf);
fclose(fd); fclose(fd);
endwin(); endwin();
exit(1); exit(1);
} }
Messenger_load(buf, len); Messenger_load(buf, len);
} }
else { else {
len = Messenger_size(); len = Messenger_size();
buf = malloc(len); buf = malloc(len);
if (buf == NULL) { if (buf == NULL) {
fprintf(stderr, "malloc() failed.\n"); fprintf(stderr, "malloc() failed.\n");
endwin(); endwin();
exit(1); exit(1);
} }
Messenger_save(buf); Messenger_save(buf);
fd = fopen(path, "w"); fd = fopen(path, "w");
if (fd == NULL) { if (fd == NULL) {
fprintf(stderr, "fopen() failed.\n"); fprintf(stderr, "fopen() failed.\n");
free(buf); free(buf);
endwin(); endwin();
exit(1); exit(1);
@ -239,19 +236,18 @@ static void load_data(char *path) {
if (fwrite(buf, len, 1, fd) != 1){ if (fwrite(buf, len, 1, fd) != 1){
fprintf(stderr, "fwrite() failed.\n"); fprintf(stderr, "fwrite() failed.\n");
free(buf); free(buf);
fclose(fd); fclose(fd);
endwin(); endwin();
exit(1); exit(1);
} }
} }
free(buf); free(buf);
fclose(fd); fclose(fd);
} }
static void draw_bar() { static void draw_bar()
{
static int odd = 0; static int odd = 0;
attron(COLOR_PAIR(4)); attron(COLOR_PAIR(4));
@ -265,9 +261,9 @@ static void draw_bar() {
attroff(COLOR_PAIR(4) | A_BOLD); attroff(COLOR_PAIR(4) | A_BOLD);
int i; int i;
for (i = 0; i < (MAX_WINDOW_SLOTS-1); i++) { for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
if (WINDOW_STATUS[i] != -1) { if (WINDOW_STATUS[i] != -1) {
if (i == w_active) if (i == active_window)
attron(A_BOLD); attron(A_BOLD);
odd = (odd+1) % 10; odd = (odd+1) % 10;
@ -279,7 +275,7 @@ static void draw_bar() {
if (windows[i].blink && (odd < 5)) { if (windows[i].blink && (odd < 5)) {
attron(COLOR_PAIR(3)); attron(COLOR_PAIR(3));
} }
if(i == w_active) { if (i == active_window) {
attroff(A_BOLD); attroff(A_BOLD);
} }
} }
@ -287,20 +283,22 @@ static void draw_bar() {
refresh(); refresh();
} }
void prepare_window(WINDOW* w) { void prepare_window(WINDOW *w)
{
mvwin(w, 0, 0); mvwin(w, 0, 0);
wresize(w, LINES-2, COLS); wresize(w, LINES-2, COLS);
} }
/* Shows next window when tab or back-tab is pressed */ /* Shows next window when tab or back-tab is pressed */
void set_active_window(int ch) { void set_active_window(int ch)
{
int f_inf = 0; int f_inf = 0;
int max = MAX_WINDOW_SLOTS-1; int max = MAX_WINDOW_SLOTS-1;
if (ch == '\t') { if (ch == '\t') {
int i = (w_active + 1) % max; int i = (active_window + 1) % max;
while (true) { while (true) {
if (WINDOW_STATUS[i] != -1) { if (WINDOW_STATUS[i] != -1) {
w_active = i; active_window = i;
return; return;
} }
i = (i + 1) % max; i = (i + 1) % max;
@ -311,11 +309,11 @@ void set_active_window(int ch) {
} }
} }
}else { }else {
int i = w_active - 1; int i = active_window - 1;
if (i < 0) i = max; if (i < 0) i = max;
while (true) { while (true) {
if (WINDOW_STATUS[i] != -1) { if (WINDOW_STATUS[i] != -1) {
w_active = i; active_window = i;
return; return;
} }
if (--i < 0) i = max; if (--i < 0) i = max;
@ -328,26 +326,26 @@ void set_active_window(int ch) {
} }
} }
int main(int argc, char* argv[]) { int main(int argc, char *argv[])
{
int ch; int ch;
int i = 0;
int f_flag = 0; int f_flag = 0;
char *filename = "data"; char *filename = "data";
ToxWindow* a; ToxWindow* a;
for(i = 0; i < argc; i++) { int i = 0;
if (argv[i] == NULL){ for (i = 0; i < argc; ++i) {
if (argv[i] == NULL)
break; break;
} else if(argv[i][0] == '-') { else if (argv[i][0] == '-') {
if (argv[i][1] == 'f') { if (argv[i][1] == 'f') {
if (argv[i + 1] != NULL) if (argv[i + 1] != NULL)
filename = argv[i + 1]; filename = argv[i + 1];
else { else
f_flag = -1; f_flag = -1;
} }
} }
} }
}
init_term(); init_term();
init_tox(); init_tox();
@ -363,26 +361,23 @@ int main(int argc, char* argv[]) {
} }
while(true) { while(true) {
// Update tox. /* Update tox */
do_tox(); do_tox();
// Draw. /* Draw */
a = &windows[w_active]; a = &windows[active_window];
prepare_window(a->window); prepare_window(a->window);
a->blink = false; a->blink = false;
draw_bar(); draw_bar();
a->onDraw(a); a->onDraw(a);
// Handle input. /* Handle input */
ch = getch(); ch = getch();
if (ch == '\t' || ch == KEY_BTAB) if (ch == '\t' || ch == KEY_BTAB)
set_active_window(ch); set_active_window(ch);
else if (ch != ERR) { else if (ch != ERR) {
a->onKey(a, ch); a->onKey(a, ch);
} }
else if(ch != ERR) {
a->onKey(a, ch);
}
} }
return 0; return 0;
} }

140
prompt.c
View File

@ -17,12 +17,14 @@ uint8_t num_requests=0; // XXX
extern void on_friendadded(int friendnumber); extern void on_friendadded(int friendnumber);
static void print_usage(ToxWindow *self); static void print_usage(ToxWindow *self);
static char prompt_buf[256] = {0};
static int prompt_buf_pos = 0;
// XXX: // XXX:
int add_req(uint8_t* public_key) { int add_req(uint8_t *public_key)
{
memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE); memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
++num_requests; ++num_requests;
return num_requests-1; return num_requests-1;
} }
@ -38,15 +40,12 @@ unsigned char * hex_string_to_bin(char hex_string[])
return val; return val;
} }
static char prompt_buf[256] = {0}; static void execute(ToxWindow *self, char *u_cmd)
static int prompt_buf_pos=0; {
static void execute(ToxWindow* self, char* u_cmd) {
int i;
int newlines = 0; int newlines = 0;
char cmd[256] = {0}; char cmd[256] = {0};
for(i = 0; i < strlen(prompt_buf); i++) int i;
{ for (i = 0; i < strlen(prompt_buf); ++i) {
if (u_cmd[i] == '\n') if (u_cmd[i] == '\n')
++newlines; ++newlines;
else else
@ -57,20 +56,17 @@ static void execute(ToxWindow* self, char* u_cmd) {
endwin(); endwin();
exit(0); exit(0);
} }
else if(!strncmp(cmd, "connect ", strlen("connect "))) {
char* ip;
char* port;
char* key;
IP_Port dht;
ip = strchr(cmd, ' '); else if (!strncmp(cmd, "connect ", strlen("connect "))) {
IP_Port dht;
char *ip = strchr(cmd, ' ');
if (ip == NULL) { if (ip == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
ip++; ip++;
port = strchr(ip, ' '); char *port = strchr(ip, ' ');
if (port == NULL) { if (port == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
@ -78,7 +74,7 @@ static void execute(ToxWindow* self, char* u_cmd) {
port[0] = 0; port[0] = 0;
port++; port++;
key = strchr(port, ' '); char *key = strchr(port, ' ');
if (key == NULL) { if (key == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
@ -92,7 +88,6 @@ static void execute(ToxWindow* self, char* u_cmd) {
} }
dht.port = htons(atoi(port)); dht.port = htons(atoi(port));
uint32_t resolved_address = resolve_addr(ip); uint32_t resolved_address = resolve_addr(ip);
if (resolved_address == 0) { if (resolved_address == 0) {
return; return;
@ -103,49 +98,39 @@ static void execute(ToxWindow* self, char* u_cmd) {
DHT_bootstrap(dht, binary_string); DHT_bootstrap(dht, binary_string);
free(binary_string); free(binary_string);
} }
else if (!strncmp(cmd, "add ", strlen("add "))) { else if (!strncmp(cmd, "add ", strlen("add "))) {
uint8_t id_bin[32]; uint8_t id_bin[32];
size_t i;
char xx[3]; char xx[3];
uint32_t x; uint32_t x;
char *id = strchr(cmd, ' ');
char* id;
char* msg;
int num;
id = strchr(cmd, ' ');
if (id == NULL) { if (id == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
id++; id++;
char *msg = strchr(id, ' ');
msg = strchr(id, ' ');
if (msg != NULL) { if (msg != NULL) {
msg[0] = 0; msg[0] = 0;
msg++; msg++;
} }
else msg = ""; else msg = "";
if (strlen(id) != 2*32) { if (strlen(id) != 2*32) {
wprintw(self->window, "Invalid ID length.\n"); wprintw(self->window, "Invalid ID length.\n");
return; return;
} }
int i;
for(i=0; i<32; i++) { for (i = 0; i < 32; ++i) {
xx[0] = id[2*i]; xx[0] = id[2*i];
xx[1] = id[2*i+1]; xx[1] = id[2*i+1];
xx[2] = '\0'; xx[2] = '\0';
if (sscanf(xx, "%02x", &x) != 1) { if (sscanf(xx, "%02x", &x) != 1) {
wprintw(self->window, "Invalid ID.\n"); wprintw(self->window, "Invalid ID.\n");
return; return;
} }
id_bin[i] = x; id_bin[i] = x;
} }
int num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
switch (num) { switch (num) {
case -1: case -1:
wprintw(self->window, "Message is too long.\n"); wprintw(self->window, "Message is too long.\n");
@ -168,129 +153,116 @@ static void execute(ToxWindow* self, char* u_cmd) {
break; break;
} }
} }
else if (!strcmp(cmd, "clear")) { else if (!strcmp(cmd, "clear")) {
wclear(self->window); wclear(self->window);
} }
else if (!strcmp(cmd, "help")) { else if (!strcmp(cmd, "help")) {
wclear(self->window); wclear(self->window);
print_usage(self); print_usage(self);
} }
else if(!strncmp(cmd, "status ", strlen("status "))) {
char* msg;
msg = strchr(cmd, ' '); else if (!strncmp(cmd, "status ", strlen("status "))) {
char *msg = strchr(cmd, ' ');
if (msg == NULL) { if (msg == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
msg++; msg++;
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1); m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(self->window, "Status set to: %s\n", msg); wprintw(self->window, "Status set to: %s\n", msg);
} }
else if(!strncmp(cmd, "nick ", strlen("nick "))) {
char* nick;
nick = strchr(cmd, ' '); else if (!strncmp(cmd, "nick ", strlen("nick "))) {
char *nick = strchr(cmd, ' ');
if (nick == NULL) { if (nick == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
nick++; nick++;
setname((uint8_t*) nick, strlen(nick)+1); setname((uint8_t*) nick, strlen(nick)+1);
wprintw(self->window, "Nickname set to: %s\n", nick); wprintw(self->window, "Nickname set to: %s\n", nick);
} }
else if (!strcmp(cmd, "myid")) { else if (!strcmp(cmd, "myid")) {
char id[32*2 + 1] = {0}; char id[32*2 + 1] = {0};
size_t i; size_t i;
for (i = 0; i < 32; ++i) {
for(i=0; i<32; i++) {
char xx[3]; char xx[3];
snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff); snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
strcat(id, xx); strcat(id, xx);
} }
wprintw(self->window, "Your ID: %s\n", id); wprintw(self->window, "Your ID: %s\n", id);
} }
else if(!strncmp(cmd, "accept ", strlen("accept "))) {
char* id;
int num;
id = strchr(cmd, ' '); else if (!strncmp(cmd, "accept ", strlen("accept "))) {
char *id = strchr(cmd, ' ');
if (id == NULL) { if (id == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
id++; id++;
num = atoi(id); int num = atoi(id);
if (num >= num_requests) { if (num >= num_requests) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
num = m_addfriend_norequest(pending_requests[num]); num = m_addfriend_norequest(pending_requests[num]);
if (num == -1)
if(num == -1) {
wprintw(self->window, "Failed to add friend.\n"); wprintw(self->window, "Failed to add friend.\n");
}
else { else {
wprintw(self->window, "Friend accepted as: %d.\n", num); wprintw(self->window, "Friend accepted as: %d.\n", num);
on_friendadded(num); on_friendadded(num);
} }
} }
else if (!strncmp(cmd, "msg ", strlen("msg "))) { else if (!strncmp(cmd, "msg ", strlen("msg "))) {
char* id; char *id = strchr(cmd, ' ');
char* msg;
id = strchr(cmd, ' ');
if (id == NULL) { if (id == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
id++; char *msg = strchr(++id, ' ');
msg = strchr(id, ' ');
if (msg == NULL) { if (msg == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
msg[0] = 0; msg[0] = 0;
msg++; msg++;
if (m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0)
if(m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0) {
wprintw(self->window, "Error occurred while sending message.\n"); wprintw(self->window, "Error occurred while sending message.\n");
} else
else {
wprintw(self->window, "Message successfully sent.\n"); wprintw(self->window, "Message successfully sent.\n");
} }
} else
else {
wprintw(self->window, "Invalid command.\n"); wprintw(self->window, "Invalid command.\n");
} }
}
static void prompt_onKey(ToxWindow* self, int key) { static void prompt_onKey(ToxWindow *self, int key)
// PRINTABLE characters: Add to line. {
/* Add printable characters to line */
if (isprint(key)) { if (isprint(key)) {
if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) { if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
wprintw(self->window, "\nToo Long.\n"); wprintw(self->window, "\nToo Long.\n");
prompt_buf_pos = 0; prompt_buf_pos = 0;
prompt_buf[0] = 0; prompt_buf[0] = 0;
} }
else if(!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS) && (prompt_buf_pos % (COLS - 3) == 0)) { else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
&& (prompt_buf_pos % (COLS - 3) == 0)) {
prompt_buf[prompt_buf_pos++] = '\n'; prompt_buf[prompt_buf_pos++] = '\n';
} }
else if(!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS) && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) { else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
&& ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) {
prompt_buf[prompt_buf_pos++] = '\n'; prompt_buf[prompt_buf_pos++] = '\n';
} }
prompt_buf[prompt_buf_pos++] = key; prompt_buf[prompt_buf_pos++] = key;
prompt_buf[prompt_buf_pos] = 0; prompt_buf[prompt_buf_pos] = 0;
} }
// RETURN key: execute command. /* RETURN key: execute command */
else if (key == '\n') { else if (key == '\n') {
wprintw(self->window, "\n"); wprintw(self->window, "\n");
execute(self, prompt_buf); execute(self, prompt_buf);
@ -298,7 +270,7 @@ static void prompt_onKey(ToxWindow* self, int key) {
prompt_buf[0] = 0; prompt_buf[0] = 0;
} }
// BACKSPACE key: Remove one character from line. /* BACKSPACE key: Remove one character from line */
else if (key == 0x107 || key == 0x8 || key == 0x7f) { else if (key == 0x107 || key == 0x8 || key == 0x7f) {
if (prompt_buf_pos != 0) { if (prompt_buf_pos != 0) {
prompt_buf[--prompt_buf_pos] = 0; prompt_buf[--prompt_buf_pos] = 0;
@ -306,17 +278,18 @@ static void prompt_onKey(ToxWindow* self, int key) {
} }
} }
static void prompt_onDraw(ToxWindow* self) { static void prompt_onDraw(ToxWindow *self)
{
curs_set(1); curs_set(1);
int x, y; int x, y;
getyx(self->window, y, x); getyx(self->window, y, x);
(void) x; (void) x;
int i; int i;
for (i = 0; i < (strlen(prompt_buf)); i++) for (i = 0; i < (strlen(prompt_buf)); ++i) {
{
if ((prompt_buf[i] == '\n') && (y != 0)) if ((prompt_buf[i] == '\n') && (y != 0))
--y; --y;
} }
wattron(self->window, COLOR_PAIR(1)); wattron(self->window, COLOR_PAIR(1));
mvwprintw(self->window, y, 0, "# "); mvwprintw(self->window, y, 0, "# ");
wattroff(self->window, COLOR_PAIR(1)); wattroff(self->window, COLOR_PAIR(1));
@ -325,7 +298,8 @@ static void prompt_onDraw(ToxWindow* self) {
wrefresh(self->window); wrefresh(self->window);
} }
static void print_usage(ToxWindow* self) { static void print_usage(ToxWindow *self)
{
wattron(self->window, COLOR_PAIR(2) | A_BOLD); wattron(self->window, COLOR_PAIR(2) | A_BOLD);
wprintw(self->window, "Commands:\n"); wprintw(self->window, "Commands:\n");
wattroff(self->window, A_BOLD); wattroff(self->window, A_BOLD);
@ -347,22 +321,20 @@ static void print_usage(ToxWindow* self) {
wattroff(self->window, COLOR_PAIR(2)); wattroff(self->window, COLOR_PAIR(2));
} }
static void prompt_onInit(ToxWindow* self) { static void prompt_onInit(ToxWindow *self)
{
scrollok(self->window, 1); scrollok(self->window, 1);
print_usage(self); print_usage(self);
wclrtoeol(self->window); wclrtoeol(self->window);
} }
ToxWindow new_prompt() { ToxWindow new_prompt()
{
ToxWindow ret; ToxWindow ret;
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
ret.onKey = &prompt_onKey; ret.onKey = &prompt_onKey;
ret.onDraw = &prompt_onDraw; ret.onDraw = &prompt_onDraw;
ret.onInit = &prompt_onInit; ret.onInit = &prompt_onInit;
strcpy(ret.title, "[prompt]"); strcpy(ret.title, "[prompt]");
return ret; return ret;
} }