Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-06 22:16:35 +01:00
Code Issues Projects Releases Wiki Activity

remove redundant cmd func args, use global prompt instead

Browse Source
This commit is contained in:
Jfreegman
2013-11-19 15:32:35 -05:00
parent b16ff16abc
commit f43d735861
15 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/chat_commands.c
View File

@@ -12,7 +12,9 @@
#include "toxic_windows.h"
#include "misc_tools.h"
void cmd_chat_help(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char (*argv)[MAX_STR_SIZE])
extern ToxWindow *prompt;
void cmd_chat_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
wattron(window, COLOR_PAIR(CYAN) | A_BOLD);
wprintw(window, "Chat commands:\n");
@@ -39,7 +41,7 @@ void cmd_chat_help(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc,
wattroff(window, COLOR_PAIR(CYAN));
}
void cmd_groupinvite(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char (*argv)[MAX_STR_SIZE])
void cmd_groupinvite(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
if (argc < 1) {
wprintw(window, "Invalid syntax.\n");
@@ -53,7 +55,7 @@ void cmd_groupinvite(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int arg
return;
}
if (tox_invite_friend(m, num, groupnum) == -1) {
if (tox_invite_friend(m, self->num, groupnum) == -1) {
wprintw(window, "Failed to invite friend.\n");
return;
}
@@ -61,16 +63,16 @@ void cmd_groupinvite(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int arg
wprintw(window, "Invited friend to group chat %d.\n", groupnum);
}
void cmd_join_group(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char (*argv)[MAX_STR_SIZE])
void cmd_join_group(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
uint8_t *groupkey = friends[num].pending_groupchat;
uint8_t *groupkey = friends[self->num].pending_groupchat;
if (groupkey[0] == '\0') {
wprintw(window, "No pending group chat invite.\n");
return;
}
int groupnum = tox_join_groupchat(m, num, groupkey);
int groupnum = tox_join_groupchat(m, self->num, groupkey);
if (groupnum == -1) {
wprintw(window, "Group chat instance failed to initialize.\n");
@@ -84,7 +86,7 @@ void cmd_join_group(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc
}
}
void cmd_savefile(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char (*argv)[MAX_STR_SIZE])
void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
if (argc != 1) {
wprintw(window, "Invalid syntax.\n");
@@ -98,22 +100,22 @@ void cmd_savefile(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc,
return;
}
if (!friends[num].file_receiver.pending[filenum]) {
if (!friends[self->num].file_receiver.pending[filenum]) {
wprintw(window, "No pending file transfers with that number.\n");
return;
}
uint8_t *filename = friends[num].file_receiver.filenames[filenum];
uint8_t *filename = friends[self->num].file_receiver.filenames[filenum];
if (tox_file_sendcontrol(m, num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0))
if (tox_file_sendcontrol(m, self->num, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0))
wprintw(window, "Accepted file transfer %u. Saving file as: '%s'\n", filenum, filename);
else
wprintw(window, "File transfer failed.\n");
friends[num].file_receiver.pending[filenum] = false;
friends[self->num].file_receiver.pending[filenum] = false;
}
void cmd_sendfile(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc, char (*argv)[MAX_STR_SIZE])
void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
{
if (num_file_senders >= MAX_FILES) {
wprintw(window,"Please wait for some of your outgoing file transfers to complete.\n");
@@ -151,7 +153,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc,
uint64_t filesize = ftell(file_to_send);
fseek(file_to_send, 0, SEEK_SET);
int filenum = tox_new_filesender(m, num, filesize, path, path_len + 1);
int filenum = tox_new_filesender(m, self->num, filesize, path, path_len + 1);
if (filenum == -1) {
wprintw(window, "Error sending file.\n");
@@ -167,10 +169,10 @@ void cmd_sendfile(WINDOW *window, ToxWindow *prompt, Tox *m, int num, int argc,
file_senders[i].chatwin = window;
file_senders[i].file = file_to_send;
file_senders[i].filenum = (uint8_t) filenum;
file_senders[i].friendnum = num;
file_senders[i].friendnum = self->num;
file_senders[i].timestamp = (uint64_t)time(NULL);
file_senders[i].piecelen = fread(file_senders[i].nextpiece, 1,
tox_filedata_size(m, num), file_to_send);
tox_filedata_size(m, self->num), file_to_send);
wprintw(window, "Sending file: '%s'\n", path);