projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added "more" command
[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 87fa23d..41600d5 100644 (file)
--- a/usr/src/usr.bin/window/cmd2.c
+++ b/usr/src/usr.bin/window/cmd2.c
@@ -1,48 +1,67 @@
 #ifndef lint
 #ifndef lint
-static char *sccsid = "@(#)cmd2.c      3.19 84/01/12";
+static char sccsid[] = "@(#)cmd2.c     3.33 %G%";
 #endif
 
 #endif
 
+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+
 #include "defs.h"
 
 char *help_shortcmd[] = {
 #include "defs.h"
 
 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",
-       "        and don't change the current window.",
-       "^^      Return to conversation mode",
-       "        and change to previously selected window.",
-       "c{1-9}  Close window {1-9}.",
-       "C       Close all windows.",
-       "S       Show all windows in sequence.",
-       "L       List all windows with their labels.",
-       "w       Open a new window.",
-       "m{1-9}  Move window {1-9}.",
-       "M{1-9}  Move window {1-9} to previous position.",
-       "v       List all variables.",
-       "{^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.",
+       "#       Select window # and return to conversation mode",
+       "%#      Select window # but stay in command mode",
+       "escape  Return to conversation mode without changing window",
+       "^^      Return to conversation mode and change to previous window",
+       "c#      Close window #",
+       "w       Open a new window",
+       "m#      Move window #",
+       "M#      Move window # to its previous position",
+       "s#      Change the size of window #",
+       "S#      Change window # to its previous size",
+       "^Y      Scroll up one line",
+       "^E      Scroll down one line",
+       "^U      Scroll up half a window",
+       "^D      Scroll down half a window",
+       "^B      Scroll up a full window",
+       "^F      Scroll down a full window",
+       "h       Move cursor left",
+       "j       Move cursor down",
+       "k       Move cursor up",
+       "l       Move cursor right",
+       "^S      Stop output in current window",
+       "^Q      Restart output in current window",
+       "^L      Redraw screen",
+       "^Z      Suspend",
+       "q       Quit",
+       ":       Enter a long command",
        0
 };
 char *help_longcmd[] = {
        0
 };
 char *help_longcmd[] = {
-       ":%{1-9}               Select window {1-9}.",
-       ":buffer lines         Set the default window buffer size.",
-       ":close {1-9}          Close window.",
-       ":cursor modes         Set the cursor modes.",
-       ":escape C             Set escape character to C.",
-       ":label {1-9} string   Label window {1-9}.",
-       ":source filename      Execute commands in ``filename''.",
-       ":terse [off]          Turn on (or off) terse mode.",
-       ":unset variable       Deallocate ``variable''.",
-       ":window row col nrow ncol [nline label]",
-       "                      Open a window at ``row'', ``col''",
-       "                      of size ``nrow'', ``ncol'',",
-       "                      with ``nline'', and ``label''.",
-       ":write {1-9} string   Write ``string'' to window {1-9}.",
+       ":alias name string ...  Make `name' an alias for `string ...'",
+       ":alias                  Show all aliases",
+       ":close # ...            Close windows",
+       ":close all              Close all windows",
+       ":cursor modes           Set the cursor modes",
+       ":echo # string ...      Print `string ...' in window #",
+       ":escape c               Set escape character to `c'",
+       ":foreground # flag      Make # a foreground window, if `flag' is true",
+       ":label # string         Set label of window # to `string'",
+       ":list                   List all open windows",
+       ":nline lines            Set default window buffer size to `lines'",
+       ":select #               Select window #",
+       ":shell string ...       Set default shell program to `string ...'",
+       ":source filename        Execute commands in `filename'",
+       ":terse flag             Set terse mode",
+       ":unalias name           Undefine `name' as an alias",
+       ":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' lines in the buffer, and `label'",
+       ":write # string ...     Write `string ...' to window # as input",
        0
 };
 
        0
 };
 
@@ -54,217 +73,47 @@ c_help()
                error("Can't open help window: %s.", wwerror());
                return;
        }
                error("Can't open help window: %s.", wwerror());
                return;
        }
