read on closed socketpair returns eof

[unix-history] / usr / src / usr.bin / window / cmd2.c

diff --git a/usr/src/usr.bin/window/cmd2.c b/usr/src/usr.bin/window/cmd2.c
index 4e32e14..7cac446 100644 (file)
--- a/usr/src/usr.bin/window/cmd2.c
+++ b/usr/src/usr.bin/window/cmd2.c
@@ -1,221 +1,102 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd2.c      3.5 83/08/16";
+static char sccsid[] = "@(#)cmd2.c     3.30 %G%";

 #endif
 
 #include "defs.h"
 
 #endif
 
 #include "defs.h"
 

-struct ww *openiwin();
+char *help_shortcmd[] = {
+       "{1-9}   Select window {1-9} and return to conversation mode.",
+       "%{1-9}  Select window {1-9} but stay in command mode.",
+       "escape  Return to conversation mode without changing window.",
+       "^^      Return to conversation mode and change to previous window.",
+       "c{1-9}  Close window {1-9}.",
+       "w       Open a new window.",
+       "m{1-9}  Move window {1-9}.",
+       "M{1-9}  Move window {1-9} to previous position.",
+       "{^Y^E}  Scroll {up, down} one line",
+       "{^U^D}  Scroll {up, down} half a window.",
+       "{^B^F}  Scroll {up, down} a full window.",
+       "{hjkl}  Move cursor {left, down, up, right}.",
+       "^L      Redraw screen.",
+       "^Z      Suspend.",
+       "q       Quit.",
+       0
+};
+char *help_longcmd[] = {
+       ":%{1-9}               Select window {1-9}.",
+       ":close {1-9} . . .    Close windows.",
+       ":close all            Close all windows.",
+       ":cursor modes         Set the cursor modes.",
+       ":escape C             Set escape character to C.",
+       ":foreground {1-9} [off]",
+       "                      Make {1-9} a foreground window.",
+       ":label {1-9} string   Label window {1-9}.",
+       ":list                 List all windows.",
+       ":nline lines          Set the default number of lines",
+       "                      in window text buffers.",
+       ":shell string         Set default shell program to ``string.''",
+       ":source filename      Execute commands in ``filename.''",
+       ":terse [off]          Turn on (or off) terse mode.",
+       ":unset variable       Deallocate ``variable''.",
+       ":variable             List all variables.",
+       ":window row col nrow ncol [nline label pty frame shell]",
+       "                      Open a window at ``row'', ``col''",
+       "                      of size ``nrow'', ``ncol'',",
+       "                      with ``nline'', and ``label''.",
+       ":write {1-9} string . . .",
+       "                      Write strings to window {1-9}.",
+       0
+};

 
 c_help()
 {
        register struct ww *w;
 
 
 c_help()
 {
        register struct ww *w;
 

-       if ((w = openiwin(wwnrow - 2, "Help")) == 0) {
-               error("Can't open help window.");
+       if ((w = openiwin(wwnrow - 3, "Help")) == 0) {
+               error("Can't open help window: %s.", wwerror());

                return;
        }
                return;
        }

-       (void) wwprintf(w, "The escape character is %s, which gets you into command mode.\n\n",
-               unctrl(escapec));
-       (void) wwprintf(w, "Short commands:\n\n");
-       (void) wwprintf(w, "{1-9}   Select window {1-9} and return to conversation mode.\n");
-       (void) wwprintf(w, "%%{1-9}  Select window {1-9}.\n");
-       (void) wwprintf(w, "c{1-9}  Close window {1-9}.\n");
-       (void) wwprintf(w, "C       Close all windows.\n");
-       (void) wwprintf(w, "S       Show all windows in sequence.\n");
-       (void) wwprintf(w, "L       List all windows with their labels.\n");
-       (void) wwprintf(w, "w       Open a new window.\n");
-       (void) wwprintf(w, "[^U^D]  Scroll [up, down] half a window.\n");
-       (void) wwprintf(w, "[^B^F]  Scroll [up, down] a full window.\n");
-       (void) wwprintf(w, "[hjkl]  Move cursor [left, down, up, right].\n");
-       (void) wwprintf(w, "escape  Exit command mode.\n");
-       (void) wwprintf(w, "^L      Redraw screen.\n");
-       (void) wwprintf(w, "^Z      Suspend.\n");
-       (void) wwprintf(w, ".       Quit.\n");
-       waitnl(w);
-       (void) wwprintf(w, "Long commands:\n\n");
-       (void) wwprintf(w, ":terse [off]            Turn on (or off) terse mode.\n");
-       (void) wwprintf(w, ":refresh {1-9} [off]    Turn on (or off) refresh after every newline\n");
-       (void) wwprintf(w, "                        for window {1-9}.\n");
-       (void) wwprintf(w, ":label {1-9} string     Label window {1-9}.\n");
-       (void) wwprintf(w, ":escape C               Set escape character to C.\n");
-       (void) wwprintf(w, ":%%{1-9}                 Select window {1-9}.\n");
-       (void) wwprintf(w, ":window r c nr nc       Open a window at row r column c\n");
-       (void) wwprintf(w, "                        with nr rows and nc colomns\n");
-       (void) wwprintf(w, ":source filename        Execute the commands in `filename'.\n");
-       waitnl(w);
+       wwprintf(w, "The escape character is %c, which gets you into command mode.\n\n",
+               escapec);
+       if (help_print(w, "Short commands", help_shortcmd) >= 0)
+               (void) help_print(w, "Long commands", help_longcmd);

        closeiwin(w);
 }
 
        closeiwin(w);
 }
 

