User Biography display: remove call, do through templates directly.

[citadel.git] / citadel / textclient / commands.c

diff --git a/citadel/textclient/commands.c b/citadel/textclient/commands.c
index 732080658cf5b108794f6e0a4d781b97842549a2..426849a95f3091f61eaaa7c2994163b2819d3287 100644 (file)
--- a/citadel/textclient/commands.c
+++ b/citadel/textclient/commands.c
@@ -92,7 +92,6 @@ char rc_url_cmd[SIZ];
 char rc_open_cmd[SIZ];
 char rc_gotmail_cmd[SIZ];
 
-char *gl_string;
 int next_lazy_cmd = 5;
 
 extern int screenwidth, screenheight;
@@ -487,91 +486,86 @@ int yesno_d(int d)
 
 
 
-/* Gets a line from the terminal */
-/* string == Pointer to string buffer */
-/* lim == Maximum length - if negative, no-show */
-void ctdl_getline(char *string, int lim) 
+/*
+ * Function to read a line of text from the terminal.
+ *
+ * string              Pointer to string buffer
+ * lim                 Maximum length
+ * noshow              Echo asterisks instead of keystrokes?
+ * bs                  Allow backspacing out of the prompt? (returns -1 if this happens)
+ *
+ * returns: string length
+ */
+int ctdl_getline(char *string, int lim, int noshow, int bs)
 {
-       int a, b;
-       char flag = 0;
+       int pos = strlen(string);
+       int ch;
 
-       if (lim < 0) {
-               lim = (0 - lim);
-               flag = 1;
-       }
-       strcpy(string, "");
-       gl_string = string;
        async_ka_start();
-
-GLA:   a = inkey();
-       /* a = (a & 127); ** commented out because it isn't just an ASCII world anymore */
-       if ((a == 8 || a == 23) && (IsEmptyStr(string)))
-               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 (noshow && !IsEmptyStr(string)) {
+               int num_stars = strlen(string);
+               while (num_stars--) {
+                       scr_putc('*');
+               }
        }
-       if ((a == 23) && (string[0] != 0)) {
-               do {
-                       string[strlen(string) - 1] = 0;
-                       scr_putc(8); scr_putc(32); scr_putc(8);
-               } while (!IsEmptyStr(string) && string[strlen(string) - 1] != ' ');
-               goto GLA;
+       else {
+               scr_printf("%s", string);
        }
-       if ((a == 10)) {
-               scr_putc(10);
-               async_ka_end();
-               return;
+
+       while(1) {
+               ch = inkey();
+
+               if ((ch == 8)  && (pos > 0)) {                          /* backspace */
+                       --pos;
+                       scr_putc(8); scr_putc(32); scr_putc(8);
+               }
+
+               else if ((ch == 8) && (pos == 0) && (bs)) {             /* backspace out of the prompt */
+                       async_ka_end();
+                       return(-1);
+               }
+
+               else if ((ch == 23) && (pos > 0)) {                     /* Ctrl-W deletes a word */
+                       while ((pos > 0) && !isspace(string[pos])) {
+                               --pos;
+                               scr_putc(8); scr_putc(32); scr_putc(8);
+                       }
+                       while ((pos > 0) && !isspace(string[pos-1])) {
+                               --pos;
+                               scr_putc(8); scr_putc(32); scr_putc(8);
+                       }
+               }
+
+               else if (ch == 10) {                                    /* return */
+                       string[pos] = 0;
+                       scr_printf("\n");
+                       async_ka_end();
+                       return(pos);
+               }
+
+               else if (isprint(ch)) {                                 /* payload characters */
+                       scr_putc((noshow ? '*' : ch));
+                       string[pos] = ch;
+                       ++pos;
+               }
        }
-       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;
 }
 
 
-/*
- * strprompt()  -  prompt for a string, print the existing value and
- *                 allow the user to press return to keep it...
+/* 
+ * newprompt()         prompt for a string, print the existing value, and
+ *                     allow the user to press return to keep it...
+ *                     If len is negative, pass the "noshow" flag to ctdl_getline()
  */
 void strprompt(char *prompt, char *str, int len)
 {
-       int i;
-       char buf[128];
-
        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; !IsEmptyStr(&str[i]); ++i) {
-                       scr_printf("*");
-               }
-       }
-
-       color(DIM_MAGENTA);
-       scr_printf("]");
+       scr_printf("%s", prompt);
        color(DIM_WHITE);
        scr_printf(": ");
        color(BRIGHT_CYAN);
-       ctdl_getline(buf, len);
-       if (buf[0] != 0)
-               strcpy(str, buf);
+       ctdl_getline(str, abs(len), (len<0), 0);
        color(DIM_WHITE);
 }
 
@@ -626,15 +620,17 @@ int intprompt(char *prompt, int ival, int imin, int imax)
 }
 
 /* 
- * newprompt()  -  prompt for a string with no existing value
- *                 (clears out string buffer first)
+ * newprompt()         prompt for a string with no existing value
+ *                     (clears out string buffer first)
+ *                     If len is negative, pass the "noshow" flag to ctdl_getline()
  */
 void newprompt(char *prompt, char *str, int len)
 {
+       str[0] = 0;
        color(BRIGHT_MAGENTA);
        scr_printf("%s", prompt);
        color(DIM_MAGENTA);
-       ctdl_getline(str, len);
+       ctdl_getline(str, abs(len), (len<0), 0);
        color(DIM_WHITE);
 }
 
@@ -1049,7 +1045,8 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
                        if (cmdmatch(cmdbuf, cptr, 5)) {
                                /* We've found our command. */
                                if (requires_string(cptr, cmdpos)) {
-                                       ctdl_getline(argbuf, 64);
+                                       argbuf[0] = 0;
+                                       ctdl_getline(argbuf, 64, 0, 0);
                                } else {
                                        scr_printf("\n");
                                }