386BSD 0.0 development

[unix-history] / usr / src / lib / libcurses / erase.c

diff --git a/usr/src/lib/libcurses/erase.c b/usr/src/lib/libcurses/erase.c
index e21510d..c700ef2 100644 (file)
--- a/usr/src/lib/libcurses/erase.c
+++ b/usr/src/lib/libcurses/erase.c
@@ -1,7 +1,45 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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
+static char sccsid[] = "@(#)erase.c    5.4 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine erases everything on the window.
 # include      "curses.ext"
 
 /*
  *     This routine erases everything on the window.

+ *

  */
 werase(win)
 reg WINDOW     *win; {
  */
 werase(win)
 reg WINDOW     *win; {


@@ -10,6 +48,9 @@ reg WINDOW    *win; {
        reg char        *sp, *end, *start, *maxx;
        reg int         minx;
 
        reg char        *sp, *end, *start, *maxx;
        reg int         minx;
 

+# ifdef DEBUG
+       fprintf(outf, "WERASE(%0.2o)\n", win);
+# endif

        for (y = 0; y < win->_maxy; y++) {
                minx = _NOCHANGE;
                start = win->_y[y];
        for (y = 0; y < win->_maxy; y++) {
                minx = _NOCHANGE;
                start = win->_y[y];


@@ -21,13 +62,8 @@ reg WINDOW   *win; {
                                        minx = sp - start;
                                *sp = ' ';
                        }
                                        minx = sp - start;
                                *sp = ' ';
                        }

-               if (minx != _NOCHANGE) {
-                       if (win->_firstch[y] > minx
-                            || win->_firstch[y] == _NOCHANGE)
-                               win->_firstch[y] = minx;
-                       if (win->_lastch[y] < maxx - win->_y[y])
-                               win->_lastch[y] = maxx - win->_y[y];
-               }
+               if (minx != _NOCHANGE)
+                       touchline(win, y, minx, maxx - win->_y[y]);

        }
        win->_curx = win->_cury = 0;
 }
        }
        win->_curx = win->_cury = 0;
 }