* Implemented "lazy mode" traversal - pressing the space bar will do

          <N>ext messsage, <G>oto next room, or read <N>ew as appropriate.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cfb2f1198f3bcfa98e1b17c7a63d60ca62821249..8148c70dbda7e1de7ec743cc31b1d243b5045f03 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct  9 13:22:37 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Implemented "lazy mode" traversal - pressing the space bar will do
+         <N>ext messsage, <G>oto next room, or read <N>ew as appropriate.
+
 Thu Oct  8 17:13:27 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * messages.c, citadel.rc: added the ability to display message numbers
          in the header when reading messages.  I think this is butt ugly, but

diff --git a/citadel/commands.c b/citadel/commands.c
index a99d8be7eb1eb9e3fa43a87e716206c05ebad351..aad829e6656cd088ec02c3c8045691dc0c5d95a7 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -53,6 +53,7 @@ int rc_allow_attachments;
 int rc_display_message_numbers;
 
 char *gl_string;
+int next_lazy_cmd = 5;
 
 struct citcmd *cmdlist = NULL;
 
@@ -286,6 +287,7 @@ void load_command_set(void) {
        FILE *ccfile;
        char buf[256];
        struct citcmd *cptr;
+       struct citcmd *lastcmd = NULL;
        int a,d;
        int b = 0;
 
@@ -393,9 +395,10 @@ void load_command_set(void) {
                        ++a;
                        }
 
-               cptr->next = cmdlist;
-               cmdlist = cptr;
-
+               cptr->next = NULL;
+               if (cmdlist == NULL) cmdlist = cptr;
+               else lastcmd->next = cptr;
+               lastcmd = cptr;
                }
            }
        fclose(ccfile);
@@ -515,6 +518,7 @@ int getcmd(char *argbuf)
        int ch;
        int a;
        int got;
+       int this_lazy_cmd;
        struct citcmd *cptr;
 
        /* if we're running in idiot mode, display a cute little menu */
@@ -533,12 +537,35 @@ int getcmd(char *argbuf)
                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);
                        cmdbuf[cmdpos] = 0;
                        --cmdpos;
                        }
 
+               /* Spacebar invokes "lazy traversal" commands */
+               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;
+                       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);
+                                       }
+                               }
+                       printf("\n");
+                       return(this_lazy_cmd);
+                       }
+
+               /* Otherwise, process the command */
                cmdbuf[cmdpos] = tolower(ch);
 
                for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
@@ -556,13 +583,28 @@ int getcmd(char *argbuf)
 
                for (cptr = cmdlist; cptr != NULL; cptr = cptr->next) {
                        if (cmdmatch(cmdbuf,cptr,5)) {
+                               /* We've found our command. */
                                if (requires_string(cptr,cmdpos)) {
                                        getline(argbuf,32);
                                        }
                                else {
                                        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;
+
                                return(cptr->c_cmdnum);
+
                                }
                        }
 

diff --git a/citadel/messages.c b/citadel/messages.c
index 5c102c6aecb1ca2471ed60d918bd0a7ad378a99f..1acee11515096fb69f29cffa3d3fb0d005f6298f 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -1041,6 +1041,7 @@ RMSGREAD: fflush(stdout);
                                lines_printed = 2;
                                e=(inkey()&127); e=tolower(e);
 /* return key same as <N> */   if (e==13) e='n';
+/* space key same as <N> */    if (e==32) e='n';
 /* del/move for aides only */  if (!is_room_aide) if ((e=='d')||(e=='m')) e=0;
 /* print only if available */  if ((e=='p')&&(strlen(printcmd)==0)) e=0;
 /* can't move from Mail> */    if ((e=='m')&&(is_mail==1)) e=0;