added "more" command

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

diff --git a/usr/src/usr.bin/window/cmd1.c b/usr/src/usr.bin/window/cmd1.c
index 61e9270..0962c4b 100644 (file)
--- a/usr/src/usr.bin/window/cmd1.c
+++ b/usr/src/usr.bin/window/cmd1.c
@@ -1,7 +1,13 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd1.c      3.23 84/04/08";
+static char sccsid[] = "@(#)cmd1.c     3.29 %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"
 #include "char.h"
 
 #include "defs.h"
 #include "char.h"
 


@@ -13,7 +19,7 @@ c_window()
        if ((id = findid()) < 0)
                return;
        if (!terse)
        if ((id = findid()) < 0)
                return;
        if (!terse)

-               wwputs("Upper left corner: ", cmdwin);
+               wwputs("New window (upper left corner): ", cmdwin);

        col = 0;
        row = 1;
        wwadd(boxwin, framewin->ww_back);
        col = 0;
        row = 1;
        wwadd(boxwin, framewin->ww_back);


@@ -39,7 +45,7 @@ c_window()
                break;
        }
        if (!terse)
                break;
        }
        if (!terse)

-               wwputs("\r\nLower right corner: ", cmdwin);
+               wwputs("\nNew window (lower right corner): ", cmdwin);

        xcol = col;
        xrow = row;
        for (;;) {
        xcol = col;
        xrow = row;
        for (;;) {


@@ -67,10 +73,10 @@ c_window()
        }
        wwdelete(boxwin);
        if (!terse)
        }
        wwdelete(boxwin);
        if (!terse)

-               wwputs("\r\n", cmdwin);
+               wwputc('\n', cmdwin);

        wwcurtowin(cmdwin);
        (void) openwin(id, row, col, xrow-row+1, xcol-col+1, nbufline,
        wwcurtowin(cmdwin);
        (void) openwin(id, row, col, xrow-row+1, xcol-col+1, nbufline,

-               (char *) 0);
+               (char *) 0, 1, 1, shellfile, shell);

 }
 
 getpos(row, col, minrow, mincol, maxrow, maxcol)
 }
 
 getpos(row, col, minrow, mincol, maxrow, maxcol)


@@ -123,14 +129,14 @@ int maxrow, maxcol;
                        break;
                case ctrl([):
                        if (!terse)
                        break;
                case ctrl([):
                        if (!terse)

-                               wwputs("\r\nCancelled.  ", cmdwin);
+                               wwputs("\nCanceled.  ", cmdwin);

                        return 3;
                case '\r':
                        return 2;
                default:
                        if (!terse)
                        return 3;
                case '\r':
                        return 2;
                default:
                        if (!terse)

-                               wwputs("\r\nType [hjklHJKL] to move, return to enter position, escape to cancel.", cmdwin);
-                       wwputc(ctrl(g), cmdwin);
+                               wwputs("\nType [hjklHJKL] to move, return to enter position, escape to cancel.", cmdwin);
+                       wwbell();

                }
        }
        return oldrow != *row || oldcol != *col;
                }
        }
        return oldrow != *row || oldcol != *col;