mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts: testing/toxic/prompt.c
This commit is contained in:
irungentoo
commit
eacd12385f
|
|
@ -25,6 +25,8 @@ typedef struct {
|
|||
|
||||
} ChatContext;
|
||||
|
||||
extern int w_active;
|
||||
extern void del_window(ToxWindow *w, int f_num);
|
||||
extern void fix_name(uint8_t* name);
|
||||
void print_help(ChatContext* self);
|
||||
void execute(ToxWindow* self, ChatContext* ctx, char* cmd);
|
||||
|
|
@ -50,7 +52,7 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
|
|||
fix_name(nick);
|
||||
|
||||
wattron(ctx->history, COLOR_PAIR(2));
|
||||
wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wattroff(ctx->history, COLOR_PAIR(2));
|
||||
wattron(ctx->history, COLOR_PAIR(4));
|
||||
wprintw(ctx->history, "%s: ", nick);
|
||||
|
|
@ -118,7 +120,7 @@ static void chat_onKey(ToxWindow* self, int key) {
|
|||
if(!string_is_empty(ctx->line)) {
|
||||
/* make sure the string has at least non-space character */
|
||||
wattron(ctx->history, COLOR_PAIR(2));
|
||||
wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
|
||||
wattroff(ctx->history, COLOR_PAIR(2));
|
||||
wattron(ctx->history, COLOR_PAIR(1));
|
||||
wprintw(ctx->history, "you: ", ctx->line);
|
||||
|
|
@ -187,6 +189,12 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
|
|||
}
|
||||
wprintw(ctx->history, "Your ID: %s\n", id);
|
||||
}
|
||||
else if (strcmp(ctx->line, "/close") == 0) {
|
||||
w_active = 0; // Go to prompt screen
|
||||
int f_num = ctx->friendnum;
|
||||
delwin(ctx->linewin);
|
||||
del_window(self, f_num);
|
||||
}
|
||||
else
|
||||
wprintw(ctx->history, "Invalid command.\n");
|
||||
}
|
||||
|
|
@ -219,17 +227,19 @@ static void chat_onInit(ToxWindow* self) {
|
|||
scrollok(ctx->history, 1);
|
||||
|
||||
ctx->linewin = subwin(self->window, 2, x, y - 3, 0);
|
||||
print_help(ctx);
|
||||
}
|
||||
|
||||
void print_help(ChatContext* self) {
|
||||
wattron(self->history, COLOR_PAIR(2) | A_BOLD);
|
||||
wprintw(self->history, "\nCommands:\n");
|
||||
wprintw(self->history, "Commands:\n");
|
||||
wattroff(self->history, A_BOLD);
|
||||
|
||||
wprintw(self->history, " /status <message> : Set your status\n");
|
||||
wprintw(self->history, " /nick <nickname> : Set your nickname\n");
|
||||
wprintw(self->history, " /myid : Print your ID\n");
|
||||
wprintw(self->history, " /clear : Clear the screen\n");
|
||||
wprintw(self->history, " /close : Close the current chat window\n");
|
||||
wprintw(self->history, " /quit or /exit : Exit program\n");
|
||||
wprintw(self->history, " /help : Print this message again\n\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@
|
|||
|
||||
#include "windows.h"
|
||||
|
||||
extern int add_window(ToxWindow w);
|
||||
extern int focus_window(int num);
|
||||
extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
|
||||
extern int add_window(ToxWindow w, int n);
|
||||
extern ToxWindow new_chat(int friendnum);
|
||||
|
||||
#define MAX_FRIENDS_NUM 100
|
||||
extern int w_active;
|
||||
|
||||
typedef struct {
|
||||
uint8_t name[MAX_NAME_LENGTH];
|
||||
|
|
@ -53,7 +52,17 @@ void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len)
|
|||
return;
|
||||
|
||||
if(friends[num].chatwin == -1) {
|
||||
friends[num].chatwin = add_window(new_chat(num));
|
||||
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) {
|
||||
WINDOW_STATUS[i] = num;
|
||||
add_window(new_chat(num), i);
|
||||
w_active = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -86,29 +95,42 @@ int friendlist_onFriendAdded(int num) {
|
|||
getname(num, friends[num_friends].name);
|
||||
strcpy((char*) friends[num_friends].name, "unknown");
|
||||
strcpy((char*) friends[num_friends].status, "unknown");
|
||||
friends[num_friends].chatwin = -1;
|
||||
|
||||
num_friends++;
|
||||
friends[num_friends++].chatwin = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void friendlist_onKey(ToxWindow* self, int key) {
|
||||
|
||||
if(key == KEY_UP) {
|
||||
if(num_selected != 0)
|
||||
num_selected--;
|
||||
num_selected--;
|
||||
if (num_selected < 0)
|
||||
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') {
|
||||
|
||||
if(friends[num_selected].chatwin != -1)
|
||||
return;
|
||||
|
||||
friends[num_selected].chatwin = add_window(new_chat(num_selected));
|
||||
focus_window(friends[num_selected].chatwin);
|
||||
/* 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) {
|
||||
w_active = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else {
|
||||
int i;
|
||||
for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) {
|
||||
if (WINDOW_STATUS[i] == -1) {
|
||||
WINDOW_STATUS[i] = num_selected;
|
||||
friends[num_selected].chatwin = num_selected;
|
||||
add_window(new_chat(num_selected), i);
|
||||
w_active = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -145,6 +167,10 @@ static void friendlist_onDraw(ToxWindow* self) {
|
|||
wrefresh(self->window);
|
||||
}
|
||||
|
||||
void disable_chatwin(int f_num) {
|
||||
friends[f_num].chatwin = -1;
|
||||
}
|
||||
|
||||
static void friendlist_onInit(ToxWindow* self) {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,14 +17,13 @@ extern ToxWindow new_prompt();
|
|||
extern ToxWindow new_friendlist();
|
||||
|
||||
extern int friendlist_onFriendAdded(int num);
|
||||
|
||||
extern void disable_chatwin(int f_num);
|
||||
extern int add_req(uint8_t* public_key); // XXX
|
||||
|
||||
#define TOXWINDOWS_MAX_NUM 32
|
||||
|
||||
static ToxWindow windows[TOXWINDOWS_MAX_NUM];
|
||||
static int w_num;
|
||||
static int w_active;
|
||||
char WINDOW_STATUS[MAX_WINDOW_SLOTS]; // Holds status of chat windows
|
||||
static ToxWindow windows[MAX_WINDOW_SLOTS];
|
||||
int w_num;
|
||||
int w_active;
|
||||
static ToxWindow* prompt;
|
||||
|
||||
// CALLBACKS START
|
||||
|
|
@ -41,7 +40,7 @@ void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) {
|
|||
|
||||
wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n);
|
||||
|
||||
for(i=0; i<w_num; i++) {
|
||||
for(i=0; i<MAX_WINDOW_SLOTS; i++) {
|
||||
if(windows[i].onFriendRequest != NULL)
|
||||
windows[i].onFriendRequest(&windows[i], public_key, data, length);
|
||||
}
|
||||
|
|
@ -52,7 +51,7 @@ void on_message(int friendnumber, uint8_t* string, uint16_t length) {
|
|||
|
||||
wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string);
|
||||
|
||||
for(i=0; i<w_num; i++) {
|
||||
for(i=0; i<MAX_WINDOW_SLOTS; i++) {
|
||||
if(windows[i].onMessage != NULL)
|
||||
windows[i].onMessage(&windows[i], friendnumber, string, length);
|
||||
}
|
||||
|
|
@ -63,7 +62,7 @@ void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
|
|||
|
||||
wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
|
||||
|
||||
for(i=0; i<w_num; i++) {
|
||||
for(i=0; i<MAX_WINDOW_SLOTS; i++) {
|
||||
if(windows[i].onNickChange != NULL)
|
||||
windows[i].onNickChange(&windows[i], friendnumber, string, length);
|
||||
}
|
||||
|
|
@ -74,7 +73,7 @@ void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, ui
|
|||
|
||||
wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
|
||||
|
||||
for(i=0; i<w_num; i++) {
|
||||
for(i=0; i<MAX_WINDOW_SLOTS; i++) {
|
||||
if(windows[i].onStatusChange != NULL)
|
||||
windows[i].onStatusChange(&windows[i], friendnumber, string, length);
|
||||
}
|
||||
|
|
@ -115,44 +114,60 @@ static void init_tox() {
|
|||
m_callback_userstatus(on_statuschange);
|
||||
}
|
||||
|
||||
int add_window(ToxWindow w) {
|
||||
if(w_num == TOXWINDOWS_MAX_NUM)
|
||||
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);
|
||||
|
||||
int j;
|
||||
for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
|
||||
WINDOW_STATUS[j] = -1;
|
||||
}
|
||||
|
||||
int add_window(ToxWindow w, int n) {
|
||||
if(w_num >= TOXWINDOWS_MAX_NUM)
|
||||
return -1;
|
||||
|
||||
if(LINES < 2)
|
||||
return -1;
|
||||
|
||||
w.window = newwin(LINES - 2, COLS, 0, 0);
|
||||
|
||||
if(w.window == NULL)
|
||||
return -1;
|
||||
|
||||
windows[w_num++] = w;
|
||||
windows[n] = w;
|
||||
w.onInit(&w);
|
||||
|
||||
return w_num - 1;
|
||||
w_num++;
|
||||
return n;
|
||||
}
|
||||
|
||||
int focus_window(int num) {
|
||||
if(num >= w_num || num < 0)
|
||||
return -1;
|
||||
|
||||
w_active = num;
|
||||
return 0;
|
||||
/* Deletes window w and cleans up */
|
||||
void del_window(ToxWindow *w, int f_num) {
|
||||
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;
|
||||
disable_chatwin(f_num);
|
||||
break;
|
||||
}
|
||||
}
|
||||
clear();
|
||||
refresh();
|
||||
}
|
||||
|
||||
static void init_windows() {
|
||||
w_num = 0;
|
||||
w_active = 0;
|
||||
|
||||
if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) {
|
||||
int n_prompt = 0;
|
||||
int n_friendslist = 1;
|
||||
if(add_window(new_prompt(), n_prompt) == -1
|
||||
|| add_window(new_friendlist(), n_friendslist) == -1) {
|
||||
fprintf(stderr, "add_window() failed.\n");
|
||||
|
||||
endwin();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
prompt = &windows[0];
|
||||
prompt = &windows[n_prompt];
|
||||
}
|
||||
|
||||
static void do_tox() {
|
||||
|
|
@ -238,7 +253,6 @@ static void load_data(char *path) {
|
|||
|
||||
static void draw_bar() {
|
||||
static int odd = 0;
|
||||
size_t i;
|
||||
|
||||
attron(COLOR_PAIR(4));
|
||||
mvhline(LINES - 2, 0, '_', COLS);
|
||||
|
|
@ -250,28 +264,26 @@ static void draw_bar() {
|
|||
printw(" TOXIC 1.0 |");
|
||||
attroff(COLOR_PAIR(4) | A_BOLD);
|
||||
|
||||
for(i=0; i<w_num; i++) {
|
||||
if(i == w_active) {
|
||||
attron(A_BOLD);
|
||||
}
|
||||
int i;
|
||||
for (i = 0; i < (MAX_WINDOW_SLOTS-1); i++) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
if (i == w_active)
|
||||
attron(A_BOLD);
|
||||
|
||||
odd = (odd+1) % 10;
|
||||
odd = (odd+1) % 10;
|
||||
if(windows[i].blink && (odd < 5)) {
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
|
||||
if(windows[i].blink && (odd < 5)) {
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
|
||||
printw(" %s", windows[i].title);
|
||||
|
||||
if(windows[i].blink && (odd < 5)) {
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
|
||||
if(i == w_active) {
|
||||
attroff(A_BOLD);
|
||||
printw(" %s", windows[i].title);
|
||||
if(windows[i].blink && (odd < 5)) {
|
||||
attron(COLOR_PAIR(3));
|
||||
}
|
||||
if(i == w_active) {
|
||||
attroff(A_BOLD);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
|
|
@ -280,6 +292,42 @@ void prepare_window(WINDOW* w) {
|
|||
wresize(w, LINES-2, COLS);
|
||||
}
|
||||
|
||||
/* Shows next window when tab or back-tab is pressed */
|
||||
void set_active_window(int ch) {
|
||||
int f_inf = 0;
|
||||
int max = MAX_WINDOW_SLOTS-1;
|
||||
if (ch == '\t') {
|
||||
int i = (w_active + 1) % max;
|
||||
while (true) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
w_active = i;
|
||||
return;
|
||||
}
|
||||
i = (i + 1) % max;
|
||||
if (f_inf++ > max) { // infinite loop check
|
||||
endwin();
|
||||
clear();
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
}else {
|
||||
int i = w_active - 1;
|
||||
if (i < 0) i = max;
|
||||
while (true) {
|
||||
if (WINDOW_STATUS[i] != -1) {
|
||||
w_active = i;
|
||||
return;
|
||||
}
|
||||
if (--i < 0) i = max;
|
||||
if (f_inf++ > max) {
|
||||
endwin();
|
||||
clear();
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
int ch;
|
||||
int i = 0;
|
||||
|
|
@ -305,6 +353,7 @@ int main(int argc, char* argv[]) {
|
|||
init_tox();
|
||||
load_data(filename);
|
||||
init_windows();
|
||||
init_window_status();
|
||||
|
||||
if(f_flag == -1) {
|
||||
attron(COLOR_PAIR(3) | A_BOLD);
|
||||
|
|
@ -312,8 +361,7 @@ int main(int argc, char* argv[]) {
|
|||
"defaulting to 'data' for a keyfile...\n");
|
||||
attroff(COLOR_PAIR(3) | A_BOLD);
|
||||
}
|
||||
|
||||
|
||||
|
||||
while(true) {
|
||||
// Update tox.
|
||||
do_tox();
|
||||
|
|
@ -327,18 +375,14 @@ int main(int argc, char* argv[]) {
|
|||
|
||||
// Handle input.
|
||||
ch = getch();
|
||||
if(ch == '\t') {
|
||||
w_active = (w_active + 1) % w_num;
|
||||
}
|
||||
else if(ch == KEY_BTAB) {
|
||||
w_active = (w_active + w_num - 1) % w_num;
|
||||
if(ch == '\t' || ch == KEY_BTAB)
|
||||
set_active_window(ch);
|
||||
else if(ch != ERR) {
|
||||
a->onKey(a, ch);
|
||||
}
|
||||
else if(ch != ERR) {
|
||||
a->onKey(a, ch);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -267,7 +267,6 @@ static void execute(ToxWindow* self, char* u_cmd) {
|
|||
wprintw(self->window, "Message successfully sent.\n");
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
wprintw(self->window, "Invalid command.\n");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,14 @@
|
|||
*/
|
||||
|
||||
#include <stdbool.h>
|
||||
#define TOXWINDOWS_MAX_NUM 32
|
||||
#define MAX_FRIENDS_NUM 100
|
||||
|
||||
/* number of permanent default windows */
|
||||
#define N_DEFAULT_WINS 2
|
||||
|
||||
/* maximum window slots for WINDOW_STATUS array */
|
||||
#define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM
|
||||
|
||||
typedef struct ToxWindow_ ToxWindow;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user