* Added a per-user client option to always compose messages using the
[citadel.git] / citadel / commands.c
index 2a5bd73d4ec291b64b0a2d974f391300c0ef2c8f..17cb60853a9343c015602885ae92b42d18b5bb65 100644 (file)
@@ -1,12 +1,9 @@
 /*
- * Citadel/UX
- *
- * commands.c - front end for Citadel
- *
- * This version is the traditional command parser for room prompts.
- *
  * $Id$
  *
+ * This file contains functions which implement parts of the
+ * text-mode user interface.
+ *
  */
 
 #include "sysdep.h"
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #include <sys/select.h>
 #endif
 
+#ifdef THREADED_CLIENT
+#include <pthread.h>
+#endif
 
 #include <signal.h>
 #include <errno.h>
 #include <stdarg.h>
 #include "citadel.h"
+#include "citadel_ipc.h"
 #include "commands.h"
 #include "messages.h"
 #include "citadel_decls.h"
 #include "routines.h"
 #include "routines2.h"
+#include "tools.h"
+#include "rooms.h"
+#include "client_chat.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
+#include "screen.h"
 
 struct citcmd {
        struct citcmd *next;
        int c_cmdnum;
        int c_axlevel;
        char c_keys[5][64];
-       };
+};
 
 #define IFNEXPERT if ((userflags&US_EXPERT)==0)
 
 
 int rc_exp_beep;
-char rc_exp_cmd[256];
+char rc_exp_cmd[1024];
 int rc_allow_attachments;
 int rc_display_message_numbers;
 int rc_force_mail_prompts;
+int rc_remember_passwords;
 int rc_ansi_color;
+int rc_color_use_bg;
+int rc_prompt_control = 0;
+time_t rc_idle_threshold = (time_t)900;
+char rc_url_cmd[SIZ];
+char rc_gotmail_cmd[SIZ];
 
 char *gl_string;
 int next_lazy_cmd = 5;
 
+int lines_printed = 0;         /* line count for paginator */
+extern int screenwidth, screenheight;
+extern int termn8;
+extern CtdlIPC *ipc_for_signal_handlers;       /* KLUDGE cover your eyes */
+
 struct citcmd *cmdlist = NULL;
 
 
 /* these variables are local to this module */
 char keepalives_enabled = KA_YES;      /* send NOOPs to server when idle */
-int ok_to_interrupt = 0;               /* print express msgs asynchronously */
+int ok_to_interrupt = 0;               /* print instant msgs asynchronously */
 time_t AnsiDetect;                     /* when did we send the detect code? */
 int enable_color = 0;                  /* nonzero for ANSI color */
 
 
+
+
 /*
- * print_express()  -  print express messages if there are any
+ * If an interesting key has been pressed, return its value, otherwise 0
  */
