BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libcurses/overlay.c b/usr/src/lib/libcurses/overlay.c
index b59057a..0340d9e 100644 (file)
--- a/usr/src/lib/libcurses/overlay.c
+++ b/usr/src/lib/libcurses/overlay.c
@@ -1,12 +1,39 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)overlay.c  5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)overlay.c  5.6 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 # include      "curses.ext"
 # include      <ctype.h>
 
 # include      "curses.ext"
 # include      <ctype.h>


@@ -23,6 +50,7 @@ reg WINDOW    *win1, *win2; {
 
        reg char        *sp, *end;
        reg int         x, y, endy, endx, starty, startx;
 
        reg char        *sp, *end;
        reg int         x, y, endy, endx, starty, startx;

+       reg int         y1,y2;

 
 # ifdef DEBUG
        fprintf(outf, "OVERLAY(%0.2o, %0.2o);\n", win1, win2);
 
 # ifdef DEBUG
        fprintf(outf, "OVERLAY(%0.2o, %0.2o);\n", win1, win2);


@@ -36,20 +64,14 @@ reg WINDOW  *win1, *win2; {
 # endif
        if (starty >= endy || startx >= endx)
                return;
 # endif
        if (starty >= endy || startx >= endx)
                return;

-       x = endx - startx;
-       for (y = starty; y < endy; y++) {
-               bcopy(&win1->_y[y - win1->_begy][startx - win1->_begx],
-                     &win2->_y[y - win2->_begy][startx - win2->_begx], x);
-               touchline(win2, y, startx - win2->_begx, endx - win2->_begx);
-       }
-       for (y = starty; y < endy; y++) {
-               end = &win1->_y[y - win1->_begy][endx - win1->_begx];
+       y1 = starty - win1->_begy;
+       y2 = starty - win2->_begy;
+       for (y = starty; y < endy; y++, y1++, y2++) {
+               end = &win1->_y[y1][endx - win1->_begx];

                x = startx - win2->_begx;
                x = startx - win2->_begx;

-               for (sp = &win1->_y[y][startx - win1->_begx]; sp < end; sp++) {
-                       if (!isspace(*sp)) {
-                               waddch(win2, y - win2->_begy, x);
-                               waddch(win2, *sp);
-                       }
+               for (sp = &win1->_y[y1][startx - win1->_begx]; sp < end; sp++) {
+                       if (!isspace(*sp))
+                               mvwaddch(win2, y2, x, *sp);

                        x++;
                }
        }
                        x++;
                }
        }