BSD 4_3_Reno release

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

diff --git a/usr/src/usr.bin/window/wwclreos.c b/usr/src/usr.bin/window/wwclreos.c
index 06f6ede..16729d2 100644 (file)
--- a/usr/src/usr.bin/window/wwclreos.c
+++ b/usr/src/usr.bin/window/wwclreos.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[] = "@(#)wwclreos.c 3.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwclreos.c 3.11 (Berkeley) 6/6/90";

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


@@ -26,34 +31,11 @@ wwclreos(w, row, col)
 register struct ww *w;
 {
        register i;
 register struct ww *w;
 {
        register i;

-       int cleared = 0;
-
-       /*
-        * Quick and dirty check for windows that cover the bottom
-        * portion of the screen.  Not meant to be complete.
-        */
-       if (tt.tt_clreos && w->ww_i.b == wwnrow && w->ww_i.l == 0 &&
-           w->ww_i.r == wwncol && wwvisible(w)) {
-               register j;
-               register union ww_char *s;

 
 

-               i = row;
-               (*tt.tt_move)(i, col);
-               (*tt.tt_clreos)();
-               /*
-                * We have to fix wwos becuase wwclreol1 won't do that.
-                */
-               s = &wwos[i][col];
-               for (j = wwncol - col; --j >= 0;)
-                       s++->c_w = ' ';
-               for (i++; i < wwnrow; i++) {
-                       s = wwos[i];
-                       for (j = wwncol; --j >= 0;)
-                               s++->c_w = ' ';
-               }
-               cleared = 1;
-       }
-       wwclreol1(w, row, col, cleared);
+       wwclreol(w, row, col);

        for (i = row + 1; i < w->ww_b.b; i++)
        for (i = row + 1; i < w->ww_b.b; i++)

-               wwclreol1(w, i, w->ww_b.l, cleared);
+               wwclreol(w, i, w->ww_b.l);
+       /* XXX */
+       if (!w->ww_noupdate)
+               wwupdate1(w->ww_i.t, w->ww_i.b);

 }
 }