added "more" command

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

diff --git a/usr/src/usr.bin/window/wwmisc.c b/usr/src/usr.bin/window/wwmisc.c
index aee47d9..fa3072a 100644 (file)
--- a/usr/src/usr.bin/window/wwmisc.c
+++ b/usr/src/usr.bin/window/wwmisc.c
@@ -1,8 +1,16 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwmisc.c    3.3 83/09/15";
+static char sccsid[] = "@(#)wwmisc.c   3.9 %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 "ww.h"
 #include "ww.h"

+#include "tt.h"
+#include "char.h"

 
 /*
  * Sufficient but not necessary test for total visibility.
 
 /*
  * Sufficient but not necessary test for total visibility.


@@ -16,33 +24,14 @@ register struct ww *w;
        for (i = w->ww_i.t; i < w->ww_i.b; i++)
                nvis += w->ww_nvis[i];
        if (w->ww_hascursor
        for (i = w->ww_i.t; i < w->ww_i.b; i++)
                nvis += w->ww_nvis[i];
        if (w->ww_hascursor

-           && w->ww_cur.r >= w->ww_i.b && w->ww_cur.r < w->ww_i.t
+           && w->ww_cur.r >= w->ww_i.t && w->ww_cur.r < w->ww_i.b

            && w->ww_cur.c >= w->ww_i.l && w->ww_cur.c < w->ww_i.r
            && wwsmap[w->ww_cur.r][w->ww_cur.c] == w->ww_index)
                nvis++;
        return nvis == w->ww_i.nr * w->ww_i.nc;
 }
 
            && w->ww_cur.c >= w->ww_i.l && w->ww_cur.c < w->ww_i.r
            && wwsmap[w->ww_cur.r][w->ww_cur.c] == w->ww_index)
                nvis++;
        return nvis == w->ww_i.nr * w->ww_i.nc;
 }
 

-char *
-unctrl(c)
-register char c;
+wwbell()

 {
 {

-       static char buf[5];
-       register char *p = buf;
-
-       if (c == DEL) {
-               *p++ = '^';
-               *p++ = '?';
-       } else if (c < ' ') {
-               *p++ = '^';
-               *p++ = c + '@';
-       } else if (c > DEL) {
-               *p++ = '\\';
-               *p++ = (c >> 6 & 3) + '0';
-               *p++ = (c >> 3 & 7) + '0';
-               *p++ = (c & 7) + '0';
-       } else
-               *p++ = c;
-       *p = 0;
-       return buf;
+       ttputc(ctrl(g));

 }
 }