* front end for chat mode
* (the "single process" version - no more fork() anymore)
*
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include <sys/select.h>
#endif
#include <stdarg.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "citadel_ipc.h"
#include "client_chat.h"
#include "commands.h"
#include "routines.h"
#include "citadel_decls.h"
-#include "tools.h"
#include "rooms.h"
#include "messages.h"
#ifndef HAVE_SNPRINTF
#define MIN(a, b) ((a) < (b) ? (a) : (b))
extern char temp[];
-void getline(char *, int);
+void ctdl_getline(char *, int);
char last_paged[SIZ] = "";
struct timeval tv;
int retval;
- CtdlIPC_putline(ipc, "CHAT");
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, "CHAT");
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] != '8') {
scr_printf("%s\n", &buf[4]);
return;
strcpy(buf, "");
strcpy(wbuf, "");
+ strcpy(last_user, "");
color(BRIGHT_YELLOW);
sln_printf_if("\n");
sln_printf("> ");
/* If there's data from the server... */
if (FD_ISSET(CtdlIPC_getsockfd(ipc), &rfds)) {
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
recv_complete_line = 1;
goto RCL; /* ugly, but we've gotta get out! */
}
if ((ch == 10) || (ch == 13)) {
send_complete_line = 1;
} else if ((ch == 8) || (ch == 127)) {
- if (strlen(wbuf) > 0) {
+ if (!IsEmptyStr(wbuf)) {
wbuf[strlen(wbuf) - 1] = 0;
sln_printf("%c %c", 8, 8);
}
/* if the user hit return, send the line */
RCL: if (send_complete_line) {
- CtdlIPC_putline(ipc, wbuf);
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, "");
send_complete_line = 0;
/* if it's time to word wrap, send a partial line */
if (strlen(wbuf) >= (77 - strlen(fullname))) {
pos = 0;
- for (a = 0; a < strlen(wbuf); ++a) {
+ for (a = 0; !IsEmptyStr(&wbuf[a]); ++a) {
if (wbuf[a] == 32)
pos = a;
}
if (pos == 0) {
- CtdlIPC_putline(ipc, wbuf);
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, "");
send_complete_line = 0;
} else {
wbuf[pos] = 0;
- CtdlIPC_putline(ipc, wbuf);
+ CtdlIPC_chat_send(ipc, wbuf);
last_transmit = time(NULL);
strcpy(wbuf, &wbuf[pos + 1]);
}
* exiting chat. This little dialog forces
* everything to be hunky-dory.
*/
- CtdlIPC_putline(ipc, "ECHO __ExitingChat__");
+ CtdlIPC_chat_send(ipc, "ECHO __ExitingChat__");
do {
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
} while (strcmp(buf, "200 __ExitingChat__"));
return;
}
if (num_parms(buf) >= 2) {
- extract(c_user, buf, 0);
- extract(c_text, buf, 1);
+ extract_token(c_user, buf, 0, '|', sizeof c_user);
+ extract_token(c_text, buf, 1, '|', sizeof c_text);
if (num_parms(buf) > 2) {
- extract(c_room, buf, 2);
+ extract_token(c_room, buf, 2, '|', sizeof c_room);
scr_printf("Got room %s\n", c_room);
}
if (strcasecmp(c_text, "NOOP")) {
* server to prevent session timeout.
*/
if ((time(NULL) - last_transmit) >= S_KEEPALIVE) {
- CtdlIPC_putline(ipc, "NOOP");
+ CtdlIPC_chat_send(ipc, "NOOP");
last_transmit = time(NULL);
}
}
/*
- * send an express message
+ * send an instant message
*/
void page_user(CtdlIPC *ipc)
{
if (ipc->ServInfo.paging_level == 0) {
newprompt("Message: ", msg, 69);
snprintf(buf, sizeof buf, "SEXP %s|%s", touser, msg);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (!strncmp(buf, "200", 3)) {
strcpy(last_paged, touser);
}
/* new server -- use extended paging */
else if (ipc->ServInfo.paging_level >= 1) {
snprintf(buf, sizeof buf, "SEXP %s||", touser);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] != '2') {
scr_printf("%s\n", &buf[4]);
return;
}
- if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL) != 0) {
+ if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL, 0) != 0) {
scr_printf("No message sent.\n");
return;
}
pagefp = fopen(temp, "r");
unlink(temp);
snprintf(buf, sizeof buf, "SEXP %s|-", touser);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
+ CtdlIPC_chat_recv(ipc, buf);
if (buf[0] == '4') {
strcpy(last_paged, touser);
while (fgets(buf, sizeof buf, pagefp) != NULL) {
buf[strlen(buf) - 1] = 0;
- CtdlIPC_putline(ipc, buf);
+ CtdlIPC_chat_send(ipc, buf);
}
fclose(pagefp);
- CtdlIPC_putline(ipc, "000");
+ CtdlIPC_chat_send(ipc, "000");
scr_printf("Message sent.\n");
} else {
scr_printf("%s\n", &buf[4]);
projects / citadel.git / blobdiff