devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 07:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull out command loop before connect

Browse Source
This commit is contained in:
James Booth
2012-02-09 22:16:27 +00:00
parent 4148f05307
commit e989198923
1 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app.c
View File

@@ -7,36 +7,56 @@
#include "windows.h" #include "windows.h"
#include "jabber.h" #include "jabber.h"
#define AWAIT_COMMAND 1
#define START_MAIN 2
#define QUIT_PROF 3
static void main_event_loop(void); static void main_event_loop(void);
static int handle_pre_command(char *cmd);
void start_profanity(void) void start_profanity(void)
{ {
int cmd_result = AWAIT_COMMAND;
char cmd[50]; char cmd[50];
while (TRUE) {
while (cmd_result == AWAIT_COMMAND) {
inp_get_command_str(cmd); inp_get_command_str(cmd);
cmd_result = handle_pre_command(cmd);
if (strcmp(cmd, "/quit") == 0) {
break;
} else if (strncmp(cmd, "/help", 5) == 0) {
cons_help();
inp_clear();
} else if (strncmp(cmd, "/connect ", 9) == 0) {
char *user;
user = strndup(cmd+9, strlen(cmd)-9);
inp_bar_print_message("Enter password:");
char passwd[20];
inp_get_password(passwd);
inp_bar_print_message(user);
jabber_connect(user, passwd);
main_event_loop();
break;
} else {
cons_bad_command(cmd);
inp_clear();
}
} }
if (cmd_result == START_MAIN) {
main_event_loop();
}
}
static int handle_pre_command(char *cmd)
{
int result;
if (strcmp(cmd, "/quit") == 0) {
result = QUIT_PROF;
} else if (strncmp(cmd, "/help", 5) == 0) {
cons_help();
inp_clear();
result = AWAIT_COMMAND;
} else if (strncmp(cmd, "/connect ", 9) == 0) {
char *user;
user = strndup(cmd+9, strlen(cmd)-9);
inp_bar_print_message("Enter password:");
char passwd[20];
inp_get_password(passwd);
inp_bar_print_message(user);
jabber_connect(user, passwd);
result = START_MAIN;
} else {
cons_bad_command(cmd);
inp_clear();
result = AWAIT_COMMAND;
}
return result;
} }
static void main_event_loop(void) static void main_event_loop(void)
@@ -108,8 +128,6 @@ static void main_event_loop(void)
char *msg = NULL; char *msg = NULL;
usr_msg = strndup(command+5, strlen(command)-5); usr_msg = strndup(command+5, strlen(command)-5);
cons_show(usr_msg);
usr = strtok(usr_msg, " "); usr = strtok(usr_msg, " ");
if (usr != NULL) { if (usr != NULL) {
msg = strndup(command+5+strlen(usr)+1, strlen(command)-(5+strlen(usr)+1)); msg = strndup(command+5+strlen(usr)+1, strlen(command)-(5+strlen(usr)+1));