-       (void) wwprintf(w, "The escape character is %s, which gets you into command mode.\n\n",
-               unctrl(escapec));
-       help_print(w, "Short commands", help_shortcmd);
-       help_print(w, "Long commands", help_longcmd);
+       wwprintf(w, "The escape character is %c.\n", escapec);
+       wwprintf(w, "(# represents one of the digits from 1 to 9.)\n\n");
+       if (help_print(w, "Short commands", help_shortcmd) >= 0)
+               (void) help_print(w, "Long commands", help_longcmd);
        closeiwin(w);
 }
 
 help_print(w, name, list)
 register struct ww *w;
 char *name;
        closeiwin(w);
 }
 
 help_print(w, name, list)
 register struct ww *w;
 char *name;
-char **list;
+register char **list;
 {
 {
-       register char **p;
-       char firsttime = 1;
-
-       for (p = list; *p;) {
-               (void) wwprintf(w, "%s:%s\n\n",
-                       name, firsttime ? "" : " (continued)");
-               firsttime = 0;
-               while (*p && w->ww_cur.r < w->ww_w.b - 2) {
-                       (void) wwputs(*p++, w);
-                       (void) wwputc('\n', w);
+       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);
-               (void) wwputs("\033E", w);      /* clear and home cursor */
-       }
-}
-
-#ifndef O_4_1A
-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: %s.", wwerror());
-               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;
-}
-#endif
-
-c_stat()
-{
-       register struct ww *w;
-
-       if ((w = openiwin(6, "IO Statics")) == 0) {
-               error("Can't open statistics window: %s.", wwerror());
-               return;
-       }
-       (void) wwprintf(w, "nread\tnreadz\tnreade\tnreadc\tnwrite\tnwritec\n");
-       (void) wwprintf(w, "%d\t%d\t%d\t%d\t%d\t%d\n",
-               nread, nreadz, nreade, nreadc, wwnwrite, wwnwritec);
-       (void) wwprintf(w, "nupdate\tnupdlin\tnupdmis\tnmajlin\tnmajmis\n");
-       (void) wwprintf(w, "%d\t%d\t%d\t%d\t%d\n",
-               wwnupdate, wwnupdline, wwnupdmiss, wwnmajline, wwnmajmiss);
-       waitnl(w);
-       closeiwin(w);
-}
-
-c_list()
-{
-       register struct ww *w, *wp;
-       register i;
-       int n;
-
-       for (n = 0, i = 0; i < NWINDOW; i++)
-               if (window[i] != 0)
-                       n++;
-       if (n == 0) {
-               error("No windows.");
-               return;
-       }
-       if ((w = openiwin(n + 2, "Windows")) == 0) {
-               error("Can't open listing window: %s.", wwerror());
-               return;
-       }
-       for (i = 0; i < NWINDOW; i++) {
-               if ((wp = window[i]) == 0)
-                       continue;
-               (void) wwprintf(w, "%c %c %-13s %-.*s\n",
-                       wp == selwin ? '*' : ' ',
-                       i + '1',
-                       wp->ww_state == WWS_HASPROC
-                               ? "" : "(No process)",
-                       wwncol - 20,
-                       wp->ww_label
-                               ? wp->ww_label : "(No label)");
-       }
-       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;
-{
-       front(w, 0);
-       (void) wwprintf(w, "\033Y%c%c[Type any key to continue] ",
-               w->ww_w.nr - 1 + ' ', ' ');     /* print on last line */
-       wwcurtowin(w);
-       while (bgetc() < 0)
-               bread();
-}
-
-more(w)
-register struct ww *w;
-{
-       if (w->ww_cur.r > w->ww_w.b - 3) {
-               waitnl(w);
-               (void) wwputs("\033E", w);
-       }
-}
-
-closeiwin(w)
-struct ww *w;
-{
-       closewin(w);
-       reframe();
+               wwputc('\n', cmdwin);
+       setterse(!quit && oldterse);
 }
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.