-char *strtime();
-
-c_time(flag)
-{
-       register struct ww *w;
-       struct rusage rusage;
-       struct timeval timeval;
-       struct timezone timezone;
-
-       if ((w = openiwin(6, "Timing and Resource Usage")) == 0) {
-               error("Can't open time window.");
-               return;
-       }
-
-       (void) gettimeofday(&timeval, &timezone);
-       timeval.tv_sec -= starttime.tv_sec;
-       if ((timeval.tv_usec -= starttime.tv_usec) < 0) {
-               timeval.tv_sec--;
-               timeval.tv_usec += 1000000;
-       }
-       (void) getrusage(flag, &rusage);
-
-       (void) wwprintf(w, "time\t\tutime\t\tstime\t\tmaxrss\tixrss\tidrss\tisrss\n");
-       (void) wwprintf(w, "%-16s", strtime(&timeval));
-       (void) wwprintf(w, "%-16s", strtime(&rusage.ru_utime));
-       (void) wwprintf(w, "%-16s", strtime(&rusage.ru_stime));
-       (void) wwprintf(w, "%D\t%D\t%D\t%D\n",
-               rusage.ru_maxrss, rusage.ru_ixrss,
-               rusage.ru_idrss, rusage.ru_isrss);
-       (void) wwprintf(w, "minflt\tmajflt\tnswap\tinblk\toublk\tmsgsnd\tmsgrcv\tnsigs\tnvcsw\tnivcsw\n");
-       (void) wwprintf(w, "%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\n",
-               rusage.ru_minflt, rusage.ru_majflt, rusage.ru_nswap,
-               rusage.ru_inblock, rusage.ru_oublock,
-               rusage.ru_msgsnd, rusage.ru_msgrcv, rusage.ru_nsignals,
-               rusage.ru_nvcsw, rusage.ru_nivcsw);
-
-       waitnl(w);
-       closeiwin(w);
-}
-
-char *
-strtime(t)
-register struct timeval *t;
-{
-       char fill = 0;
-       static char buf[20];
-       register char *p = buf;
-
-       if (t->tv_sec > 60*60) {
-               (void) sprintf(p, "%D:", t->tv_sec / (60*60));
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60*60;
-               fill++;
-       }
-       if (t->tv_sec > 60) {
-               (void) sprintf(p, fill ? "%02D:" : "%D:", t->tv_sec / 60);
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60;
-               fill++;
-       }
-       (void) sprintf(p, fill ? "%02D.%02d" : "%D.%02D",
-               t->tv_sec, t->tv_usec / 10000);
-       return buf;
-}
-
-c_stat()
-{
-       register struct ww *w;
-
-       if ((w = openiwin(6, "IO Statics")) == 0) {
-               error("Can't open statistics window.");
-               return;
-       }
-       (void) wwprintf(w, "nread\tnreadz\tnreade\tnreadc\tnwrite\tnwritec\tnupdate\tntouchd\tnmiss\n");
-       (void) wwprintf(w, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
-               nread, nreadz, nreade, nreadc, wwnwrite, wwnwritec,
-               wwnupdate, wwntouched, wwnmiss);
-       waitnl(w);
-       closeiwin(w);
-}
-
-c_list()
+help_print(w, name, list)
+register struct ww *w;
+char *name;
+register char **list;

 {
 {

-       register struct ww *w;
-       register i;
-       int n;
-
-       for (n = 0, i = 0; i < NWINDOW; i++)
-               if (window[i] != 0)
-                       n++;
-       if ((w = openiwin(MAX(n, 1) + 2, "Active Windows")) == 0) {
-               error("Can't open listing window.");
-               return;
-       }
-       if (n == 0) {
-               (void) wwputs("No windows.\n", w);
-       } else {
-               for (i = 0; i < NWINDOW; i++) {
-                       if (window[i] == 0)
-                               continue;
-                       (void) wwprintf(w, "%c   %s\n", i + '1',
-                               window[i]->ww_label ? window[i]->ww_label
-                                       : "(No label)");
+       wwprintf(w, "%s:\n\n", name);
+       while (*list)
+               switch (more(w, 0)) {
+               case 0:
+                       wwputs(*list++, w);
+                       wwputc('\n', w);
+                       break;
+               case 1:
+                       wwprintf(w, "%s: (continued)\n\n", name);
+                       break;
+               case 2:
+                       return -1;

                }
                }

-       }
-       waitnl(w);
-       closeiwin(w);
+       return more(w, 1) == 2 ? -1 : 0;

 }
 
 c_quit()
 {
 }
 
 c_quit()
 {

-       if (terse)
-               wwadd(cmdwin, &wwhead);
-       (void) wwputs("Really quit [yn]? ", cmdwin);
+       char oldterse = terse;
+
+       setterse(0);
+       wwputs("Really quit [yn]? ", cmdwin);

        wwcurtowin(cmdwin);
        wwcurtowin(cmdwin);

-       while (bpeekc() < 0)
-               bread();
-       if (bgetc() == 'y') {
-               (void) wwputs("Yes", cmdwin);
+       while (wwpeekc() < 0)
+               wwiomux();
+       if (wwgetc() == 'y') {
+               wwputs("Yes", cmdwin);

                quit++;
        } else
                quit++;
        } else

-               (void) wwputs("\r\n", cmdwin);
-       if (terse && !quit)
-               wwdelete(cmdwin);
-}
-
-/*
- * Open an information window.
- */
-struct ww *
-openiwin(nrow, label)
-char *label;
-{
-       register struct ww *w;
-
-       if ((w = wwopen(0, nrow, wwncol, 2, 0, 0)) == 0)
-               return 0;
-       w->ww_mapnl = 1;
-       w->ww_hasframe = 1;
-       w->ww_id = -1;
-       w->ww_center = 1;
-       (void) setlabel(w, label);
-       wwadd(w, framewin);
-       reframe();
-       return w;
-}
-
-waitnl(w)
-register struct ww *w;
-{
-       if (w->ww_back != framewin) {
-               (void) wwputs("reframed", w);
-               wwdelete(w);
-               wwadd(w, framewin);
-               reframe();
-       }
-       (void) wwputs("\nType return to continue: ", w);
-       wwcurtowin(w);
-       while (bgetc() < 0)
-               bread();
-       (void) wwputs("\033E", w);              /* clear and home cursor */
-}
-
-closeiwin(w)
-struct ww *w;
-{
-       closewin(w);
-       reframe();
+               wwputc('\n', cmdwin);
+       setterse(!quit && oldterse);

 }
 }