mirror of
https://github.com/Tha14/toxic.git
synced 2024-07-03 18:17:46 +02:00
Passed everything through astyle.
This commit is contained in:
irungentoo
parent
9f9ca0a971
commit
9dce121a76
85
chat.c
85
chat.c
|
|
@ -22,8 +22,8 @@ typedef struct {
|
|||
int friendnum;
|
||||
char line[MAX_STR_SIZE];
|
||||
size_t pos;
|
||||
WINDOW* history;
|
||||
WINDOW* linewin;
|
||||
WINDOW *history;
|
||||
WINDOW *linewin;
|
||||
} ChatContext;
|
||||
|
||||
void print_help(ChatContext *self);
|
||||
|
|
@ -40,16 +40,16 @@ struct tm *get_time(void)
|
|||
|
||||
static void chat_onMessage(ToxWindow *self, Messenger *m, 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};
|
||||
struct tm *timeinfo = get_time();
|
||||
|
||||
if (ctx->friendnum != num)
|
||||
return;
|
||||
|
||||
getname(m, num, (uint8_t*) &nick);
|
||||
msg[len-1] = '\0';
|
||||
nick[MAX_NAME_LENGTH-1] = '\0';
|
||||
getname(m, num, (uint8_t *) &nick);
|
||||
msg[len - 1] = '\0';
|
||||
nick[MAX_NAME_LENGTH - 1] = '\0';
|
||||
fix_name(msg);
|
||||
fix_name(nick);
|
||||
|
||||
|
|
@ -67,13 +67,13 @@ static void chat_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *msg,
|
|||
|
||||
static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *action, uint16_t len)
|
||||
{
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->x;
|
||||
struct tm *timeinfo = get_time();
|
||||
|
||||
if (ctx->friendnum != num)
|
||||
return;
|
||||
|
||||
action[len-1] = '\0';
|
||||
action[len - 1] = '\0';
|
||||
fix_name(action);
|
||||
|
||||
wattron(ctx->history, COLOR_PAIR(2));
|
||||
|
|
@ -90,8 +90,9 @@ static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *actio
|
|||
|
||||
static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)
|
||||
{
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->x;
|
||||
struct tm *timeinfo = get_time();
|
||||
|
||||
if (ctx->friendnum != num)
|
||||
return;
|
||||
|
||||
|
|
@ -99,7 +100,7 @@ static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t
|
|||
wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wattroff(ctx->history, COLOR_PAIR(2));
|
||||
|
||||
nick[len-1] = '\0';
|
||||
nick[len - 1] = '\0';
|
||||
fix_name(nick);
|
||||
snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
|
||||
|
||||
|
|
@ -110,8 +111,9 @@ static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t
|
|||
|
||||
static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len)
|
||||
{
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->x;
|
||||
struct tm *timeinfo = get_time();
|
||||
|
||||
if (ctx->friendnum != num)
|
||||
return;
|
||||
|
||||
|
|
@ -119,7 +121,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
|
|||
wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wattroff(ctx->history, COLOR_PAIR(2));
|
||||
|
||||
status[len-1] = '\0';
|
||||
status[len - 1] = '\0';
|
||||
fix_name(status);
|
||||
snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
|
||||
|
||||
|
|
@ -134,14 +136,14 @@ int string_is_empty(char *string)
|
|||
{
|
||||
int rc = 0;
|
||||
char *copy = strdup(string);
|
||||
rc = ((strtok(copy, " ") == NULL) ? 1:0);
|
||||
rc = ((strtok(copy, " ") == NULL) ? 1 : 0);
|
||||
free(copy);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void chat_onKey(ToxWindow *self, Messenger *m, int key)
|
||||
{
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->x;
|
||||
struct tm *timeinfo = get_time();
|
||||
|
||||
int x, y, y2, x2;
|
||||
|
|
@ -150,7 +152,7 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
|
||||
/* Add printable chars to buffer and print on input space */
|
||||
if (isprint(key)) {
|
||||
if (ctx->pos != sizeof(ctx->line)-1) {
|
||||
if (ctx->pos != sizeof(ctx->line) - 1) {
|
||||
mvwaddch(self->window, y, x, key);
|
||||
ctx->line[ctx->pos++] = key;
|
||||
ctx->line[ctx->pos] = '\0';
|
||||
|
|
@ -161,18 +163,20 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
else if (key == 0x107 || key == 0x8 || key == 0x7f) {
|
||||
if (ctx->pos > 0) {
|
||||
ctx->line[--ctx->pos] = '\0';
|
||||
|
||||
if (x == 0)
|
||||
mvwdelch(self->window, y-1, x2-1);
|
||||
mvwdelch(self->window, y - 1, x2 - 1);
|
||||
else
|
||||
mvwdelch(self->window, y, x-1);
|
||||
mvwdelch(self->window, y, x - 1);
|
||||
}
|
||||
}
|
||||
|
||||
/* RETURN key: Execute command or print line */
|
||||
else if (key == '\n') {
|
||||
wclear(ctx->linewin);
|
||||
wmove(self->window, y2-CURS_Y_OFFSET, 0);
|
||||
wmove(self->window, y2 - CURS_Y_OFFSET, 0);
|
||||
wclrtobot(self->window);
|
||||
|
||||
if (ctx->line[0] == '/')
|
||||
execute(self, ctx, m, ctx->line);
|
||||
else {
|
||||
|
|
@ -189,13 +193,15 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
wprintw(ctx->history, "%s: ", selfname);
|
||||
wattroff(ctx->history, COLOR_PAIR(1));
|
||||
wprintw(ctx->history, "%s\n", ctx->line);
|
||||
if (m_sendmessage(m, ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) == 0) {
|
||||
|
||||
if (m_sendmessage(m, ctx->friendnum, (uint8_t *) ctx->line, strlen(ctx->line) + 1) == 0) {
|
||||
wattron(ctx->history, COLOR_PAIR(3));
|
||||
wprintw(ctx->history, " * Failed to send message.\n");
|
||||
wattroff(ctx->history, COLOR_PAIR(3));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ctx->line[0] = '\0';
|
||||
ctx->pos = 0;
|
||||
}
|
||||
|
|
@ -209,7 +215,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
int x, y;
|
||||
getmaxyx(self->window, y, x);
|
||||
(void) x;
|
||||
wmove(self->window, y-CURS_Y_OFFSET, 0);
|
||||
wmove(self->window, y - CURS_Y_OFFSET, 0);
|
||||
}
|
||||
|
||||
else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
|
||||
|
|
@ -223,10 +229,12 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
else if (!strncmp(cmd, "/me ", strlen("/me "))) {
|
||||
struct tm *timeinfo = get_time();
|
||||
char *action = strchr(cmd, ' ');
|
||||
|
||||
if (action == NULL) {
|
||||
wprintw(self->window, "Invalid syntax.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
action++;
|
||||
|
||||
wattron(ctx->history, COLOR_PAIR(2));
|
||||
|
|
@ -235,13 +243,14 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
|
||||
uint8_t selfname[MAX_NAME_LENGTH];
|
||||
int len = getself_name(m, selfname, sizeof(selfname));
|
||||
char msg[MAX_STR_SIZE-len-4];
|
||||
snprintf(msg, sizeof(msg), "* %s %s\n", (uint8_t*) selfname, action);
|
||||
char msg[MAX_STR_SIZE - len - 4];
|
||||
snprintf(msg, sizeof(msg), "* %s %s\n", (uint8_t *) selfname, action);
|
||||
|
||||
wattron(ctx->history, COLOR_PAIR(5));
|
||||
wprintw(ctx->history, msg);
|
||||
wattroff(ctx->history, COLOR_PAIR(5));
|
||||
if (m_sendaction(m, ctx->friendnum, (uint8_t*) msg, strlen(msg)+1) < 0) {
|
||||
|
||||
if (m_sendaction(m, ctx->friendnum, (uint8_t *) msg, strlen(msg) + 1) < 0) {
|
||||
wattron(ctx->history, COLOR_PAIR(3));
|
||||
wprintw(ctx->history, " * Failed to send action\n");
|
||||
wattroff(ctx->history, COLOR_PAIR(3));
|
||||
|
|
@ -252,12 +261,15 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
char *status = strchr(cmd, ' ');
|
||||
char *msg;
|
||||
char *status_text;
|
||||
|
||||
if (status == NULL) {
|
||||
wprintw(ctx->history, "Invalid syntax.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
status++;
|
||||
USERSTATUS status_kind;
|
||||
|
||||
if (!strncmp(status, "online", strlen("online"))) {
|
||||
status_kind = USERSTATUS_NONE;
|
||||
status_text = "ONLINE";
|
||||
|
|
@ -279,14 +291,14 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
}
|
||||
|
||||
msg = strchr(status, ' ');
|
||||
|
||||
if (msg == NULL) {
|
||||
m_set_userstatus(m, status_kind);
|
||||
wprintw(ctx->history, "Status set to: %s\n", status_text);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
msg++;
|
||||
m_set_userstatus(m, status_kind);
|
||||
m_set_statusmessage(m, ( uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_statusmessage(m, ( uint8_t *) msg, strlen(msg) + 1);
|
||||
wprintw(ctx->history, "Status set to: %s, %s\n", status_text, msg);
|
||||
}
|
||||
}
|
||||
|
|
@ -294,26 +306,29 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
|
|||
else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
|
||||
char *nick;
|
||||
nick = strchr(cmd, ' ');
|
||||
|
||||
if (nick == NULL) {
|
||||
wprintw(ctx->history, "Invalid syntax.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
nick++;
|
||||
setname(m, (uint8_t*) nick, strlen(nick)+1);
|
||||
setname(m, (uint8_t *) nick, strlen(nick) + 1);
|
||||
wprintw(ctx->history, "Nickname set to: %s\n", nick);
|
||||
}
|
||||
|
||||
else if (!strcmp(cmd, "/myid")) {
|
||||
char id[FRIEND_ADDRESS_SIZE*2+1] = {0};
|
||||
char id[FRIEND_ADDRESS_SIZE * 2 + 1] = {0};
|
||||
int i;
|
||||
uint8_t address[FRIEND_ADDRESS_SIZE];
|
||||
getaddress(m, address);
|
||||
|
||||
for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
|
||||
char xx[3];
|
||||
snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
|
||||
strcat(id, xx);
|
||||
}
|
||||
|
||||
wprintw(ctx->history, "%s\n", id);
|
||||
}
|
||||
|
||||
|
|
@ -333,7 +348,7 @@ static void chat_onDraw(ToxWindow *self)
|
|||
int x, y;
|
||||
getmaxyx(self->window, y, x);
|
||||
(void) y;
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->x;
|
||||
mvwhline(ctx->linewin, 0, 0, '_', x);
|
||||
wrefresh(self->window);
|
||||
}
|
||||
|
|
@ -341,13 +356,13 @@ static void chat_onDraw(ToxWindow *self)
|
|||
static void chat_onInit(ToxWindow *self, Messenger *m)
|
||||
{
|
||||
int x, y;
|
||||
ChatContext *ctx = (ChatContext*) self->x;
|
||||
ChatContext *ctx = (ChatContext *) self->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);
|
||||
ctx->linewin = subwin(self->window, 2, x, y-4, 0);
|
||||
ctx->linewin = subwin(self->window, 2, x, y - 4, 0);
|
||||
print_help(ctx);
|
||||
wmove(self->window, y-CURS_Y_OFFSET, 0);
|
||||
wmove(self->window, y - CURS_Y_OFFSET, 0);
|
||||
}
|
||||
|
||||
void print_help(ChatContext *self)
|
||||
|
|
@ -382,13 +397,13 @@ ToxWindow new_chat(Messenger *m, int friendnum)
|
|||
ret.onAction = &chat_onAction;
|
||||
|
||||
uint8_t nick[MAX_NAME_LENGTH] = {0};
|
||||
getname(m, friendnum, (uint8_t*) &nick);
|
||||
getname(m, friendnum, (uint8_t *) &nick);
|
||||
fix_name(nick);
|
||||
|
||||
snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);
|
||||
|
||||
ChatContext *x = calloc(1, sizeof(ChatContext));
|
||||
x->friendnum = friendnum;
|
||||
ret.x = (void*) x;
|
||||
ret.x = (void *) x;
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
17
configdir.c
17
configdir.c
|
|
@ -50,6 +50,7 @@ char *get_user_config_dir(void)
|
|||
BOOL ok;
|
||||
|
||||
ok = SHGetSpecialFolderPathA(NULL, appdata, CSIDL_PROFILE, TRUE);
|
||||
|
||||
if (!ok) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -72,13 +73,16 @@ char *get_user_config_dir(void)
|
|||
int rc;
|
||||
|
||||
rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
|
||||
|
||||
if (rc == 0) {
|
||||
home = pwd.pw_dir;
|
||||
} else {
|
||||
home = getenv("HOME");
|
||||
|
||||
if (home == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* env variables can be tainted */
|
||||
snprintf(buf, sizeof(buf), "%s", home);
|
||||
home = buf;
|
||||
|
|
@ -87,6 +91,7 @@ char *get_user_config_dir(void)
|
|||
# if defined(__APPLE__)
|
||||
len = strlen(home) + strlen("/Library/Application Support") + 1;
|
||||
user_config_dir = malloc(len);
|
||||
|
||||
if (user_config_dir == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -95,6 +100,7 @@ char *get_user_config_dir(void)
|
|||
# else /* __APPLE__ */
|
||||
len = strlen(home) + strlen("/.config") + 1;
|
||||
user_config_dir = malloc(len);
|
||||
|
||||
if (user_config_dir == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -115,7 +121,7 @@ int create_user_config_dir(char *path)
|
|||
|
||||
int mkdir_err;
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef WIN32
|
||||
|
||||
char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
|
||||
strcpy(fullpath, path);
|
||||
|
|
@ -123,17 +129,18 @@ int create_user_config_dir(char *path)
|
|||
|
||||
mkdir_err = _mkdir(fullpath);
|
||||
struct __stat64 buf;
|
||||
|
||||
if (mkdir_err && (errno != EEXIST || _wstat64(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
|
||||
free(fullpath);
|
||||
return -1;
|
||||
}
|
||||
|
||||
#else
|
||||
#else
|
||||
|
||||
mkdir_err = mkdir(path, 0700);
|
||||
struct stat buf;
|
||||
|
||||
if(mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
|
||||
if (mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -143,12 +150,12 @@ int create_user_config_dir(char *path)
|
|||
|
||||
mkdir_err = mkdir(fullpath, 0700);
|
||||
|
||||
if(mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
|
||||
if (mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
|
||||
free(fullpath);
|
||||
return -1;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
free(fullpath);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
36
dhtstatus.c
36
dhtstatus.c
|
|
@ -3,26 +3,27 @@
|
|||
#include "../../core/network.h"
|
||||
#include "../../core/DHT.h"
|
||||
|
||||
typedef uint8_t ipbuf[3*4+3+1];
|
||||
typedef uint8_t ipbuf[3 * 4 + 3 + 1];
|
||||
static int num_selected = 0;
|
||||
|
||||
static void printip(ipbuf buf, IP ip)
|
||||
{
|
||||
sprintf((char*)buf, "%u.%u.%u.%u", ip.c[0], ip.c[1], ip.c[2], ip.c[3]);
|
||||
sprintf((char *)buf, "%u.%u.%u.%u", ip.c[0], ip.c[1], ip.c[2], ip.c[3]);
|
||||
}
|
||||
|
||||
static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
|
||||
{
|
||||
switch(key) {
|
||||
switch (key) {
|
||||
case KEY_UP:
|
||||
case 'k':
|
||||
if (--num_selected < 0)
|
||||
num_selected = CLIENT_ID_SIZE-1;
|
||||
num_selected = CLIENT_ID_SIZE - 1;
|
||||
|
||||
break;
|
||||
|
||||
case KEY_DOWN:
|
||||
case 'j':
|
||||
num_selected = (num_selected+1) % CLIENT_ID_SIZE;
|
||||
num_selected = (num_selected + 1) % CLIENT_ID_SIZE;
|
||||
break;
|
||||
|
||||
case '\n':
|
||||
|
|
@ -35,21 +36,27 @@ static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
|
||||
static void dhtstatus_onDraw(ToxWindow *self)
|
||||
{
|
||||
Client_data * close_clientlist = DHT_get_close_list();
|
||||
Client_data *close_clientlist = DHT_get_close_list();
|
||||
curs_set(0);
|
||||
werase(self->window);
|
||||
|
||||
uint64_t now = unix_time();
|
||||
uint32_t i, j;
|
||||
ipbuf ipbuf;
|
||||
wprintw(self->window,"\n%llu ______________________ CLOSE LIST ________________________ ___ IP ADDR ___ _PRT_ LST PNG ____ SELF ____ _PRT_ LST\n\n", now);
|
||||
for(i = 0; i < 32; i++) { /*Number of nodes in closelist*/
|
||||
Client_data * client = close_clientlist + i;
|
||||
wprintw(self->window,
|
||||
"\n%llu ______________________ CLOSE LIST ________________________ ___ IP ADDR ___ _PRT_ LST PNG ____ SELF ____ _PRT_ LST\n\n",
|
||||
now);
|
||||
|
||||
for (i = 0; i < 32; i++) { /*Number of nodes in closelist*/
|
||||
Client_data *client = close_clientlist + i;
|
||||
|
||||
if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
|
||||
wprintw(self->window,"[%02i] ", i);
|
||||
|
||||
wprintw(self->window, "[%02i] ", i);
|
||||
uint16_t port = ntohs(client->ip_port.port);
|
||||
if(port) {
|
||||
for(j = 0; j < CLIENT_ID_SIZE; j++)
|
||||
|
||||
if (port) {
|
||||
for (j = 0; j < CLIENT_ID_SIZE; j++)
|
||||
wprintw(self->window, "%02hhx", client->client_id[j]);
|
||||
|
||||
printip(ipbuf, client->ip_port.ip);
|
||||
|
|
@ -58,12 +65,15 @@ static void dhtstatus_onDraw(ToxWindow *self)
|
|||
wprintw(self->window, " %3llu ", now - client->last_pinged);
|
||||
|
||||
port = ntohs(client->ret_ip_port.port);
|
||||
if(port) {
|
||||
|
||||
if (port) {
|
||||
printip(ipbuf, client->ret_ip_port.ip);
|
||||
wprintw(self->window, " %15s %5u %3llu", ipbuf, port, now - close_clientlist[i].ret_timestamp);
|
||||
}
|
||||
}
|
||||
|
||||
wprintw(self->window, "\n");
|
||||
|
||||
if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
|
||||
}
|
||||
|
||||
|
|
|
|||
41
friendlist.c
41
friendlist.c
|
|
@ -13,7 +13,7 @@
|
|||
#include "windows.h"
|
||||
#include "friendlist.h"
|
||||
|
||||
static char * WINDOW_STATUS;
|
||||
static char *WINDOW_STATUS;
|
||||
|
||||
typedef struct {
|
||||
uint8_t name[MAX_NAME_LENGTH];
|
||||
|
|
@ -31,11 +31,14 @@ void fix_name(uint8_t *name)
|
|||
/* Remove all non alphanumeric characters */
|
||||
uint8_t *p = name;
|
||||
uint8_t *q = name;
|
||||
while(*p != 0) {
|
||||
|
||||
while (*p != 0) {
|
||||
if (isprint(*p))
|
||||
*q++ = *p;
|
||||
|
||||
p++;
|
||||
}
|
||||
|
||||
*q = 0;
|
||||
}
|
||||
|
||||
|
|
@ -47,6 +50,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
|
|||
if (friends[num].chatwin == -1) {
|
||||
friends[num].chatwin = num;
|
||||
int i;
|
||||
|
||||
/* Find first open slot to hold chat window */
|
||||
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (WINDOW_STATUS[i] == -1) {
|
||||
|
|
@ -63,7 +67,7 @@ void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint16_t le
|
|||
if (len >= MAX_NAME_LENGTH || num >= num_friends)
|
||||
return;
|
||||
|
||||
memcpy((char*) &friends[num].name, (char*) str, len);
|
||||
memcpy((char *) &friends[num].name, (char *) str, len);
|
||||
friends[num].name[len] = 0;
|
||||
fix_name(friends[num].name);
|
||||
}
|
||||
|
|
@ -73,7 +77,7 @@ void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t
|
|||
if (len >= MAX_STATUSMESSAGE_LENGTH || num >= num_friends)
|
||||
return;
|
||||
|
||||
memcpy((char*) &friends[num].status, (char*) str, len);
|
||||
memcpy((char *) &friends[num].status, (char *) str, len);
|
||||
friends[num].status[len] = 0;
|
||||
fix_name(friends[num].status);
|
||||
}
|
||||
|
|
@ -85,8 +89,8 @@ int friendlist_onFriendAdded(Messenger *m, int num)
|
|||
|
||||
friends[num_friends].num = num;
|
||||
getname(m, num, friends[num_friends].name);
|
||||
strcpy((char*) friends[num_friends].name, "unknown");
|
||||
strcpy((char*) friends[num_friends].status, "unknown");
|
||||
strcpy((char *) friends[num_friends].name, "unknown");
|
||||
strcpy((char *) friends[num_friends].status, "unknown");
|
||||
friends[num_friends++].chatwin = -1;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -95,24 +99,24 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
{
|
||||
if (key == KEY_UP) {
|
||||
if (--num_selected < 0)
|
||||
num_selected = num_friends-1;
|
||||
}
|
||||
else if (key == KEY_DOWN) {
|
||||
num_selected = num_friends - 1;
|
||||
} else if (key == KEY_DOWN) {
|
||||
if (num_friends != 0)
|
||||
num_selected = (num_selected+1) % num_friends;
|
||||
}
|
||||
else if (key == '\n') {
|
||||
num_selected = (num_selected + 1) % num_friends;
|
||||
} else if (key == '\n') {
|
||||
/* Jump to chat window if already open */
|
||||
if (friends[num_selected].chatwin != -1) {
|
||||
int i;
|
||||
|
||||
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (WINDOW_STATUS[i] == num_selected) {
|
||||
set_active_window(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
int i;
|
||||
|
||||
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (WINDOW_STATUS[i] == -1) {
|
||||
WINDOW_STATUS[i] = num_selected;
|
||||
|
|
@ -129,10 +133,10 @@ static void friendlist_onDraw(ToxWindow *self)
|
|||
{
|
||||
curs_set(0);
|
||||
werase(self->window);
|
||||
|
||||
if (num_friends == 0) {
|
||||
wprintw(self->window, "Empty. Add some friends! :-)\n");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
wattron(self->window, COLOR_PAIR(2) | A_BOLD);
|
||||
wprintw(self->window, "Open chat with.. (up/down keys, enter)\n");
|
||||
wattroff(self->window, COLOR_PAIR(2) | A_BOLD);
|
||||
|
|
@ -140,9 +144,12 @@ static void friendlist_onDraw(ToxWindow *self)
|
|||
|
||||
wprintw(self->window, "\n");
|
||||
int i;
|
||||
|
||||
for (i = 0; i < num_friends; ++i) {
|
||||
if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
|
||||
|
||||
wprintw(self->window, " [#%d] ", friends[i].num);
|
||||
|
||||
if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
|
||||
|
||||
attron(A_BOLD);
|
||||
|
|
@ -151,6 +158,7 @@ static void friendlist_onDraw(ToxWindow *self)
|
|||
|
||||
wprintw(self->window, "(%s)\n", friends[i].status);
|
||||
}
|
||||
|
||||
wrefresh(self->window);
|
||||
}
|
||||
|
||||
|
|
@ -164,7 +172,8 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
|
|||
|
||||
}
|
||||
|
||||
ToxWindow new_friendlist(char * ws) {
|
||||
ToxWindow new_friendlist(char *ws)
|
||||
{
|
||||
WINDOW_STATUS = ws;
|
||||
ToxWindow ret;
|
||||
memset(&ret, 0, sizeof(ret));
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "windows.h"
|
||||
#include "chat.h"
|
||||
|
||||
ToxWindow new_friendlist(char * ws);
|
||||
ToxWindow new_friendlist(char *ws);
|
||||
int friendlist_onFriendAdded(Messenger *m, int num);
|
||||
void disable_chatwin(int f_num);
|
||||
void fix_name(uint8_t *name);
|
||||
|
|
|
|||
45
main.c
45
main.c
|
|
@ -53,6 +53,7 @@ static void init_term()
|
|||
init_pair(4, COLOR_BLUE, COLOR_BLACK);
|
||||
init_pair(5, COLOR_YELLOW, COLOR_BLACK);
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
|
|
@ -68,11 +69,11 @@ static Messenger *init_tox()
|
|||
m_callback_statusmessage(m, on_statuschange, NULL);
|
||||
m_callback_action(m, on_action, NULL);
|
||||
#ifdef __linux__
|
||||
setname(m, (uint8_t*) "Cool guy", sizeof("Cool guy"));
|
||||
setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
|
||||
#elif WIN32
|
||||
setname(m, (uint8_t*) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
|
||||
setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
|
||||
#else
|
||||
setname(m, (uint8_t*) "Hipster", sizeof("Hipster"));
|
||||
setname(m, (uint8_t *) "Hipster", sizeof("Hipster"));
|
||||
#endif
|
||||
return m;
|
||||
}
|
||||
|
|
@ -88,34 +89,41 @@ int init_connection(void)
|
|||
return 0;
|
||||
|
||||
FILE *fp = fopen("../../../other/DHTservers", "r");
|
||||
|
||||
if (!fp)
|
||||
return 1;
|
||||
|
||||
char servers[MAXSERVERS][MAXLINE];
|
||||
char line[MAXLINE];
|
||||
int linecnt = 0;
|
||||
|
||||
while (fgets(line, sizeof(line), fp) && linecnt < MAXSERVERS) {
|
||||
if (strlen(line) > MINLINE)
|
||||
strcpy(servers[linecnt++], line);
|
||||
}
|
||||
|
||||
if (linecnt < 1) {
|
||||
fclose(fp);
|
||||
return 2;
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
|
||||
char *server = servers[rand() % linecnt];
|
||||
char *ip = strtok(server, " ");
|
||||
char *port = strtok(NULL, " ");
|
||||
char *key = strtok(NULL, " ");
|
||||
|
||||
if (!ip || !port || !key)
|
||||
return 3;
|
||||
|
||||
IP_Port dht;
|
||||
dht.port = htons(atoi(port));
|
||||
uint32_t resolved_address = resolve_addr(ip);
|
||||
|
||||
if (resolved_address == 0)
|
||||
return 0;
|
||||
|
||||
dht.ip.i = resolved_address;
|
||||
unsigned char *binary_string = hex_string_to_bin(key);
|
||||
DHT_bootstrap(dht, binary_string);
|
||||
|
|
@ -123,27 +131,28 @@ int init_connection(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void do_tox(Messenger *m, ToxWindow * prompt)
|
||||
static void do_tox(Messenger *m, ToxWindow *prompt)
|
||||
{
|
||||
static int conn_try = 0;
|
||||
static int conn_err = 0;
|
||||
static bool dht_on = false;
|
||||
|
||||
if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) {
|
||||
if (!conn_err) {
|
||||
conn_err = init_connection();
|
||||
wprintw(prompt->window, "\nEstablishing connection...\n");
|
||||
|
||||
if (conn_err)
|
||||
wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
|
||||
}
|
||||
}
|
||||
else if (!dht_on && DHT_isconnected()) {
|
||||
} else if (!dht_on && DHT_isconnected()) {
|
||||
dht_on = true;
|
||||
wprintw(prompt->window, "\nDHT connected.\n");
|
||||
}
|
||||
else if (dht_on && !DHT_isconnected()) {
|
||||
} else if (dht_on && !DHT_isconnected()) {
|
||||
dht_on = false;
|
||||
wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n");
|
||||
}
|
||||
|
||||
doMessenger(m);
|
||||
}
|
||||
|
||||
|
|
@ -160,18 +169,22 @@ int store_data(Messenger *m, char *path)
|
|||
{
|
||||
if (f_loadfromfile == 0) /*If file loading/saving is disabled*/
|
||||
return 0;
|
||||
|
||||
FILE *fd;
|
||||
size_t len;
|
||||
uint8_t *buf;
|
||||
|
||||
len = Messenger_size(m);
|
||||
buf = malloc(len);
|
||||
|
||||
if (buf == NULL) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
Messenger_save(m, buf);
|
||||
|
||||
fd = fopen(path, "w");
|
||||
|
||||
if (fd == NULL) {
|
||||
free(buf);
|
||||
return 2;
|
||||
|
|
@ -192,6 +205,7 @@ static void load_data(Messenger *m, char *path)
|
|||
{
|
||||
if (f_loadfromfile == 0) /*If file loading/saving is disabled*/
|
||||
return;
|
||||
|
||||
FILE *fd;
|
||||
size_t len;
|
||||
uint8_t *buf;
|
||||
|
|
@ -202,12 +216,14 @@ static void load_data(Messenger *m, char *path)
|
|||
fseek(fd, 0, SEEK_SET);
|
||||
|
||||
buf = malloc(len);
|
||||
|
||||
if (buf == NULL) {
|
||||
fprintf(stderr, "malloc() failed.\n");
|
||||
fclose(fd);
|
||||
endwin();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (fread(buf, len, 1, fd) != 1) {
|
||||
fprintf(stderr, "fread() failed.\n");
|
||||
free(buf);
|
||||
|
|
@ -215,9 +231,11 @@ static void load_data(Messenger *m, char *path)
|
|||
endwin();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Messenger_load(m, buf, len);
|
||||
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0; i < m->numfriends; i++) {
|
||||
on_friendadded(m, i);
|
||||
}
|
||||
|
|
@ -226,6 +244,7 @@ static void load_data(Messenger *m, char *path)
|
|||
fclose(fd);
|
||||
} else {
|
||||
int st;
|
||||
|
||||
if ((st = store_data(m, path)) != 0) {
|
||||
fprintf(stderr, "Store messenger failed with return code: %d\n", st);
|
||||
endwin();
|
||||
|
|
@ -242,6 +261,7 @@ int main(int argc, char *argv[])
|
|||
f_loadfromfile = 1;
|
||||
int f_flag = 0;
|
||||
int i = 0;
|
||||
|
||||
for (i = 0; i < argc; ++i) {
|
||||
if (argv[i] == NULL)
|
||||
break;
|
||||
|
|
@ -259,6 +279,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
if (DATA_FILE == NULL ) {
|
||||
config_err = create_user_config_dir(user_config_dir);
|
||||
|
||||
if (config_err) {
|
||||
DATA_FILE = strdup("data");
|
||||
} else {
|
||||
|
|
@ -268,6 +289,7 @@ int main(int argc, char *argv[])
|
|||
strcat(DATA_FILE, "data");
|
||||
}
|
||||
}
|
||||
|
||||
free(user_config_dir);
|
||||
|
||||
init_term();
|
||||
|
|
@ -275,7 +297,7 @@ int main(int argc, char *argv[])
|
|||
ToxWindow *prompt = init_windows(m);
|
||||
init_window_status();
|
||||
|
||||
if(f_loadfromfile)
|
||||
if (f_loadfromfile)
|
||||
load_data(m, DATA_FILE);
|
||||
|
||||
if (f_flag == -1) {
|
||||
|
|
@ -285,13 +307,14 @@ int main(int argc, char *argv[])
|
|||
attroff(COLOR_PAIR(3) | A_BOLD);
|
||||
}
|
||||
|
||||
if(config_err) {
|
||||
if (config_err) {
|
||||
attron(COLOR_PAIR(3) | A_BOLD);
|
||||
wprintw(prompt->window, "Unable to determine configuration directory.\n"
|
||||
"defaulting to 'data' for a keyfile...\n");
|
||||
attroff(COLOR_PAIR(3) | A_BOLD);
|
||||
}
|
||||
while(true) {
|
||||
|
||||
while (true) {
|
||||
/* Update tox */
|
||||
do_tox(m, prompt);
|
||||
|
||||
|
|
|
|||
81
prompt.c
81
prompt.c
|
|
@ -14,7 +14,7 @@
|
|||
#include "prompt.h"
|
||||
|
||||
uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
|
||||
uint8_t num_requests=0; // XXX
|
||||
uint8_t num_requests = 0; // XXX
|
||||
|
||||
static friendAddedFn *on_friendadded_cb;
|
||||
static char prompt_buf[MAX_STR_SIZE] = {0};
|
||||
|
|
@ -60,7 +60,7 @@ int add_req(uint8_t *public_key)
|
|||
{
|
||||
memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
|
||||
++num_requests;
|
||||
return num_requests-1;
|
||||
return num_requests - 1;
|
||||
}
|
||||
|
||||
// XXX: FIX
|
||||
|
|
@ -70,20 +70,24 @@ unsigned char *hex_string_to_bin(char hex_string[])
|
|||
unsigned char *val = malloc(len);
|
||||
char *pos = hex_string;
|
||||
int i;
|
||||
for (i = 0; i < len; ++i, pos+=2)
|
||||
sscanf(pos,"%2hhx",&val[i]);
|
||||
|
||||
for (i = 0; i < len; ++i, pos += 2)
|
||||
sscanf(pos, "%2hhx", &val[i]);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
void cmd_accept(ToxWindow *self, Messenger *m, char **args)
|
||||
{
|
||||
int num = atoi(args[1]);
|
||||
|
||||
if (num >= num_requests) {
|
||||
wprintw(self->window, "Invalid syntax.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
num = m_addfriend_norequest(m, pending_requests[num]);
|
||||
|
||||
if (num == -1)
|
||||
wprintw(self->window, "Failed to add friend.\n");
|
||||
else {
|
||||
|
|
@ -104,22 +108,27 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
|
|||
wprintw(self->window, "Invalid command: add expected at least one argument.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!msg)
|
||||
msg = "";
|
||||
|
||||
if (strlen(id) != 2*FRIEND_ADDRESS_SIZE) {
|
||||
if (strlen(id) != 2 * FRIEND_ADDRESS_SIZE) {
|
||||
wprintw(self->window, "Invalid ID length.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
int i;
|
||||
|
||||
for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
|
||||
xx[0] = id[2*i];
|
||||
xx[1] = id[2*i+1];
|
||||
xx[0] = id[2 * i];
|
||||
xx[1] = id[2 * i + 1];
|
||||
xx[2] = '\0';
|
||||
|
||||
if (sscanf(xx, "%02x", &x) != 1) {
|
||||
wprintw(self->window, "Invalid ID.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
id_bin[i] = x;
|
||||
}
|
||||
|
||||
|
|
@ -127,29 +136,37 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
|
|||
id[i] = toupper(id[i]);
|
||||
}
|
||||
|
||||
int num = m_addfriend(m, id_bin, (uint8_t*) msg, strlen(msg)+1);
|
||||
int num = m_addfriend(m, id_bin, (uint8_t *) msg, strlen(msg) + 1);
|
||||
|
||||
switch (num) {
|
||||
case FAERR_TOOLONG:
|
||||
wprintw(self->window, "Message is too long.\n");
|
||||
break;
|
||||
|
||||
case FAERR_NOMESSAGE:
|
||||
wprintw(self->window, "Please add a message to your request.\n");
|
||||
break;
|
||||
|
||||
case FAERR_OWNKEY:
|
||||
wprintw(self->window, "That appears to be your own ID.\n");
|
||||
break;
|
||||
|
||||
case FAERR_ALREADYSENT:
|
||||
wprintw(self->window, "Friend request already sent.\n");
|
||||
break;
|
||||
|
||||
case FAERR_UNKNOWN:
|
||||
wprintw(self->window, "Undefined error when adding friend.\n");
|
||||
break;
|
||||
|
||||
case FAERR_BADCHECKSUM:
|
||||
wprintw(self->window, "Bad checksum in address.\n");
|
||||
break;
|
||||
|
||||
case FAERR_SETNEWNOSPAM:
|
||||
wprintw(self->window, "Nospam was different.\n");
|
||||
break;
|
||||
|
||||
default:
|
||||
wprintw(self->window, "Friend added as %d.\n", num);
|
||||
on_friendadded_cb(m, num);
|
||||
|
|
@ -176,6 +193,7 @@ void cmd_connect(ToxWindow *self, Messenger *m, char **args)
|
|||
|
||||
dht.port = htons(atoi(port));
|
||||
uint32_t resolved_address = resolve_addr(ip);
|
||||
|
||||
if (resolved_address == 0) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -221,7 +239,8 @@ void cmd_msg(ToxWindow *self, Messenger *m, char **args)
|
|||
{
|
||||
char *id = args[1];
|
||||
char *msg = args[2];
|
||||
if (m_sendmessage(m, atoi(id), (uint8_t*) msg, strlen(msg)+1) == 0)
|
||||
|
||||
if (m_sendmessage(m, atoi(id), (uint8_t *) msg, strlen(msg) + 1) == 0)
|
||||
wprintw(self->window, "Error occurred while sending message.\n");
|
||||
else
|
||||
wprintw(self->window, "Message successfully sent.\n");
|
||||
|
|
@ -229,22 +248,24 @@ void cmd_msg(ToxWindow *self, Messenger *m, char **args)
|
|||
|
||||
void cmd_myid(ToxWindow *self, Messenger *m, char **args)
|
||||
{
|
||||
char id[FRIEND_ADDRESS_SIZE*2 + 1] = {0};
|
||||
char id[FRIEND_ADDRESS_SIZE * 2 + 1] = {0};
|
||||
size_t i;
|
||||
uint8_t address[FRIEND_ADDRESS_SIZE];
|
||||
getaddress(m, address);
|
||||
|
||||
for (i = 0; i < FRIEND_ADDRESS_SIZE; ++i) {
|
||||
char xx[3];
|
||||
snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
|
||||
strcat(id, xx);
|
||||
}
|
||||
|
||||
wprintw(self->window, "%s\n", id);
|
||||
}
|
||||
|
||||
void cmd_nick(ToxWindow *self, Messenger *m, char **args)
|
||||
{
|
||||
char *nick = args[1];
|
||||
setname(m, (uint8_t*) nick, strlen(nick)+1);
|
||||
setname(m, (uint8_t *) nick, strlen(nick) + 1);
|
||||
wprintw(self->window, "Nickname set to: %s\n", nick);
|
||||
}
|
||||
|
||||
|
|
@ -254,32 +275,29 @@ void cmd_status(ToxWindow *self, Messenger *m, char **args)
|
|||
char *status_text;
|
||||
|
||||
USERSTATUS status_kind;
|
||||
|
||||
if (!strncmp(status, "online", strlen("online"))) {
|
||||
status_kind = USERSTATUS_NONE;
|
||||
status_text = "ONLINE";
|
||||
}
|
||||
else if (!strncmp(status, "away", strlen("away"))) {
|
||||
} else if (!strncmp(status, "away", strlen("away"))) {
|
||||
status_kind = USERSTATUS_AWAY;
|
||||
status_text = "AWAY";
|
||||
}
|
||||
else if (!strncmp(status, "busy", strlen("busy"))) {
|
||||
} else if (!strncmp(status, "busy", strlen("busy"))) {
|
||||
status_kind = USERSTATUS_BUSY;
|
||||
status_text = "BUSY";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
wprintw(self->window, "Invalid status.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
char *msg = args[2];
|
||||
|
||||
if (msg == NULL) {
|
||||
m_set_userstatus(m, status_kind);
|
||||
wprintw(self->window, "Status set to: %s\n", status_text);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
m_set_userstatus(m, status_kind);
|
||||
m_set_statusmessage(m, (uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_statusmessage(m, (uint8_t *) msg, strlen(msg) + 1);
|
||||
wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
|
||||
}
|
||||
}
|
||||
|
|
@ -287,7 +305,7 @@ void cmd_status(ToxWindow *self, Messenger *m, char **args)
|
|||
void cmd_statusmsg(ToxWindow *self, Messenger *m, char **args)
|
||||
{
|
||||
char *msg = args[1];
|
||||
m_set_statusmessage(m, (uint8_t*) msg, strlen(msg)+1);
|
||||
m_set_statusmessage(m, (uint8_t *) msg, strlen(msg) + 1);
|
||||
wprintw(self->window, "Status set to: %s\n", msg);
|
||||
}
|
||||
|
||||
|
|
@ -296,6 +314,7 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
|
|||
int newlines = 0;
|
||||
char cmd[MAX_STR_SIZE] = {0};
|
||||
int i;
|
||||
|
||||
for (i = 0; i < strlen(prompt_buf); ++i) {
|
||||
if (u_cmd[i] == '\n')
|
||||
++newlines;
|
||||
|
|
@ -304,21 +323,27 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
|
|||
}
|
||||
|
||||
int leading_spc = 0;
|
||||
|
||||
for (i = 0; i < MAX_STR_SIZE && isspace(cmd[i]); ++i)
|
||||
leading_spc++;
|
||||
|
||||
memmove(cmd, cmd + leading_spc, MAX_STR_SIZE - leading_spc);
|
||||
|
||||
int cmd_end = strlen(cmd);
|
||||
|
||||
while (cmd_end > 0 && cmd_end--)
|
||||
if (!isspace(cmd[cmd_end]))
|
||||
break;
|
||||
|
||||
cmd[cmd_end + 1] = '\0';
|
||||
|
||||
/* insert \0 at argument boundaries */
|
||||
int numargs = 0;
|
||||
|
||||
for (i = 0; i < MAX_STR_SIZE; i++) {
|
||||
if (cmd[i] == '\"')
|
||||
while (cmd[++i] != '\"'); /* skip over strings */
|
||||
|
||||
if (cmd[i] == ' ') {
|
||||
cmd[i] = '\0';
|
||||
numargs++;
|
||||
|
|
@ -334,6 +359,7 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
|
|||
/* read arguments into array */
|
||||
char *cmdargs[5];
|
||||
int pos = 0;
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
cmdargs[i] = cmd + pos;
|
||||
pos += strlen(cmdargs[i]) + 1;
|
||||
|
|
@ -348,6 +374,7 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
|
|||
if (!strcmp(cmdargs[0], commands[i].name)) {
|
||||
/* check for missing arguments */
|
||||
int j;
|
||||
|
||||
for (j = 0; j <= commands[i].numargs; j++) {
|
||||
if (strlen(cmdargs[j]) == 0) {
|
||||
wprintw(self->window, "Invalid command: %s expected %d arguments, got %d.\n",
|
||||
|
|
@ -355,11 +382,13 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* check for excess arguments */
|
||||
if (strcmp(cmdargs[0], "add") && strlen(cmdargs[j]) != 0) {
|
||||
wprintw(self->window, "Invalid command: too many arguments to %s.\n", commands[i].name);
|
||||
return;
|
||||
}
|
||||
|
||||
/* pass arguments to command function */
|
||||
(commands[i].func)(self, m, cmdargs);
|
||||
return;
|
||||
|
|
@ -378,15 +407,14 @@ static void prompt_onKey(ToxWindow *self, Messenger *m, int key)
|
|||
wprintw(self->window, "\nToo Long.\n");
|
||||
prompt_buf_pos = 0;
|
||||
prompt_buf[0] = 0;
|
||||
}
|
||||
else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
|
||||
} else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
|
||||
&& (prompt_buf_pos % (COLS - 3) == 0)) {
|
||||
prompt_buf[prompt_buf_pos++] = '\n';
|
||||
}
|
||||
else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
|
||||
} 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++] = key;
|
||||
prompt_buf[prompt_buf_pos] = 0;
|
||||
}
|
||||
|
|
@ -414,6 +442,7 @@ static void prompt_onDraw(ToxWindow *self)
|
|||
getyx(self->window, y, x);
|
||||
(void) x;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < (strlen(prompt_buf)); ++i) {
|
||||
if ((prompt_buf[i] == '\n') && (y != 0))
|
||||
--y;
|
||||
|
|
|
|||
54
windows.c
54
windows.c
|
|
@ -14,15 +14,16 @@ static ToxWindow windows[MAX_WINDOW_SLOTS];
|
|||
static Messenger *m;
|
||||
int active_window;
|
||||
|
||||
static ToxWindow* prompt;
|
||||
static ToxWindow *prompt;
|
||||
|
||||
/* CALLBACKS START */
|
||||
void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
|
||||
void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
|
||||
{
|
||||
int n = add_req(public_key);
|
||||
wprintw(prompt->window, "\nFriend request from:\n");
|
||||
|
||||
int i;
|
||||
|
||||
for (i = 0; i < KEY_SIZE_BYTES; ++i) {
|
||||
wprintw(prompt->window, "%02x", public_key[i] & 0xff);
|
||||
}
|
||||
|
|
@ -36,39 +37,43 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userd
|
|||
}
|
||||
}
|
||||
|
||||
void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
|
||||
void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (windows[i].onMessage != NULL)
|
||||
windows[i].onMessage(&windows[i], m, friendnumber, string, length);
|
||||
}
|
||||
}
|
||||
|
||||
void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
|
||||
void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (windows[i].onAction != NULL)
|
||||
windows[i].onAction(&windows[i], m, friendnumber, string, length);
|
||||
}
|
||||
}
|
||||
|
||||
void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
|
||||
void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
|
||||
{
|
||||
wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (windows[i].onNickChange != NULL)
|
||||
windows[i].onNickChange(&windows[i], friendnumber, string, length);
|
||||
}
|
||||
}
|
||||
|
||||
void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
|
||||
void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
|
||||
{
|
||||
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)
|
||||
windows[i].onStatusChange(&windows[i], friendnumber, string, length);
|
||||
}
|
||||
|
|
@ -77,6 +82,7 @@ void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t l
|
|||
void on_friendadded(Messenger *m, int friendnumber)
|
||||
{
|
||||
friendlist_onFriendAdded(m, friendnumber);
|
||||
|
||||
if (store_data(m, DATA_FILE) != 0) {
|
||||
wprintw(prompt->window, "\nCould not store Messenger data\n");
|
||||
}
|
||||
|
|
@ -92,6 +98,7 @@ int add_window(Messenger *m, ToxWindow w, int n)
|
|||
return -1;
|
||||
|
||||
w.window = newwin(LINES - 2, COLS, 0, 0);
|
||||
|
||||
if (w.window == NULL)
|
||||
return -1;
|
||||
|
||||
|
|
@ -108,6 +115,7 @@ void del_window(ToxWindow *w, int f_num)
|
|||
active_window = 0; // Go to prompt screen
|
||||
delwin(w->window);
|
||||
int i;
|
||||
|
||||
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
|
||||
if (WINDOW_STATUS[i] == f_num) {
|
||||
WINDOW_STATUS[i] = -1;
|
||||
|
|
@ -115,6 +123,7 @@ void del_window(ToxWindow *w, int f_num)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
clear();
|
||||
refresh();
|
||||
}
|
||||
|
|
@ -123,29 +132,37 @@ void del_window(ToxWindow *w, int f_num)
|
|||
void set_active_window(int ch)
|
||||
{
|
||||
int f_inf = 0;
|
||||
int max = MAX_WINDOW_SLOTS-1;
|
||||
int max = MAX_WINDOW_SLOTS - 1;
|
||||
|
||||
if (ch == '\t') {
|
||||
int i = (active_window + 1) % max;
|
||||
|
||||
while (true) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
active_window = i;
|
||||
return;
|
||||
}
|
||||
|
||||
i = (i + 1) % max;
|
||||
|
||||
if (f_inf++ > max) { // infinite loop check
|
||||
endwin();
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
int i = active_window - 1;
|
||||
|
||||
if (i < 0) i = max;
|
||||
|
||||
while (true) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
active_window = i;
|
||||
return;
|
||||
}
|
||||
|
||||
if (--i < 0) i = max;
|
||||
|
||||
if (f_inf++ > max) {
|
||||
endwin();
|
||||
exit(2);
|
||||
|
|
@ -158,10 +175,12 @@ void init_window_status()
|
|||
{
|
||||
/* Default window values decrement from -2 */
|
||||
int i;
|
||||
|
||||
for (i = 0; i < N_DEFAULT_WINS; ++i)
|
||||
WINDOW_STATUS[i] = -(i+2);
|
||||
WINDOW_STATUS[i] = -(i + 2);
|
||||
|
||||
int j;
|
||||
|
||||
for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
|
||||
WINDOW_STATUS[j] = -1;
|
||||
}
|
||||
|
|
@ -172,6 +191,7 @@ ToxWindow *init_windows()
|
|||
int n_prompt = 0;
|
||||
int n_friendslist = 1;
|
||||
int n_dhtstatus = 2;
|
||||
|
||||
if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
|
||||
|| add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
|
||||
|| add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
|
||||
|
|
@ -179,6 +199,7 @@ ToxWindow *init_windows()
|
|||
endwin();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
active_window = n_prompt;
|
||||
prompt = &windows[n_prompt];
|
||||
return prompt;
|
||||
|
|
@ -200,17 +221,20 @@ static void draw_bar()
|
|||
attroff(COLOR_PAIR(4) | A_BOLD);
|
||||
|
||||
int i;
|
||||
|
||||
for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
if (i == active_window)
|
||||
attron(A_BOLD);
|
||||
|
||||
odd = (odd+1) % blinkrate;
|
||||
if (windows[i].blink && (odd < (blinkrate/2)))
|
||||
odd = (odd + 1) % blinkrate;
|
||||
|
||||
if (windows[i].blink && (odd < (blinkrate / 2)))
|
||||
attron(COLOR_PAIR(3));
|
||||
|
||||
printw(" %s", windows[i].title);
|
||||
if (windows[i].blink && (odd < (blinkrate/2)))
|
||||
|
||||
if (windows[i].blink && (odd < (blinkrate / 2)))
|
||||
attroff(COLOR_PAIR(3));
|
||||
|
||||
if (i == active_window) {
|
||||
|
|
@ -218,13 +242,14 @@ static void draw_bar()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void prepare_window(WINDOW *w)
|
||||
{
|
||||
mvwin(w, 0, 0);
|
||||
wresize(w, LINES-2, COLS);
|
||||
wresize(w, LINES - 2, COLS);
|
||||
}
|
||||
|
||||
void draw_active_window(Messenger *m)
|
||||
|
|
@ -238,6 +263,7 @@ void draw_active_window(Messenger *m)
|
|||
|
||||
/* Handle input */
|
||||
int ch = getch();
|
||||
|
||||
if (ch == '\t' || ch == KEY_BTAB)
|
||||
set_active_window(ch);
|
||||
else if (ch != ERR)
|
||||
|
|
|
|||
34
windows.h
34
windows.h
|
|
@ -26,31 +26,31 @@
|
|||
typedef struct ToxWindow_ ToxWindow;
|
||||
|
||||
struct ToxWindow_ {
|
||||
void(*onKey)(ToxWindow*, Messenger*, int);
|
||||
void(*onDraw)(ToxWindow*);
|
||||
void(*onInit)(ToxWindow*, Messenger*);
|
||||
void(*onFriendRequest)(ToxWindow*, uint8_t*, uint8_t*, uint16_t);
|
||||
void(*onMessage)(ToxWindow*, Messenger*, int, uint8_t*, uint16_t);
|
||||
void(*onNickChange)(ToxWindow*, int, uint8_t*, uint16_t);
|
||||
void(*onStatusChange)(ToxWindow*, int, uint8_t*, uint16_t);
|
||||
void(*onAction)(ToxWindow*, Messenger*, int, uint8_t*, uint16_t);
|
||||
void(*onKey)(ToxWindow *, Messenger *, int);
|
||||
void(*onDraw)(ToxWindow *);
|
||||
void(*onInit)(ToxWindow *, Messenger *);
|
||||
void(*onFriendRequest)(ToxWindow *, uint8_t *, uint8_t *, uint16_t);
|
||||
void(*onMessage)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);
|
||||
void(*onNickChange)(ToxWindow *, int, uint8_t *, uint16_t);
|
||||
void(*onStatusChange)(ToxWindow *, int, uint8_t *, uint16_t);
|
||||
void(*onAction)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);
|
||||
char title[256];
|
||||
|
||||
void* x;
|
||||
void *x;
|
||||
bool blink;
|
||||
|
||||
WINDOW* window;
|
||||
WINDOW *window;
|
||||
};
|
||||
|
||||
void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata);
|
||||
void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
|
||||
void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
|
||||
void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
|
||||
void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
|
||||
void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata);
|
||||
void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
|
||||
void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
|
||||
void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
|
||||
void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
|
||||
void on_friendadded(Messenger *m, int friendnumber);
|
||||
void init_window_status();
|
||||
ToxWindow * init_windows();
|
||||
void draw_active_window(Messenger * m);
|
||||
ToxWindow *init_windows();
|
||||
void draw_active_window(Messenger *m);
|
||||
int add_window(Messenger *m, ToxWindow w, int n);
|
||||
void del_window(ToxWindow *w, int f_num);
|
||||
void set_active_window(int ch);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user