BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/window/xx.c b/usr/src/usr.bin/window/xx.c
index c6a3c61..1f7ade5 100644 (file)
--- a/usr/src/usr.bin/window/xx.c
+++ b/usr/src/usr.bin/window/xx.c
@@ -2,21 +2,40 @@
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)xx.c       3.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)xx.c       3.6 (Berkeley) 6/6/90";

 #endif /* not lint */
 
 #include "ww.h"
 #endif /* not lint */
 
 #include "ww.h"


@@ -28,8 +47,8 @@ xxinit()
        if (ttinit() < 0)
                return -1;
        xxbufsize = tt.tt_nrow * tt.tt_ncol * 2;
        if (ttinit() < 0)
                return -1;
        xxbufsize = tt.tt_nrow * tt.tt_ncol * 2;

-       /* xcinit may choose to change xxbufsize */
-       if (tt.tt_ntoken > 0 && xcinit() < 0)
+       /* ccinit may choose to change xxbufsize */
+       if (tt.tt_ntoken > 0 && ccinit() < 0)

                return -1;
        xxbuf = malloc((unsigned) xxbufsize * sizeof *xxbuf);
        if (xxbuf == 0) {
                return -1;
        xxbuf = malloc((unsigned) xxbufsize * sizeof *xxbuf);
        if (xxbuf == 0) {


@@ -45,7 +64,7 @@ xxstart()
 {
        (*tt.tt_start)();
        if (tt.tt_ntoken > 0)
 {
        (*tt.tt_start)();
        if (tt.tt_ntoken > 0)

-               xcstart();
+               ccstart();

        xxreset();                      /* might be a restart */
 }
 
        xxreset();                      /* might be a restart */
 }
 


@@ -59,8 +78,10 @@ xxend()
        if (tt.tt_scroll_down)
                (*tt.tt_scroll_down)(1);
        (*tt.tt_move)(tt.tt_nrow - 1, 0);
        if (tt.tt_scroll_down)
                (*tt.tt_scroll_down)(1);
        (*tt.tt_move)(tt.tt_nrow - 1, 0);

+       if (tt.tt_ntoken > 0)
+               ccend();

        (*tt.tt_end)();
        (*tt.tt_end)();

-       ttflush();
+       (*tt.tt_flush)();

 }
 
 struct xx *
 }
 
 struct xx *