-void print_express(void) {
-       char buf[256];
-       FILE *outpipe;
+char was_a_key_pressed(void) {
+       fd_set rfds;
+       struct timeval tv;
+       int the_character;
+       int retval;
+
+       FD_ZERO(&rfds);
+       FD_SET(0, &rfds);
+       tv.tv_sec = 0;
+       tv.tv_usec = 0;
+       retval = select(1, &rfds, NULL, NULL, &tv); 
+
+       /* Careful!  Disable keepalives during keyboard polling; we're probably
+        * in the middle of a data transfer from the server, in which case
+        * sending a NOOP would throw the client protocol out of sync.
+        */
+       if (FD_ISSET(0, &rfds)) {
+               set_keepalives(KA_NO);
+               the_character = inkey();
+               set_keepalives(KA_YES);
+       }
+       else {
+               the_character = 0;
+       }
+       return(the_character);
+}
 
-       if (express_msgs == 0) return;
-       express_msgs = 0;
-       serv_puts("PEXP");
-       serv_gets(buf);
-       if (buf[0]!='1') return;
-
-       if (strlen(rc_exp_cmd) > 0) {
-               outpipe = popen(rc_exp_cmd, "w");
-               if (outpipe != NULL) {
-                       while (serv_gets(buf), strcmp(buf,"000")) {
-                               fprintf(outpipe, "%s\n", buf);
-                               }
-                       pclose(outpipe);
-                       return;
-                       }
+
+
+
+
+/*
+ * Check to see if we need to pause at the end of a screen.
+ * If we do, we have to switch to half keepalives during the pause because
+ * we are probably in the middle of a server operation and the NOOP command
+ * would confuse everything.
+ */
+int checkpagin(int lp, unsigned int pagin, unsigned int height)
+{
+       int thekey;
+
+       if (sigcaught) return(lp);
+       thekey = was_a_key_pressed();
+       if (thekey == 'q' || thekey == 'Q' || thekey == 's' || thekey == 'S')
+               thekey = STOP_KEY;
+       if (thekey == 'n' || thekey == 'N')
+               thekey = NEXT_KEY;
+       if ( (thekey == NEXT_KEY) || (thekey == STOP_KEY)) sigcaught = thekey;
+       if (sigcaught) return(lp);
+
+       if (!pagin) return(0);
+       if (lp>=(height-1)) {
+               set_keepalives(KA_HALF);
+               hit_any_key(ipc_for_signal_handlers);   /* Cheating -IO */
+               set_keepalives(KA_YES);
+               return(0);
+       }
+       return(lp);
+}
+
+
+
+
+/*
+ * pprintf()  ...   paginated version of printf()
+ */
+void pprintf(const char *format, ...) {   
+        va_list arg_ptr;
+       static char buf[4096];  /* static for performance, change if needed */
+       int i;
+
+       /* If sigcaught is nonzero, a keypress has interrupted this and we
+        * should just drain output.
+        */
+       if (sigcaught) return;
+       /* Otherwise, start spewing... */ 
+        va_start(arg_ptr, format);   
+        vsnprintf(buf, sizeof(buf), format, arg_ptr);   
+        va_end(arg_ptr);   
+
+       for (i=0; i<strlen(buf); ++i) {
+               scr_putc(buf[i]);
+               if (buf[i]==10) {
+                       ++lines_printed;
+                       lines_printed = checkpagin(lines_printed,
+                               (userflags & US_PAGINATOR),
+                               screenheight);
                }
+       }
+}   
+
+
+
+/*
+ * print_instant()  -  print instant messages if there are any
+ */
+void print_instant(void)
+{
+       char buf[1024];
+       FILE *outpipe;
+       time_t timestamp;
+       struct tm stamp;
+       int flags = 0;
+       char sender[64];
+       char node[64];
+       char *listing = NULL;
+       int r;                  /* IPC result code */
+
+       if (instant_msgs == 0)
+               return;
 
-       /* fall back to built-in express message display */
        if (rc_exp_beep) {
-               putc(7,stdout);
+               ctdl_beep();
+       }
+       if (strlen(rc_exp_cmd) == 0) {
+               color(BRIGHT_RED);
+               scr_printf("\r---");
+       }
+       
+       while (instant_msgs != 0) {
+               r = CtdlIPCGetInstantMessage(ipc_for_signal_handlers, &listing, buf);
+               if (r / 100 != 1)
+                       return;
+       
+               instant_msgs = extract_int(buf, 0);
+               timestamp = extract_long(buf, 1);
+               flags = extract_int(buf, 2);
+               extract_token(sender, buf, 3, '|', sizeof sender);
+               extract_token(node, buf, 4, '|', sizeof node);
+               strcpy(last_paged, sender);
+       
+               localtime_r(&timestamp, &stamp);
+
+               /* If the page is a Logoff Request, honor it. */
+               if (flags & 2) {
+                       termn8 = 1;
+                       return;
                }
-       color(1);
-       printf("---\n");
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               printf("%s\n",buf);
+       
+               if (strlen(rc_exp_cmd) > 0) {
+                       outpipe = popen(rc_exp_cmd, "w");
+                       if (outpipe != NULL) {
+                               /* Header derived from flags */
+                               if (flags & 2)
+                                       fprintf(outpipe,
+                                              "Please log off now, as requested ");
+                               else if (flags & 1)
+                                       fprintf(outpipe, "Broadcast message ");
+                               else if (flags & 4)
+                                       fprintf(outpipe, "Chat request ");
+                               else
+                                       fprintf(outpipe, "Message ");
+                               /* Timestamp.  Can this be improved? */
+                               if (stamp.tm_hour == 0 || stamp.tm_hour == 12)
+                                       fprintf(outpipe, "at 12:%02d%cm",
+                                               stamp.tm_min, 
+                                               stamp.tm_hour ? 'p' : 'a');
+                               else if (stamp.tm_hour > 12)            /* pm */
+                                       fprintf(outpipe, "at %d:%02dpm",
+                                               stamp.tm_hour - 12,
+                                               stamp.tm_min);
+                               else                                    /* am */
+                                       fprintf(outpipe, "at %d:%02dam",
+                                               stamp.tm_hour, stamp.tm_min);
+                               fprintf(outpipe, " from %s", sender);
+                               if (strncmp(ipc_for_signal_handlers->ServInfo.nodename, node, 32))
+                                       fprintf(outpipe, " @%s", node);
+                               fprintf(outpipe, ":\n%s\n", listing);
+                               pclose(outpipe);
+                               if (instant_msgs == 0)
+                                       return;
+                               continue;
+                       }
                }
-       printf("---\n");
-       color(7);
+               /* fall back to built-in instant message display */
+               scr_printf("\n");
+               lines_printed++;
+
+               /* Header derived from flags */
+               if (flags & 2)
+                       scr_printf("Please log off now, as requested ");
+               else if (flags & 1)
+                       scr_printf("Broadcast message ");
+               else if (flags & 4)
+                       scr_printf("Chat request ");
+               else
+                       scr_printf("Message ");
+       
+               /* Timestamp.  Can this be improved? */
+               if (stamp.tm_hour == 0 || stamp.tm_hour == 12)/* 12am/12pm */
+                       scr_printf("at 12:%02d%cm", stamp.tm_min, 
+                               stamp.tm_hour ? 'p' : 'a');
+               else if (stamp.tm_hour > 12)                    /* pm */
+                       scr_printf("at %d:%02dpm",
+                               stamp.tm_hour - 12, stamp.tm_min);
+               else                                            /* am */
+                       scr_printf("at %d:%02dam", stamp.tm_hour, stamp.tm_min);
+               
+               /* Sender */
+               scr_printf(" from %s", sender);
+       
+               /* Remote node, if any */
+               if (strncmp(ipc_for_signal_handlers->ServInfo.nodename, node, 32))
+                       scr_printf(" @%s", node);
+       
+               scr_printf(":\n");
+               lines_printed++;
+               fmout(screenwidth, NULL, listing, NULL, 1, screenheight, -1, 0);
+               free(listing);
+
+               /* when running in curses mode, the scroll bar in most
+                  xterm-style programs becomes useless, so it makes sense to
+                  pause after a screenful of pages if the user has been idle
+                  for a while. However, this is annoying to some of the users
+                  who aren't in curses mode and tend to leave their clients
+                  idle. keepalives become disabled, resulting in getting booted
+                  when coming back to the idle session. but they probably have
+                  a working scrollback in their terminal, so disable it in this
+                  case:
+                */
+               if (!is_curses_enabled())
+                       lines_printed = 0;
        }
+       scr_printf("\n---\n");
+       color(BRIGHT_WHITE);
+
+
+}
 
 
 void set_keepalives(int s)
 {
-       keepalives_enabled = (char)s;
-       }
+       keepalives_enabled = (char) s;
+}
 
 /* 
  * This loop handles the "keepalive" messages sent to the server when idling.
  */
-void do_keepalive(void) {
-       char buf[256];
-       static time_t idlet = 0;
-       time_t now;
 
-       time(&now);
-       if ((now - idlet) < ((long)S_KEEPALIVE)) return;
+static time_t idlet = 0;
+static void really_do_keepalive(void) {
+       int r;                          /* IPC response code */
+
        time(&idlet);
 
-       /* Do a space-backspace to keep socksified telnet sessions open */
-       printf(" %c", 8);
-       fflush(stdout);
-
-       if (keepalives_enabled != KA_NO) {
-               serv_puts("NOOP");
-               if (keepalives_enabled == KA_YES) {
-                       serv_gets(buf);
-                       if (buf[3]=='*') {
-                               express_msgs = 1;
-                               if (ok_to_interrupt == 1) {
-                                       printf("\r%64s\r", "");
-                                       print_express();
-                                       printf("%s%c ",room_name,
-                                               room_prompt(room_flags));
-                                       fflush(stdout); 
-                                       }
-                               }
+       /* This may sometimes get called before we are actually connected
+        * to the server.  Don't do anything if we aren't connected. -IO
+        */
+       if (!ipc_for_signal_handlers)
+               return;
+
+       /* If full keepalives are enabled, send a NOOP to the server and
+        * wait for a response.
+        */
+       if (keepalives_enabled == KA_YES) {
+               r = CtdlIPCNoop(ipc_for_signal_handlers);
+               if (instant_msgs > 0) {
+                       if (ok_to_interrupt == 1) {
+                               scr_printf("\r%64s\r", "");
+                               print_instant();
+                               scr_printf("%s%c ", room_name,
+                                      room_prompt(room_flags));
+                               scr_flush();
                        }
                }
        }
 
+       /* If half keepalives are enabled, send a QNOP to the server (if the
+        * server supports it) and then do nothing.
+        */
+       if ( (keepalives_enabled == KA_HALF)
+          && (ipc_for_signal_handlers->ServInfo.supports_qnop > 0) ) {
+               CtdlIPC_chat_send(ipc_for_signal_handlers, "QNOP");
+       }
+}
+
+/* threaded nonblocking keepalive stuff starts here. I'm going for a simple
+   encapsulated interface; in theory there should be no need to touch these
+   globals outside of the async_ka_* functions. */
+
+#ifdef THREADED_CLIENT
+static pthread_t ka_thr_handle;
+static int ka_thr_active = 0;
+static int async_ka_enabled = 0;
 
-int inkey(void) {              /* get a character from the keyboard, with   */
-       int a;          /* the watchdog timer in effect if necessary */
-        fd_set rfds;
-        struct timeval tv;
-       time_t start_time, now;
-       char inbuf[2];
+static void *ka_thread(void *arg)
+{
+       really_do_keepalive();
+       pthread_detach(ka_thr_handle);
+       ka_thr_active = 0;
+       return NULL;
+}
 
+/* start up a thread to handle a keepalive in the background */
+static void async_ka_exec(void)
+{
+       if (!ka_thr_active) {
+               ka_thr_active = 1;
+               if (pthread_create(&ka_thr_handle, NULL, ka_thread, NULL)) {
+                       perror("pthread_create");
+                       exit(1);
+               }
+       }
+}
+#endif /* THREADED_CLIENT */
+
+/* I changed this from static to not because I need to call it from
+   screen.c, either that or make something in screen.c not static.
+   Fix it how you like. Why all the staticness? stu */
+   
+void do_keepalive(void)
+{
+       time_t now;
+
+       time(&now);
+       if ((now - idlet) < ((long) S_KEEPALIVE))
+               return;
+
+       /* Do a space-backspace to keep telnet sessions from idling out */
+       scr_printf(" %c", 8);
+       scr_flush();
+
+#ifdef THREADED_CLIENT
+       if (async_ka_enabled)
+               async_ka_exec();
+       else
+#endif
+               really_do_keepalive();
+}
+
+
+/* Now the actual async-keepalve API that we expose to higher levels:
+   async_ka_start() and async_ka_end(). These do nothing when we don't have
+   threading enabled, so we avoid sprinkling ifdef's throughout the code. */
+
+/* wait for a background keepalive to complete. this must be done before
+   attempting any further server requests! */
+void async_ka_end(void)
+{
+#ifdef THREADED_CLIENT
+       if (ka_thr_active)
+               pthread_join(ka_thr_handle, NULL);
+
+       async_ka_enabled--;
+#endif
+}
+
+/* tell do_keepalive() that keepalives are asynchronous. */
+void async_ka_start(void)
+{
+#ifdef THREADED_CLIENT
+       async_ka_enabled++;
+#endif
+}
+
+
+int inkey(void)
+{                              /* get a character from the keyboard, with   */
+       int a;                  /* the watchdog timer in effect if necessary */
+       fd_set rfds;
+       struct timeval tv;
+       time_t start_time;
+
+       scr_flush();
+       lines_printed = 0;
        time(&start_time);
-       
-       do {
 
+       do {
                /* This loop waits for keyboard input.  If the keepalive
                 * timer expires, it sends a keepalive to the server if
                 * necessary and then waits again.
                 */
                do {
+                       scr_set_windowsize(ipc_for_signal_handlers);
                        do_keepalive();
-                       fflush(stdout);
+                       scr_set_windowsize(ipc_for_signal_handlers);
+
                        FD_ZERO(&rfds);
-                       FD_SET(0,&rfds);
+                       FD_SET(0, &rfds);
                        tv.tv_sec = S_KEEPALIVE;
                        tv.tv_usec = 0;
 
-                       time(&now);
-                       if (((now-start_time) > SLEEPING)
-                          && (SLEEPING != 0) && (getppid()==1)) {
-                               printf("Sleeping? Call again.\n");
-                               logoff(SIGALRM);
-                               }
-
                        select(1, &rfds, NULL, NULL, &tv);
-                       } while (!FD_ISSET(0, &rfds));
-
-
-
+               } while (!FD_ISSET(0, &rfds));
 
                /* At this point, there's input, so fetch it.
                 * (There's a hole in the bucket...)
                 */
-               read(0, inbuf, 1);
-               a = inbuf[0];
-               if (a==127) a=8;
-               if (a>126) a=0;
-               if (a==10) a=13;
-               if (((a!=4)&&(a!=13)&&(a!=8)&&(a!=NEXT_KEY)&&(a!=STOP_KEY))
-                       && ((a<32)||(a>126))) a=0;
-               } while(a==0);
-       return(a);
-       }
+               a = scr_getc(SCR_BLOCK);
+               if (a == 127)
+                       a = 8;
+               if (a > 126)
+                       a = 0;
+               if (a == 13)
+                       a = 10;
+               if (((a != 23) && (a != 4) && (a != 10) && (a != 8) && (a != NEXT_KEY) && (a != STOP_KEY))
+                   && ((a < 32) || (a > 126)))
+                       a = 0;
+
+#ifndef DISABLE_CURSES
+#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
+               if (a == ERR) {
+                       logoff(NULL, 3);
+               }
+#endif
+#endif
+
+       } while (a == 0);
+       return (a);
+}
 
 
-int yesno(void) { /* Returns 1 for yes, 0 for no */
-int a;
+int yesno(void)
+{                              /* Returns 1 for yes, 0 for no */
+       int a;
        while (1) {
-               a=inkey(); a=tolower(a);
-               if (a=='y') { printf("Yes\n"); return(1); }
-               if (a=='n') { printf("No\n");  return(0); }
+               a = inkey();
+               a = tolower(a);
+               if (a == 'y') {
+                       scr_printf("Yes\n");
+                       return (1);
+               }
+               if (a == 'n') {
+                       scr_printf("No\n");
+                       return (0);
                }
        }
+}
 
-int yesno_d(int d) /* Returns 1 for yes, 0 for no, arg is default value */
-       {
-int a;
+/* Returns 1 for yes, 0 for no, arg is default value */
+int yesno_d(int d)
+{
+       int a;
        while (1) {
-               a=inkey(); a=tolower(a);
-               if (a==13) a=(d ? 'y' : 'n');
-               if (a=='y') { printf("Yes\n"); return(1); }
-               if (a=='n') { printf("No\n");  return(0); }
+               a = inkey();
+               a = tolower(a);
+               if (a == 10)
+                       a = (d ? 'y' : 'n');
+               if (a == 'y') {
+                       scr_printf("Yes\n");
+                       return (1);
+               }
+               if (a == 'n') {
+                       scr_printf("No\n");
+                       return (0);
                }
        }
+}
 
 
 
 
-void getline(char *string, int lim)    /* Gets a line from the terminal */
-                               /* Pointer to string buffer */
-                       /* Maximum length - if negative, no-show */
+/* Gets a line from the terminal */
+/* string == Pointer to string buffer */
+/* lim == Maximum length - if negative, no-show */
+void getline(char *string, int lim) 
 {
-       int a,b;
+       int a, b;
        char flag = 0;
 
-       if (lim<0) { lim=(0-lim); flag=1; }
-       strcpy(string,"");
+       if (lim < 0) {
+               lim = (0 - lim);
+               flag = 1;
+       }
+       strcpy(string, "");
        gl_string = string;
-GLA:   a=inkey(); a=(a&127);
-       if ((a==8)&&(strlen(string)==0)) goto GLA;
-       if ((a!=13)&&(a!=8)&&(strlen(string)==lim)) goto GLA;
-       if ((a==8)&&(string[0]!=0)) {
-               string[strlen(string)-1]=0;
-               putc(8,stdout); putc(32,stdout); putc(8,stdout); goto GLA; }
-       if ((a==13)||(a==10)) {
-               putc(13,stdout);
-               putc(10,stdout);
+       async_ka_start();
+      GLA:a = inkey();
+       a = (a & 127);
+       if ((a == 8 || a == 23) && (strlen(string) == 0))
+               goto GLA;
+       if ((a != 10) && (a != 8) && (strlen(string) == lim))
+               goto GLA;
+       if ((a == 8) && (string[0] != 0)) {
+               string[strlen(string) - 1] = 0;
+               scr_putc(8); scr_putc(32); scr_putc(8);
+               goto GLA;
+       }
+       if ((a == 23) && (string[0] != 0)) {
+               do {
+                       string[strlen(string) - 1] = 0;
+                       scr_putc(8); scr_putc(32); scr_putc(8);
+               } while (strlen(string) && string[strlen(string) - 1] != ' ');
+               goto GLA;
+       }
+       if ((a == 10)) {
+               scr_putc(10);
+               async_ka_end();
                return;
-               }
-       if (a<32) a='.';
-       b=strlen(string);
-       string[b]=a;
-       string[b+1]=0;
-       if (flag==0) putc(a,stdout);
-       if (flag==1) putc('*',stdout);
-       goto GLA;
        }
+       if (a < 32)
+               a = '.';
+       b = strlen(string);
+       string[b] = a;
+       string[b + 1] = 0;
+       if (flag == 0)
+               scr_putc(a);
+       if (flag == 1)
+               scr_putc('*');
+       goto GLA;
+}
 
 
 /*
@@ -262,34 +614,57 @@ GLA:      a=inkey(); a=(a&127);
  */
 void strprompt(char *prompt, char *str, int len)
 {
+       int i;
        char buf[128];
-       print_express();
-       color(3);
-       printf("%s [", prompt);
-       color(1);
-       printf("%s", str);
-       color(3);
-       printf("]: ");
-       color(2);
-       getline(buf,len);
-       color(7);
-       if (buf[0]!=0) strcpy(str,buf);
+
+       print_instant();
+       color(DIM_WHITE);
+       scr_printf("%s ", prompt);
+       color(DIM_MAGENTA);
+       scr_printf("[");
+       color(BRIGHT_MAGENTA);
+
+       if (len >= 0) {
+               scr_printf("%s", str);
+       }
+       else {
+               for (i=0; i<strlen(str); ++i) {
+                       scr_printf("*");
+               }
        }
 
+       color(DIM_MAGENTA);
+       scr_printf("]");
+       color(DIM_WHITE);
+       scr_printf(": ");
+       color(BRIGHT_CYAN);
+       getline(buf, len);
+       if (buf[0] != 0)
+               strcpy(str, buf);
+       color(DIM_WHITE);
+}
+
 /*
  * boolprompt()  -  prompt for a yes/no, print the existing value and
  *                  allow the user to press return to keep it...
  */
-int boolprompt(char *prompt, int prev_val) {
-       color(3);
-       printf("%s [", prompt);
-       color(1);
-       printf("%s", (prev_val ? "Yes" : "No"));
-       color(3);
-       printf("]: ");
-       color(7);
-       return(yesno_d(prev_val));
-       }
+int boolprompt(char *prompt, int prev_val)
+{
+       int r;
+
+       color(DIM_WHITE);
+       scr_printf("%s ", prompt);
+       color(DIM_MAGENTA);
+       scr_printf("[");
+       color(BRIGHT_MAGENTA);
+       scr_printf("%s", (prev_val ? "Yes" : "No"));
+       color(DIM_MAGENTA);
+       scr_printf("]: ");
+       color(BRIGHT_CYAN);
+       r = (yesno_d(prev_val));
+       color(DIM_WHITE);
+       return r;
+}
 
 /* 
  * intprompt()  -  like strprompt(), except for an integer
@@ -299,16 +674,25 @@ int intprompt(char *prompt, int ival, int imin, int imax)
 {
        char buf[16];
        int i;
-       i = ival;
+       int p;
+
        do {
-               snprintf(buf,sizeof buf,"%d",i);
-               strprompt(prompt,buf,15);
-               i=atoi(buf);
-               if (i<imin) printf("*** Must be no less than %d.\n",imin);
-               if (i>imax) printf("*** Must be no more than %d.\n",imax);
-               } while((i<imin)||(i>imax));
-       return(i);
-       }
+               i = ival;
+               snprintf(buf, sizeof buf, "%d", i);
+               strprompt(prompt, buf, 15);
+               i = atoi(buf);
+               for (p=0; p<strlen(buf); ++p) {
+                       if ( (!isdigit(buf[p]))
+                          && ( (buf[p]!='-') || (p!=0) )  )
+                               i = imin - 1;
+               }
+               if (i < imin)
+                       scr_printf("*** Must be no less than %d.\n", imin);
+               if (i > imax)
+                       scr_printf("*** Must be no more than %d.\n", imax);
+       } while ((i < imin) || (i > imax));
+       return (i);
+}
 
 /* 
  * newprompt()  -  prompt for a string with no existing value
@@ -316,162 +700,258 @@ int intprompt(char *prompt, int ival, int imin, int imax)
  */
 void newprompt(char *prompt, char *str, int len)
 {
-       color(3);
-       printf("%s",prompt);
-       color(2);
-       getline(str,len);
-       color(7);
-       }
+       color(BRIGHT_MAGENTA);
+       scr_printf("%s", prompt);
+       color(DIM_MAGENTA);
+       getline(str, len);
+       color(DIM_WHITE);
+}
 
 
-int lkey(void) {       /* returns a lower case value */
+int lkey(void)
+{                              /* returns a lower case value */
        int a;
-       a=inkey();
-       if (isupper(a)) a=tolower(a);
-       return(a);
-       }
+       a = inkey();
+       if (isupper(a))
+               a = tolower(a);
+       return (a);
+}
 
 /*
  * parse the citadel.rc file
  */
-void load_command_set(void) {
+void load_command_set(void)
+{
        FILE *ccfile;
-       char buf[256];
+       char buf[1024];
+       char editor_key[100];
        struct citcmd *cptr;
        struct citcmd *lastcmd = NULL;
-       int a,d;
+       int a, d;
        int b = 0;
+       int i;
 
 
        /* first, set up some defaults for non-required variables */
 
-       strcpy(editor_path,"");
-       strcpy(printcmd,"");
-       strcpy(rc_username,"");
-       strcpy(rc_password,"");
+       for (i = 0; i < MAX_EDITORS; i++)
+               strcpy(editor_paths[i], "");
+       strcpy(printcmd, "");
+       strcpy(imagecmd, "");
+       strcpy(rc_username, "");
+       strcpy(rc_password, "");
        rc_floor_mode = 0;
        rc_exp_beep = 1;
        rc_allow_attachments = 0;
+       rc_remember_passwords = 0;
        strcpy(rc_exp_cmd, "");
        rc_display_message_numbers = 0;
        rc_force_mail_prompts = 0;
        rc_ansi_color = 0;
+       rc_color_use_bg = 0;
+       strcpy(rc_url_cmd, "");
+       strcpy(rc_gotmail_cmd, "");
+#ifdef HAVE_OPENSSL
+       rc_encrypt = RC_DEFAULT;
+#endif
+#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
+       rc_screen = RC_DEFAULT;
+#endif
+       rc_alt_semantics = 0;
 
        /* now try to open the citadel.rc file */
 
        ccfile = NULL;
        if (getenv("HOME") != NULL) {
-               snprintf(buf,sizeof buf,"%s/.citadelrc",getenv("HOME"));
-               ccfile = fopen(buf,"r");
-               }
-       if (ccfile==NULL) {
-               ccfile = fopen("/usr/local/lib/citadel.rc","r");
-               }
-       if (ccfile==NULL) {
-               snprintf(buf,sizeof buf,"%s/citadel.rc",BBSDIR);
-               ccfile = fopen(buf,"r");
-               }
-       if (ccfile==NULL) {
-               ccfile = fopen("./citadel.rc","r");
-               }
-       if (ccfile==NULL) {
+               snprintf(buf, sizeof buf, "%s/.citadelrc", getenv("HOME"));
+               ccfile = fopen(buf, "r");
+       }
+       if (ccfile == NULL) {
+               snprintf(buf, sizeof buf, 
+#ifndef HAVE_ETC_DIR
+                                CTDLDIR
+#else
+                                ETC_DIR
+#endif
+                                "/citadel.rc");
+               ccfile = fopen(buf, "r");
+       }
+       if (ccfile == NULL) {
+               ccfile = fopen("/etc/citadel.rc", "r");
+       }
+       if (ccfile == NULL) {
+               ccfile = fopen("./citadel.rc", "r");
+       }
+       if (ccfile == NULL) {
                perror("commands: cannot open citadel.rc");
-               logoff(errno);
+               logoff(NULL, 3);
+       }
+       while (fgets(buf, sizeof buf, ccfile) != NULL) {
+               while ((strlen(buf) > 0) ? (isspace(buf[strlen(buf) - 1])) : 0)
+                       buf[strlen(buf) - 1] = 0;
+
+               if (!strncasecmp(buf, "encrypt=", 8)) {
+                       if (!strcasecmp(&buf[8], "yes")) {
+#ifdef HAVE_OPENSSL
+                               rc_encrypt = RC_YES;
+#else
+                               fprintf(stderr, "citadel.rc requires encryption support but citadel is not compiled with OpenSSL");
+                               logoff(NULL, 3);
+#endif
+                       }
+#ifdef HAVE_OPENSSL
+                       else if (!strcasecmp(&buf[8], "no")) {
+                               rc_encrypt = RC_NO;
+                       }
+                       else if (!strcasecmp(&buf[8], "default")) {
+                               rc_encrypt = RC_DEFAULT;
+                       }
+#endif
                }
 
-       while (fgets(buf, 256, ccfile) != NULL) {
-            while ( (strlen(buf)>0) ? (isspace(buf[strlen(buf)-1])) : 0 )
-               buf[strlen(buf)-1] = 0;
+#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
+               if (!strncasecmp(buf, "fullscreen=", 11)) {
+                       if (!strcasecmp(&buf[11], "yes"))
+                               rc_screen = RC_YES;
+                       else if (!strcasecmp(&buf[11], "no"))
+                               rc_screen = RC_NO;
+               }
+#endif
 
-           if (!struncmp(buf,"editor=",7))
-               strcpy(editor_path,&buf[7]);
+               if (!strncasecmp(buf, "editor=", 7))
+                       strcpy(editor_paths[0], &buf[7]);
 
-           if (!struncmp(buf,"printcmd=",9))
-               strcpy(printcmd,&buf[9]);
+               for (i = 0; i < MAX_EDITORS; i++)
+               {
+                       sprintf(editor_key, "editor%d=", i);
+                       if (!strncasecmp(buf, editor_key, strlen(editor_key)))
+                               strcpy(editor_paths[i], &buf[strlen(editor_key)]);
+               }
 
-           if (!struncmp(buf,"expcmd=",7))
-               strcpy(rc_exp_cmd,&buf[7]);
+               if (!strncasecmp(buf, "printcmd=", 9))
+                       strcpy(printcmd, &buf[9]);
 
-           if (!struncmp(buf,"local_screen_dimensions=",24))
-               have_xterm = (char)atoi(&buf[24]);
+               if (!strncasecmp(buf, "imagecmd=", 9))
+                       strcpy(imagecmd, &buf[9]);
 
-           if (!struncmp(buf,"use_floors=",11)) {
-               if (!strucmp(&buf[11],"yes")) rc_floor_mode = RC_YES;
-               if (!strucmp(&buf[11],"no")) rc_floor_mode = RC_NO;
-               if (!strucmp(&buf[11],"default")) rc_floor_mode = RC_DEFAULT;
-               }
+               if (!strncasecmp(buf, "expcmd=", 7))
+                       strcpy(rc_exp_cmd, &buf[7]);
 
-           if (!struncmp(buf,"beep=",5)) {
-               rc_exp_beep = atoi(&buf[5]);
-               }
+               if (!strncasecmp(buf, "local_screen_dimensions=", 24))
+                       have_xterm = (char) atoi(&buf[24]);
 
-           if (!struncmp(buf,"allow_attachments=", 18)) {
-               rc_allow_attachments = atoi(&buf[18]);
+               if (!strncasecmp(buf, "use_floors=", 11)) {
+                       if (!strcasecmp(&buf[11], "yes"))
+                               rc_floor_mode = RC_YES;
+                       if (!strcasecmp(&buf[11], "no"))
+                               rc_floor_mode = RC_NO;
+                       if (!strcasecmp(&buf[11], "default"))
+                               rc_floor_mode = RC_DEFAULT;
                }
-
-           if (!struncmp(buf,"display_message_numbers=", 24)) {
-               rc_display_message_numbers = atoi(&buf[24]);
+               if (!strncasecmp(buf, "beep=", 5)) {
+                       rc_exp_beep = atoi(&buf[5]);
                }
-
-           if (!struncmp(buf,"force_mail_prompts=", 19)) {
-               rc_force_mail_prompts = atoi(&buf[19]);
+               if (!strncasecmp(buf, "allow_attachments=", 18)) {
+                       rc_allow_attachments = atoi(&buf[18]);
                }
-
-           if (!struncmp(buf,"ansi_color=", 11)) {
-               if (!strncasecmp(&buf[11], "on", 2)) 
-                       rc_ansi_color = 1;
-               if (!strncasecmp(&buf[11], "auto", 4)) 
-                       rc_ansi_color = 2;      /* autodetect */
-               if (!strncasecmp(&buf[11], "user", 4)) 
-                       rc_ansi_color = 3;      /* user config */
+               if (!strncasecmp(buf, "idle_threshold=", 15)) {
+                       rc_idle_threshold = atol(&buf[15]);
+               }
+               if (!strncasecmp(buf, "remember_passwords=", 19)) {
+                       rc_remember_passwords = atoi(&buf[19]);
                }
+               if (!strncasecmp(buf, "display_message_numbers=", 24)) {
+                       rc_display_message_numbers = atoi(&buf[24]);
+               }
+               if (!strncasecmp(buf, "force_mail_prompts=", 19)) {
+                       rc_force_mail_prompts = atoi(&buf[19]);
+               }
+               if (!strncasecmp(buf, "ansi_color=", 11)) {
+                       if (!strncasecmp(&buf[11], "on", 2))
+                               rc_ansi_color = 1;
+                       if (!strncasecmp(&buf[11], "auto", 4))
+                               rc_ansi_color = 2;      /* autodetect */
+                       if (!strncasecmp(&buf[11], "user", 4))
+                               rc_ansi_color = 3;      /* user config */
+               }
+               if (!strncasecmp(buf, "use_background=", 15)) {
+                       if (!strncasecmp(&buf[15], "on", 2))
+                               rc_color_use_bg = 9;
+               }
+               if (!strncasecmp(buf, "prompt_control=", 15)) {
+                       if (!strncasecmp(&buf[15], "on", 2))
+                               rc_prompt_control = 1;
+                       if (!strncasecmp(&buf[15], "user", 4))
+                               rc_prompt_control = 3;  /* user config */
+               }
+               if (!strncasecmp(buf, "username=", 9))
+                       strcpy(rc_username, &buf[9]);
 
-           if (!struncmp(buf,"username=",9))
-               strcpy(rc_username,&buf[9]);
+               if (!strncasecmp(buf, "password=", 9))
+                       strcpy(rc_password, &buf[9]);
 
-           if (!struncmp(buf,"password=",9))
-               strcpy(rc_password,&buf[9]);
+               if (!strncasecmp(buf, "urlcmd=", 7))
+                       strcpy(rc_url_cmd, &buf[7]);
 
-           if (!struncmp(buf,"cmd=",4)) {
-               strcpy(buf,&buf[4]);
+               if (!strncasecmp(buf, "gotmailcmd=", 11))
+                       strcpy(rc_gotmail_cmd, &buf[11]);
 
-               cptr = (struct citcmd *) malloc (sizeof(struct citcmd));
-               
-               cptr->c_cmdnum = atoi (buf);
-               for (d=strlen(buf); d>=0; --d)
-                       if (buf[d]==',') b=d;
-               strcpy (buf, &buf[b+1]);
-
-               cptr->c_axlevel = atoi (buf);
-               for (d=strlen(buf); d>=0; --d)
-                       if (buf[d]==',') b=d;
-               strcpy (buf, &buf[b+1]);
-
-               for (a=0; a<5; ++a) cptr->c_keys[a][0] = 0;
-
-               a = 0;  b = 0;
-               buf[strlen(buf)+1] = 0;
-               while (strlen(buf) > 0) {
-                       b = strlen(buf);
-                       for (d=strlen(buf); d>=0; --d)
-                               if (buf[d]==',') b=d;
-                       strncpy(cptr->c_keys[a],buf,b);
-                       cptr->c_keys[a][b] = 0;
-                       if (buf[b]==',')
-                               strcpy(buf,&buf[b+1]);
-                       else
-                               strcpy(buf,"");
-                       ++a;
+               if (!strncasecmp(buf, "alternate_semantics=", 20)) {
+                       if (!strncasecmp(&buf[20], "yes", 3)) {
+                               rc_alt_semantics = 1;
+                       }
+                       else {
+                               rc_alt_semantics = 0;
+                       }
+               }
+
+               if (!strncasecmp(buf, "cmd=", 4)) {
+                       strcpy(buf, &buf[4]);
+
+                       cptr = (struct citcmd *) malloc(sizeof(struct citcmd));
+
+                       cptr->c_cmdnum = atoi(buf);
+                       for (d = strlen(buf); d >= 0; --d)
+                               if (buf[d] == ',')
+                                       b = d;
+                       strcpy(buf, &buf[b + 1]);
+
+                       cptr->c_axlevel = atoi(buf);
+                       for (d = strlen(buf); d >= 0; --d)
+                               if (buf[d] == ',')
+                                       b = d;
+                       strcpy(buf, &buf[b + 1]);
+
+                       for (a = 0; a < 5; ++a)
+                               cptr->c_keys[a][0] = 0;
+
+                       a = 0;
+                       b = 0;
+                       buf[strlen(buf) + 1] = 0;
+                       while (strlen(buf) > 0) {
+                               b = strlen(buf);
+                               for (d = strlen(buf); d >= 0; --d)
+                                       if (buf[d] == ',')
+                                               b = d;
+                               strncpy(cptr->c_keys[a], buf, b);
+                               cptr->c_keys[a][b] = 0;
+                               if (buf[b] == ',')
+                                       strcpy(buf, &buf[b + 1]);
+                               else
+                                       strcpy(buf, "");
+                               ++a;
                        }
 
-               cptr->next = NULL;
-               if (cmdlist == NULL) cmdlist = cptr;
-               else lastcmd->next = cptr;
-               lastcmd = cptr;
+                       cptr->next = NULL;
+                       if (cmdlist == NULL)
+                               cmdlist = cptr;
+                       else
+                               lastcmd->next = cptr;
+                       lastcmd = cptr;
                }
-           }
-       fclose(ccfile);
        }
+       fclose(ccfile);
+}
 
 
 
@@ -482,11 +962,11 @@ char keycmd(char *cmdstr)
 {
        int a;
 
-       for (a=0; a<strlen(cmdstr); ++a)
-               if (cmdstr[a]=='&')
-                       return(tolower(cmdstr[a+1]));
-       return(0);
-       }
+       for (a = 0; a < strlen(cmdstr); ++a)
+               if (cmdstr[a] == '&')
+                       return (tolower(cmdstr[a + 1]));
+       return (0);
+}
 
 
 /*
@@ -497,43 +977,38 @@ char *cmd_expand(char *strbuf, int mode)
 {
        int a;
        static char exp[64];
-       char buf[256];
-               
-       strcpy(exp,strbuf);
-       
-       for (a=0; a<strlen(exp); ++a) {
-               if (strbuf[a] == '&') {
+       char buf[1024];
 
-                   if (mode == 0) {
-                       strcpy(&exp[a],&exp[a+1]);
-                       }
-
-                   if (mode == 1) {
-                       exp[a] = '<';
-                       strcpy(buf,&exp[a+2]);
-                       exp[a+2] = '>';
-                       exp[a+3] = 0;
-                       strcat(exp,buf);
-                       }
+       strcpy(exp, strbuf);
 
-                   }
+       for (a = 0; a < strlen(exp); ++a) {
+               if (strbuf[a] == '&') {
 
-               if (!strncmp(&exp[a],"^r",2)) {
-                       strcpy(buf,exp);
-                       strcpy(&exp[a],room_name);
-                       strcat(exp,&buf[a+2]);
+                       if (mode == 0) {
+                               strcpy(&exp[a], &exp[a + 1]);
                        }
-
-               if (!strncmp(&exp[a],"^c",2)) {
-                       exp[a] = ',';
-                       strcpy(&exp[a+1],&exp[a+2]);
+                       if (mode == 1) {
+                               exp[a] = '<';
+                               strcpy(buf, &exp[a + 2]);
+                               exp[a + 2] = '>';
+                               exp[a + 3] = 0;
+                               strcat(exp, buf);
                        }
-
                }
-
-       return(exp);
+               if (!strncmp(&exp[a], "^r", 2)) {
+                       strcpy(buf, exp);
+                       strcpy(&exp[a], room_name);
+                       strcat(exp, &buf[a + 2]);
+               }
+               if (!strncmp(&exp[a], "^c", 2)) {
+                       exp[a] = ',';
+                       strcpy(&exp[a + 1], &exp[a + 2]);
+               }
        }
 
+       return (exp);
+}
+
 
 
 /*
@@ -546,16 +1021,18 @@ int cmdmatch(char *cmdbuf, struct citcmd *cptr, int ncomp)
        int cmdax;
 
        cmdax = 0;
-       if (is_room_aide) cmdax = 1;
-       if (axlevel >=6) cmdax = 2;
-
-       for (a=0; a<ncomp; ++a) {
-               if ( (tolower(cmdbuf[a]) != keycmd(cptr->c_keys[a]))
-                  || (cptr->c_axlevel > cmdax) )
-                       return(0);
-               }
-       return(1);
+       if (is_room_aide)
+               cmdax = 1;
+       if (axlevel >= 6)
+               cmdax = 2;
+
+       for (a = 0; a < ncomp; ++a) {
+               if ((tolower(cmdbuf[a]) != keycmd(cptr->c_keys[a]))
+                   || (cptr->c_axlevel > cmdax))
+                       return (0);
        }
+       return (1);
+}
 
 
 /*
@@ -565,13 +1042,14 @@ int requires_string(struct citcmd *cptr, int ncomp)
 {
        int a;
        char buf[64];
-       
-       strcpy(buf,cptr->c_keys[ncomp-1]);
-       for (a=0; a<strlen(buf); ++a) {
-               if (buf[a]==':') return(1);
-               }
-       return(0);
+
+       strcpy(buf, cptr->c_keys[ncomp - 1]);
+       for (a = 0; a < strlen(buf); ++a) {
+               if (buf[a] == ':')
+                       return (1);
        }
+       return (0);
+}
 
 
 /*
@@ -579,7 +1057,7 @@ int requires_string(struct citcmd *cptr, int ncomp)
  * This function returns an integer command number.  If the command prompts
  * for a string then it is placed in the supplied buffer.
  */
-int getcmd(char *argbuf)
+int getcmd(CtdlIPC *ipc, char *argbuf)
 {
        char cmdbuf[5];
        int cmdspaces[5];
@@ -590,127 +1068,144 @@ int getcmd(char *argbuf)
        int this_lazy_cmd;
        struct citcmd *cptr;
 
+       /*
+        * Starting a new command now, so set sigcaught to 0.  This variable
+        * is set to nonzero (usually NEXT_KEY or STOP_KEY) if a command has
+        * been interrupted by a keypress.
+        */
+       sigcaught = 0;
+
        /* Switch color support on or off if we're in user mode */
        if (rc_ansi_color == 3) {
-               if (userflags & US_COLOR) enable_color = 1;
-               else enable_color = 0;
-               }
-
+               if (userflags & US_COLOR)
+                       enable_color = 1;
+               else
+                       enable_color = 0;
+       }
        /* if we're running in idiot mode, display a cute little menu */
-       IFNEXPERT formout("mainmenu");
+       IFNEXPERT formout(ipc, "mainmenu");
 
-       print_express(); /* print express messages if there are any */
+       print_instant();
        strcpy(argbuf, "");
        cmdpos = 0;
-       for (a=0; a<5; ++a) cmdbuf[a]=0;
+       for (a = 0; a < 5; ++a)
+               cmdbuf[a] = 0;
        /* now the room prompt... */
        ok_to_interrupt = 1;
-       printf("\n%s%c ",room_name,room_prompt(room_flags));
-       fflush(stdout);
-       
-       while(1) {
+       color(BRIGHT_WHITE);
+       scr_printf("\n%s", room_name);
+       color(DIM_WHITE);
+       scr_printf("%c ", room_prompt(room_flags));
+       scr_flush();
+
+       while (1) {
                ch = inkey();
                ok_to_interrupt = 0;
 
                /* Handle the backspace key, but only if there's something
                 * to backspace over...
                 */
-               if ( (ch == 8) && (cmdpos > 0) ) {
-                       back(cmdspaces[cmdpos-1] + 1);
+               if ((ch == 8) && (cmdpos > 0)) {
+                       back(cmdspaces[cmdpos - 1] + 1);
                        cmdbuf[cmdpos] = 0;
                        --cmdpos;
-                       }
-
+               }
                /* Spacebar invokes "lazy traversal" commands */
-               if ( (ch == 32) && (cmdpos == 0) ) {
+               if ((ch == 32) && (cmdpos == 0)) {
                        this_lazy_cmd = next_lazy_cmd;
-                       if (this_lazy_cmd == 13) next_lazy_cmd = 5;
-                       if (this_lazy_cmd == 5) next_lazy_cmd = 13;
+                       if (this_lazy_cmd == 13)
+                               next_lazy_cmd = 5;
+                       if (this_lazy_cmd == 5)
+                               next_lazy_cmd = 13;
                        for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
                                if (cptr->c_cmdnum == this_lazy_cmd) {
-                                       for (a=0; a<5; ++a)
-                                           if (cptr->c_keys[a][0] != 0)
-                                               printf("%s ", cmd_expand(
-                                                       cptr->c_keys[a], 0));
-                                       printf("\n");
-                                       return(this_lazy_cmd);
-                                       }
+                                       for (a = 0; a < 5; ++a)
+                                               if (cptr->c_keys[a][0] != 0)
+                                                       scr_printf("%s ", cmd_expand(
+                                                                                       cptr->c_keys[a], 0));
+                                       scr_printf("\n");
+                                       return (this_lazy_cmd);
                                }
-                       printf("\n");
-                       return(this_lazy_cmd);
                        }
-
+                       scr_printf("\n");
+                       return (this_lazy_cmd);
+               }
                /* Otherwise, process the command */
                cmdbuf[cmdpos] = tolower(ch);
 
                for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
-                       if (cmdmatch(cmdbuf,cptr,cmdpos+1)) {
-                               
-                               printf("%s",cmd_expand(cptr->c_keys[cmdpos],0));
+                       if (cmdmatch(cmdbuf, cptr, cmdpos + 1)) {
+
+                               scr_printf("%s", cmd_expand(cptr->c_keys[cmdpos], 0));
                                cmdspaces[cmdpos] = strlen(
-                                       cmd_expand(cptr->c_keys[cmdpos],0) );
-                               if (cmdpos<4) 
-                                       if ((cptr->c_keys[cmdpos+1]) != 0)
-                                               putc(' ',stdout);
+                                   cmd_expand(cptr->c_keys[cmdpos], 0));
+                               if (cmdpos < 4)
+                                       if ((cptr->c_keys[cmdpos + 1]) != 0)
+                                               scr_putc(' ');
                                ++cmdpos;
-                               }
                        }
+               }
 
                for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
-                       if (cmdmatch(cmdbuf,cptr,5)) {
+                       if (cmdmatch(cmdbuf, cptr, 5)) {
                                /* We've found our command. */
-                               if (requires_string(cptr,cmdpos)) {
-                                       getline(argbuf,32);
-                                       }
-                               else {
-                                       printf("\n");
-                                       }
+                               if (requires_string(cptr, cmdpos)) {
+                                       getline(argbuf, 32);
+                               } else {
+                                       scr_printf("\n");
+                               }
 
                                /* If this command is one that changes rooms,
                                 * then the next lazy-command (space bar)
                                 * should be "read new" instead of "goto"
                                 */
-                               if ((cptr->c_cmdnum==5)
-                                       ||(cptr->c_cmdnum==6)
-                                       ||(cptr->c_cmdnum==47)
-                                       ||(cptr->c_cmdnum==52)
-                                       ||(cptr->c_cmdnum==16)
-                                       ||(cptr->c_cmdnum==20))
-                                               next_lazy_cmd = 13;
+                               if ((cptr->c_cmdnum == 5)
+                                   || (cptr->c_cmdnum == 6)
+                                   || (cptr->c_cmdnum == 47)
+                                   || (cptr->c_cmdnum == 52)
+                                   || (cptr->c_cmdnum == 16)
+                                   || (cptr->c_cmdnum == 20))
+                                       next_lazy_cmd = 13;
+
+                               /* If this command is "read new"
+                                * then the next lazy-command (space bar)
+                                * should be "goto"
+                                */
+                               if (cptr->c_cmdnum == 13)
+                                       next_lazy_cmd = 5;
 
-                               return(cptr->c_cmdnum);
+                               return (cptr->c_cmdnum);
 
-                               }
                        }
+               }
 
                if (ch == '?') {
-                       printf("\rOne of ...                         \n");
+                       pprintf("\rOne of ...                         \n");
                        for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
-                           if (cmdmatch(cmdbuf,cptr,cmdpos)) {
-                               for (a=0; a<5; ++a) {
-                                   printf("%s ",cmd_expand(cptr->c_keys[a],1));
-                                   }
-                               printf("\n");
+                               if (cmdmatch(cmdbuf, cptr, cmdpos)) {
+                                       for (a = 0; a < 5; ++a) {
+                                               pprintf("%s ", cmd_expand(cptr->c_keys[a], 1));
+                                       }
+                                       pprintf("\n");
                                }
-                           }
+                       }
 
-                       printf("\n%s%c ",room_name,room_prompt(room_flags));
+                       pprintf("\n%s%c ", room_name, room_prompt(room_flags));
                        got = 0;
                        for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
-                           if ((got==0)&&(cmdmatch(cmdbuf,cptr,cmdpos))) {
-                               for (a=0; a<cmdpos; ++a) {
-                                   printf("%s ",
-                                       cmd_expand(cptr->c_keys[a],0));
-                                   }
-                               got = 1;
+                               if ((got == 0) && (cmdmatch(cmdbuf, cptr, cmdpos))) {
+                                       for (a = 0; a < cmdpos; ++a) {
+                                               pprintf("%s ",
+                                                      cmd_expand(cptr->c_keys[a], 0));
+                                       }
+                                       got = 1;
                                }
-                           }
                        }
-
                }
-
        }
 
+}
+
 
 
 
@@ -718,14 +1213,13 @@ int getcmd(char *argbuf)
 /*
  * set tty modes.  commands are:
  * 
- * 0 - set to bbs mode, intr/quit disabled
- * 1 - set to bbs mode, intr/quit enabled
+ * 01- set to Citadel mode
  * 2 - save current settings for later restoral
  * 3 - restore saved settings
  */
 #ifdef HAVE_TERMIOS_H
-void sttybbs(int cmd)          /* SysV version of sttybbs() */
-         {
+void stty_ctdl(int cmd)
+{                              /* SysV version of stty_ctdl() */
        struct termios live;
        static struct termios saved_settings;
        static int last_cmd = 0;
@@ -735,185 +1229,244 @@ void sttybbs(int cmd)          /* SysV version of sttybbs() */
        else
                last_cmd = cmd;
 
-       if ( (cmd == 0) || (cmd == 1) ) {
-               tcgetattr(0,&live);
-               live.c_iflag=ISTRIP|IXON|IXANY;
-               live.c_oflag=OPOST|ONLCR;
-               live.c_lflag=ISIG|NOFLSH;
-
-               if (cmd==SB_YES_INTR) {
-                       live.c_cc[VINTR]=NEXT_KEY;
-                       live.c_cc[VQUIT]=STOP_KEY;
-                       signal(SIGINT,*sighandler);
-                       signal(SIGQUIT,*sighandler);
-                       }
-               else {
-                       signal(SIGINT,SIG_IGN);
-                       signal(SIGQUIT,SIG_IGN);
-                       live.c_cc[VINTR]=(-1);
-                       live.c_cc[VQUIT]=(-1);
-                       }
+       if ((cmd == 0) || (cmd == 1)) {
+               tcgetattr(0, &live);
+               live.c_iflag = ISTRIP | IXON | IXANY;
+               live.c_oflag = OPOST | ONLCR;
+               live.c_lflag = ISIG | NOFLSH;
+
+               live.c_cc[VINTR] = 0;
+               live.c_cc[VQUIT] = 0;
+
+#ifdef hpux
+               live.c_cc[VMIN] = 0;
+               live.c_cc[VTIME] = 0;
+#endif
 
                /* do we even need this stuff anymore? */
                /* live.c_line=0; */
-               live.c_cc[VERASE]=8;
-               live.c_cc[VKILL]=24;
-               live.c_cc[VEOF]=1;
-               live.c_cc[VEOL]=255;
-               live.c_cc[VEOL2]=0;
-               live.c_cc[VSTART]=0;
-               tcsetattr(0,TCSADRAIN,&live);
-               }
+               live.c_cc[VERASE] = 8;
+               live.c_cc[VKILL] = 24;
+               live.c_cc[VEOF] = 1;
+               live.c_cc[VEOL] = 255;
+               live.c_cc[VEOL2] = 0;
+               live.c_cc[VSTART] = 0;
+               tcsetattr(0, TCSADRAIN, &live);
+       }
        if (cmd == 2) {
-               tcgetattr(0,&saved_settings);
-               }
+               tcgetattr(0, &saved_settings);
+       }
        if (cmd == 3) {
-               tcsetattr(0,TCSADRAIN,&saved_settings);
-               }
+               tcsetattr(0, TCSADRAIN, &saved_settings);
        }
+
+}
 #else
-void sttybbs(int cmd)          /* BSD version of sttybbs() */
-{
+void stty_ctdl(int cmd)
+{                              /* BSD version of stty_ctdl() */
        struct sgttyb live;
        static struct sgttyb saved_settings;
+       static int last_cmd = 0;
 
-       if ( (cmd == 0) || (cmd == 1) ) {
-               gtty(0,&live);
+       if (cmd == SB_LAST)
+               cmd = last_cmd;
+       else
+               last_cmd = cmd;
+
+       if ((cmd == 0) || (cmd == 1)) {
+               gtty(0, &live);
                live.sg_flags |= CBREAK;
                live.sg_flags |= CRMOD;
                live.sg_flags |= NL1;
                live.sg_flags &= ~ECHO;
-               if (cmd==1) live.sg_flags |= NOFLSH;
-               stty(0,&live);
-               }
+               if (cmd == 1)
+                       live.sg_flags |= NOFLSH;
+               stty(0, &live);
+       }
        if (cmd == 2) {
-               gtty(0,&saved_settings);
-               }
+               gtty(0, &saved_settings);
+       }
        if (cmd == 3) {
-               stty(0,&saved_settings);
-               }
+               stty(0, &saved_settings);
        }
+}
 #endif
 
 
 /*
  * display_help()  -  help file viewer
  */
-void display_help(char *name)
+void display_help(CtdlIPC *ipc, char *name)
 {
-       formout(name);
-       }
+       formout(ipc, name);
+}
 
 
 /*
- * fmout()  -  Citadel text formatter and paginator
+ * fmout() - Citadel text formatter and paginator
  */
-int fmout(int width, FILE *fp, char pagin, int height, int starting_lp, char subst)
-                       /* screen width to use */
-                       /* file to read from, or NULL to read from server */
-                       /* nonzero if we should use the paginator */
-                       /* screen height to use */
-                       /* starting value for lines_printed, -1 for global */
-                       /* nonzero if we should use hypertext mode */
-       {
-       int a,b,c,d,old;
-       int real = (-1);
-       char aaa[140];
-       char buffer[512];
-       int eof_flag = 0;
-
-       if (starting_lp >= 0) { 
-               lines_printed = starting_lp;
+int fmout(
+       int width,      /* screen width to use */
+       FILE *fpin,     /* file to read from, or NULL to format given text */
+       char *text,     /* text to be formatted (when fpin is NULL */
+       FILE *fpout,    /* file to write to, or NULL to write to screen */
+       char pagin,     /* nonzero if we should use the paginator */
+       int height,     /* screen height to use */
+       int starting_lp,/* starting value for lines_printed, -1 for global */
+       int subst)      /* nonzero if we should use hypertext mode */
+{
+       char *buffer = NULL;    /* The current message */
+       char *word = NULL;      /* What we are about to actually print */
+       char *e;                /* Pointer to position in text */
+       char old = 0;           /* The previous character */
+       int column = 0;         /* Current column */
+       size_t i;               /* Generic counter */
+
+       /* Space for a single word, which can be at most screenwidth */
+       word = (char *)calloc(1, width);
+       if (!word) {
+               err_printf("Can't alloc memory to print message: %s!\n",
+                               strerror(errno));
+               logoff(NULL, 3);
+       }
+
+       /* Read the entire message body into memory */
+       if (fpin) {
+               buffer = load_message_from_file(fpin);
+               if (!buffer) {
+                       err_printf("Can't print message: %s!\n",
+                                       strerror(errno));
+                       logoff(NULL, 3);
                }
-       strcpy(aaa,""); old=255;
-       strcpy(buffer,"");
-       c=1; /* c is the current pos */
+       } else {
+               buffer = text;
+       }
+       e = buffer;
 
-       sigcaught = 0;
-       sttybbs(1);
-
-FMTA:  while ( (eof_flag==0) && (strlen(buffer)<126) ) {
-               if (sigcaught) goto OOPS;
-               if (fp!=NULL) { /* read from file */
-                       if (feof(fp)) eof_flag = 1;
-                       if (eof_flag==0) {
-                               a=getc(fp);
-                               buffer[strlen(buffer)+1] = 0;
-                               buffer[strlen(buffer)] = a;
+       if (starting_lp >= 0)
+               lines_printed = starting_lp;
+
+       /* Run the message body */
+       while (*e) {
+               /* Catch characters that shouldn't be there at all */
+               if (*e == '\r') {
+                       e++;
+                       continue;
+               }
+               /* First, are we looking at a newline? */
+               if (*e == '\n') {
+                       e++;
+                       if (*e == ' ') {        /* Paragraph */
+                               if (fpout) {
+                                       fprintf(fpout, "\n");
+                               } else {
+                                       scr_printf("\n");
+                                       ++lines_printed;
+                                       lines_printed = checkpagin(lines_printed, pagin, height);
                                }
+                               column = 0;
+                       } else if (old != ' ') {/* Don't print two spaces */
+                               if (fpout) {
+                                       fprintf(fpout, " ");
+                               } else {
+                                       scr_printf(" ");
+                               }
+                               column++;
                        }
-               else {          /* read from server */
-                       d=strlen(buffer);
-                       serv_gets(&buffer[d]);
-while ( (!isspace(buffer[d])) && (isspace(buffer[strlen(buffer)-1])) )
-       buffer[strlen(buffer)-1]=0;
-                       if (!strcmp(&buffer[d],"000")) {
-                               buffer[d] = 0;
-                               eof_flag = 1;
-                               while(isspace(buffer[strlen(buffer)-1]))
-                                       buffer[strlen(buffer)-1] = 0;
+                       old = '\n';
+                       continue;
+               }
+               /* Are we looking at a nonprintable? */
+               if ( (*e < 32) || (*e > 126) ) {
+                       e++;
+                       continue;
+               }
+               /* Or are we looking at a space? */
+               if (*e == ' ') {
+                       e++;
+                       if (column >= width - 1) {
+                               /* Are we in the rightmost column? */
+                               if (fpout) {
+                                       fprintf(fpout, "\n");
+                               } else {
+                                       scr_printf("\n");
+                                       ++lines_printed;
+                                       lines_printed = checkpagin(lines_printed, pagin, height);
                                }
-                       d=strlen(buffer);
-                       buffer[d] = 10;
-                       buffer[d+1] = 0;
+                               column = 0;
+                       } else if (!(column == 0 && old == ' ')) {
+                               /* Eat only the first space on a line */
+                               if (fpout) {
+                                       fprintf(fpout, " ");
+                               } else {
+                                       scr_printf(" ");
+                               }
+                               column++;
                        }
+                       /* ONLY eat the FIRST space on a line */
+                       old = ' ';
+                       continue;
                }
-
-       buffer[strlen(buffer)+1] = 0;
-       a=buffer[0];
-       strcpy(buffer,&buffer[1]);
-       
-       old=real;
-       real=a;
-       if (a<=0) goto FMTEND;
-       
-       if ( ((a==13)||(a==10)) && (old!=13) && (old!=10) ) a=32;
-       if ( ((old==13)||(old==10)) && (isspace(real)) ) {
-               printf("\n");
-               ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,height);
-               c=1;
+               old = *e;
+
+               /* Read a word, slightly messy */
+               i = 0;
+               while (e[i]) {
+                       if (!isprint(e[i]) && !isspace(e[i]))
+                               e[i] = ' ';
+                       if (isspace(e[i]))
+                               break;
+                       i++;
                }
-       if (a>126) goto FMTA;
 
-       if (a>32) {
-       if ( ((strlen(aaa)+c)>(width-5)) && (strlen(aaa)>(width-5)) ) {
-               printf("\n%s",aaa); c=strlen(aaa); aaa[0]=0;
-               ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,height);
-               }
-           b=strlen(aaa); aaa[b]=a; aaa[b+1]=0;
-           }
-       if (a==32) {
-               if ((strlen(aaa)+c)>(width-5)) { 
-                       c=1;
-                       printf("\n");
-                       ++lines_printed;
-                       lines_printed = checkpagin(lines_printed,pagin,height);
+               /* We should never see these, but... slightly messy */
+               if (e[i] == '\t' || e[i] == '\f' || e[i] == '\v')
+                       e[i] = ' ';
+
+               /* Break up really long words */
+               /* TODO: auto-hyphenation someday? */
+               if (i >= width) 
+                       i = width - 1;
+               strncpy(word, e, i);
+               word[i] = 0;
+
+               /* Decide where to print the word */
+               if (column + i >= width) {
+                       /* Wrap to the next line */
+                       if (fpout) {
+                               fprintf(fpout, "\n");
+                       } else {
+                               scr_printf("\n");
+                               ++lines_printed;
+                               lines_printed = checkpagin(lines_printed, pagin, height);
                        }
-               printf("%s ",aaa); ++c; c=c+strlen(aaa);
-               strcpy(aaa,"");
-               goto FMTA;
+                       column = 0;
                }
-       if ((a==13)||(a==10)) {
-               printf("%s\n",aaa);
-               c=1;
-               ++lines_printed;
-               lines_printed = checkpagin(lines_printed,pagin,height);
-               strcpy(aaa,"");
-               goto FMTA;
+
+               /* Print the word */
+               if (fpout) {
+                       fprintf(fpout, "%s", word);
+               } else {
+                       scr_printf("%s", word);
                }
-       goto FMTA;
+               column += i;
+               e += i;         /* Start over with the whitepsace! */
+       }
+
+       free(word);
+       if (fpin)               /* We allocated this, remember? */
+               free(buffer);
 
-       /* signal caught; drain the server */
-OOPS:  do {
-               serv_gets(aaa);
-               } while(strcmp(aaa,"000"));
+       /* Is this necessary?  It makes the output kind of spacey. */
+       if (fpout) {
+               fprintf(fpout, "\n");
+       } else {
+               scr_printf("\n");
+               ++lines_printed;
+               lines_printed = checkpagin(lines_printed, pagin, height);
+       }
 
-FMTEND:        printf("\n");
-       ++lines_printed;
-       lines_printed = checkpagin(lines_printed,pagin,height);
-       return(sigcaught);
+       return sigcaught;
 }
 
 
@@ -922,78 +1475,194 @@ FMTEND: printf("\n");
  */
 void color(int colornum)
 {
-       if (enable_color) {
-               printf("\033[3%dm", colornum);
-               fflush(stdout);
-               }
-       }
+       static int hold_color;
+       static int current_color;
 
-void cls(int colornum) {
-       if (enable_color) {
-               printf("\033[4%dm\033[2J\033[H", colornum);
+       if (colornum == COLOR_PUSH) {
+               hold_color = current_color;
+               return;
+       }
 
-               printf("\033[1m");              /* bold colors */
-               /* printf("\033[0m"); */        /* non-bold colors */
+       if (colornum == COLOR_POP) {
+               color(hold_color);
+               return;
+       }
 
+       current_color = colornum;
+       if (enable_color) {
+#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
+               if (scr_color(colornum))
+                       return;
+#endif
+               /* When switching to dim white, actually output an 'original
+                * pair' sequence -- this looks better on black-on-white
+                * terminals. - Changed to ORIGINAL_PAIR as this actually
+                * wound up looking horrible on black-on-white terminals, not
+                * to mention transparent terminals.
+                */
+               if (colornum == ORIGINAL_PAIR)
+                       printf("\033[0;39;49m");
+               else
+                       printf("\033[%d;3%d;4%dm", 
+                                       (colornum & 8) ? 1 : 0,
+                                       (colornum & 7),
+                                       rc_color_use_bg);
+
+               scr_flush();
+       }
+}
 
-               fflush(stdout);
-               }
+void cls(int colornum)
+{
+       if (enable_color) {
+               printf("\033[4%dm\033[2J\033[H\033[0m",
+                               colornum ? colornum : rc_color_use_bg);
+               scr_flush();
        }
+}
 
 
 /*
  * Detect whether ANSI color is available (answerback)
  */
-void send_ansi_detect(void) {
+void send_ansi_detect(void)
+{
        if (rc_ansi_color == 2) {
                printf("\033[c");
-               fflush(stdout);
+               scr_flush();
                time(&AnsiDetect);
-               }
        }
+}
 
-void look_for_ansi(void) {
-        fd_set rfds;
-        struct timeval tv;
+void look_for_ansi(void)
+{
+       fd_set rfds;
+       struct timeval tv;
        char abuf[512];
        time_t now;
        int a;
 
        if (rc_ansi_color == 0) {
                enable_color = 0;
-               }
-       else if (rc_ansi_color == 1) {
+       } else if (rc_ansi_color == 1) {
                enable_color = 1;
-               }
-       else if (rc_ansi_color == 2) {
+       } else if (rc_ansi_color == 2) {
 
                /* otherwise, do the auto-detect */
 
                strcpy(abuf, "");
 
                time(&now);
-               if ( (now - AnsiDetect) < 2 ) sleep(1);
+               if ((now - AnsiDetect) < 2)
+                       sleep(1);
 
                do {
                        FD_ZERO(&rfds);
-                       FD_SET(0,&rfds);
+                       FD_SET(0, &rfds);
                        tv.tv_sec = 0;
                        tv.tv_usec = 1;
 
                        select(1, &rfds, NULL, NULL, &tv);
                        if (FD_ISSET(0, &rfds)) {
-                               abuf[strlen(abuf)+1] = 0;
+                               abuf[strlen(abuf) + 1] = 0;
                                read(0, &abuf[strlen(abuf)], 1);
-                               }
-       
-                       } while (FD_ISSET(0, &rfds));
-       
-               for (a=0; a<strlen(abuf); ++a) {
-                       if ( (abuf[a] == 27) && (abuf[a+1] == '[')
-                       && (abuf[a+2] == '?') ) {
+                       }
+               } while (FD_ISSET(0, &rfds));
+
+               for (a = 0; a < strlen(abuf); ++a) {
+                       if ((abuf[a] == 27) && (abuf[a + 1] == '[')
+                           && (abuf[a + 2] == '?')) {
                                enable_color = 1;
+                       }
+               }
+       }
+}
+
+
+/*
+ * Display key options (highlight hotkeys inside angle brackets)
+ */
+void keyopt(char *buf) {
+       int i;
+
+       color(DIM_WHITE);
+       for (i=0; i<strlen(buf); ++i) {
+               if (buf[i]=='<') {
+                       scr_putc(buf[i]);
+                       color(BRIGHT_MAGENTA);
+               } else {
+                       if (buf[i]=='>') {
+                               color(DIM_WHITE);
+                       }
+                       scr_putc(buf[i]);
+               }
+       }
+       color(DIM_WHITE);
+}
+
+
+
+/*
+ * Present a key-menu line choice type of thing
+ */
+char keymenu(char *menuprompt, char *menustring) {
+       int i, c, a;
+       int choices;
+       int do_prompt = 0;
+       char buf[1024];
+       int ch;
+       int display_prompt = 1;
+
+       choices = num_tokens(menustring, '|');
+
+       if (menuprompt != NULL) do_prompt = 1;
+       if (menuprompt != NULL) if (strlen(menuprompt)==0) do_prompt = 0;
+
+       while (1) {
+               if (display_prompt) {
+                       if (do_prompt) {
+                               scr_printf("%s ", menuprompt);
+                       } 
+                       else {
+                               for (i=0; i<choices; ++i) {
+                                       extract_token(buf, menustring, i, '|', sizeof buf);
+                                       keyopt(buf);
+                                       scr_printf(" ");
                                }
                        }
+                       scr_printf("-> ");
+                       display_prompt = 0;
+               }
+               ch = lkey();
+       
+               if ( (do_prompt) && (ch=='?') ) {
+                       scr_printf("\rOne of...                               ");
+                       scr_printf("                                      \n");
+                       for (i=0; i<choices; ++i) {
+                               extract_token(buf, menustring, i, '|', sizeof buf);
+                               scr_printf("   ");
+                               keyopt(buf);
+                               scr_printf("\n");
+                       }
+                       scr_printf("\n");
+                       display_prompt = 1;
                }
 
+               for (i=0; i<choices; ++i) {
+                       extract_token(buf, menustring, i, '|', sizeof buf);
+                       for (c=1; c<strlen(buf); ++c) {
+                               if ( (ch == tolower(buf[c]))
+                                  && (buf[c-1]=='<')
+                                  && (buf[c+1]=='>') ) {
+                                       for (a=0; a<strlen(buf); ++a) {
+                                               if ( (a!=(c-1)) && (a!=(c+1))) {
+                                                       scr_putc(buf[a]);
+                                               }
+                                       }
+                                       scr_printf("\n");
+                                       return ch;
+                               }
+                       }
+               }
        }
+}