BSD 4_3_Reno release

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

diff --git a/usr/src/usr.bin/window/wwflush.c b/usr/src/usr.bin/window/wwflush.c
index 56f8163..e0aea3b 100644 (file)
--- a/usr/src/usr.bin/window/wwflush.c
+++ b/usr/src/usr.bin/window/wwflush.c
@@ -2,21 +2,26 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 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 are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)wwflush.c  3.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwflush.c  3.12 (Berkeley) 6/6/90";

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


@@ -24,10 +29,16 @@ static char sccsid[] = "@(#)wwflush.c       3.9 (Berkeley) %G%";
 
 wwflush()
 {
 
 wwflush()
 {

-       if (wwcursorrow < 0 || wwcursorrow >= wwnrow
-           || wwcursorcol < 0 || wwcursorcol >= wwncol)
-               (*tt.tt_move)(0, 0);
-       else
-               (*tt.tt_move)(wwcursorrow, wwcursorcol);
-       ttflush();
+       register row, col;
+
+       if ((row = wwcursorrow) < 0)
+               row = 0;
+       else if (row >= wwnrow)
+               row = wwnrow - 1;
+       if ((col = wwcursorcol) < 0)
+               col = 0;
+       else if (col >= wwncol)
+               col = wwncol - 1;
+       xxmove(row, col);
+       xxflush(1);

 }
 }