set ww_mapnl for cmdwin

SCCS-vsn: usr.bin/window/main.c 3.22
SCCS-vsn: usr.bin/window/cmd.c 3.28
SCCS-vsn: usr.bin/window/cmd1.c 3.24
SCCS-vsn: usr.bin/window/cmd2.c 3.28
SCCS-vsn: usr.bin/window/cmd4.c 3.11
SCCS-vsn: usr.bin/window/cmd5.c 3.11
SCCS-vsn: usr.bin/window/cmd6.c 3.10

diff --git a/usr/src/usr.bin/window/cmd.c b/usr/src/usr.bin/window/cmd.c
index 8da2c17..6febd7f 100644 (file)
--- a/usr/src/usr.bin/window/cmd.c
+++ b/usr/src/usr.bin/window/cmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd.c       3.27 84/04/08";
+static char *sccsid = "@(#)cmd.c       3.28 84/04/08";

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


@@ -14,7 +14,7 @@ docmd()
        for (;;) {
                while ((c = wwgetc()) >= 0) {
                        if (!terse)
        for (;;) {
                while ((c = wwgetc()) >= 0) {
                        if (!terse)

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

                        switch (c) {
                        default:
                                if (c == escapec)
                        switch (c) {
                        default:
                                if (c == escapec)


@@ -189,7 +189,7 @@ getwin()
        if (w == 0)
                wwputc(ctrl(g), cmdwin);
        if (!terse)
        if (w == 0)
                wwputc(ctrl(g), cmdwin);
        if (!terse)

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

        return w;
 }
 
        return w;
 }
 

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

-static char *sccsid = "@(#)cmd1.c      3.23 84/04/08";
+static char *sccsid = "@(#)cmd1.c      3.24 84/04/08";

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


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

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

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


@@ -67,7 +67,7 @@ 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,
                (char *) 0);
        wwcurtowin(cmdwin);
        (void) openwin(id, row, col, xrow-row+1, xcol-col+1, nbufline,
                (char *) 0);


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

-                               wwputs("\r\nCancelled.  ", cmdwin);
+                               wwputs("\nCancelled.  ", 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);
+                               wwputs("\nType [hjklHJKL] to move, return to enter position, escape to cancel.", cmdwin);

                        wwputc(ctrl(g), cmdwin);
                }
        }
                        wwputc(ctrl(g), cmdwin);
                }
        }

diff --git a/usr/src/usr.bin/window/cmd2.c b/usr/src/usr.bin/window/cmd2.c
index e3cf1ef..09f3f33 100644 (file)
--- a/usr/src/usr.bin/window/cmd2.c
+++ b/usr/src/usr.bin/window/cmd2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd2.c      3.27 84/04/08";
+static char *sccsid = "@(#)cmd2.c      3.28 84/04/08";

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


@@ -96,6 +96,6 @@ c_quit()
                wwputs("Yes", cmdwin);
                quit++;
        } else
                wwputs("Yes", cmdwin);
                quit++;
        } else

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

        setterse(!quit && oldterse);
 }
        setterse(!quit && oldterse);
 }

diff --git a/usr/src/usr.bin/window/cmd4.c b/usr/src/usr.bin/window/cmd4.c
index 0554dd8..0d8461a 100644 (file)
--- a/usr/src/usr.bin/window/cmd4.c
+++ b/usr/src/usr.bin/window/cmd4.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd4.c      3.10 84/04/05";
+static char *sccsid = "@(#)cmd4.c      3.11 84/04/08";

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


@@ -12,7 +12,7 @@ c_colon()
        setterse(0);
        wwputc(':', cmdwin);
        wwgets(buf, wwncol - 3, cmdwin);
        setterse(0);
        wwputc(':', cmdwin);
        wwgets(buf, wwncol - 3, cmdwin);

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

        wwcurtowin(cmdwin);
        setterse(oldterse);
        if (dolongcmd(buf) < 0)
        wwcurtowin(cmdwin);
        setterse(oldterse);
        if (dolongcmd(buf) < 0)

diff --git a/usr/src/usr.bin/window/cmd5.c b/usr/src/usr.bin/window/cmd5.c
index 2169b93..10c7254 100644 (file)
--- a/usr/src/usr.bin/window/cmd5.c
+++ b/usr/src/usr.bin/window/cmd5.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd5.c      3.10 84/03/03";
+static char *sccsid = "@(#)cmd5.c      3.11 84/04/08";

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


@@ -45,7 +45,7 @@ register struct ww *w;
        }
        wwdelete(boxwin);
        if (!terse)
        }
        wwdelete(boxwin);
        if (!terse)

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

        wwcurtowin(cmdwin);
        movewin(w, row, col);
 }
        wwcurtowin(cmdwin);
        movewin(w, row, col);
 }

diff --git a/usr/src/usr.bin/window/cmd6.c b/usr/src/usr.bin/window/cmd6.c
index 77a8c37..7490cfb 100644 (file)
--- a/usr/src/usr.bin/window/cmd6.c
+++ b/usr/src/usr.bin/window/cmd6.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd6.c      3.9 84/04/08";
+static char *sccsid = "@(#)cmd6.c      3.10 84/04/08";

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


@@ -20,7 +20,7 @@ c_debug()
        while (wwpeekc() < 0)
                wwiomux();
        if (!terse)
        while (wwpeekc() < 0)
                wwiomux();
        if (!terse)

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

        switch (wwgetc()) {
        case 'm':
                wwdumpsmap();
        switch (wwgetc()) {
        case 'm':
                wwdumpsmap();

diff --git a/usr/src/usr.bin/window/main.c b/usr/src/usr.bin/window/main.c
index 8b836ab..cb84d16 100644 (file)
--- a/usr/src/usr.bin/window/main.c
+++ b/usr/src/usr.bin/window/main.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)main.c      3.21 84/04/08";
+static char *sccsid = "@(#)main.c      3.22 84/04/08";

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


@@ -89,6 +89,7 @@ char **argv;
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }
                (void) fprintf(stderr, "%s.\r\n", wwerror());
                goto bad;
        }

+       cmdwin->ww_mapnl = 1;

        cmdwin->ww_nointr = 1;
        cmdwin->ww_noupdate = 1;
        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))
        cmdwin->ww_nointr = 1;
        cmdwin->ww_noupdate = 1;
        if ((framewin = wwopen(WWO_GLASS|WWO_FRAME, wwnrow, wwncol, 0, 0, 0))