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 e06b7c9..0340d9e 100644 (file)
--- a/usr/src/lib/libcurses/overlay.c
+++ b/usr/src/lib/libcurses/overlay.c
@@ -1,38 +1,77 @@
-# include      "curses.h"
+/*
+ * 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[] = "@(#)overlay.c  5.6 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+# include      "curses.ext"

 # include      <ctype.h>
 
 # define       min(a,b)        (a < b ? a : b)
 # include      <ctype.h>
 
 # define       min(a,b)        (a < b ? a : b)

-# define       max(a,b)        (a < b ? a : b)
+# define       max(a,b)        (a > b ? a : b)

 
 /*
  *     This routine writes win1 on win2 non-destructively.
  *
 
 /*
  *     This routine writes win1 on win2 non-destructively.
  *

- * 1/26/81 (Berkeley) @(#)overlay.c    1.1

  */
 overlay(win1, win2)
 reg WINDOW     *win1, *win2; {
 
        reg char        *sp, *end;
  */
 overlay(win1, win2)
 reg WINDOW     *win1, *win2; {
 
        reg char        *sp, *end;

-       reg int         x, y, endy, endx, starty, startx, y_top,
-                       y_bot, x_left, x_right;
+       reg int         x, y, endy, endx, starty, startx;
+       reg int         y1,y2;

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

-       y_top = max(win1->_begy, win2->_begy);
-       y_bot = min(win1->_maxy, win2->_maxy);
-       x_left = max(win1->_begx, win2->_begx);
-       x_right = min(win1->_maxx, win2->_maxx);
-       starty = y_top - win1->_begy;
-       startx = x_left - win1->_begx;
-       endy = y_bot - win1->_begy;
-       endx = x_right - win1->_begx;
-       for (y = starty; y < endy; y++) {
-               end = &win1->_y[y][endx];
-               x = startx + win1->_begx;
-               for (sp = &win1->_y[y][startx]; sp <= end; sp++) {
+       starty = max(win1->_begy, win2->_begy);
+       startx = max(win1->_begx, win2->_begx);
+       endy = min(win1->_maxy + win1->_begy, win2->_maxy + win2->_begx);
+       endx = min(win1->_maxx + win1->_begx, win2->_maxx + win2->_begx);
+# ifdef DEBUG
+       fprintf(outf, "OVERLAY:from (%d,%d) to (%d,%d)\n", starty, startx, endy, endx);
+# endif
+       if (starty >= endy || startx >= endx)
+               return;
+       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;
+               for (sp = &win1->_y[y1][startx - win1->_begx]; sp < end; sp++) {

                        if (!isspace(*sp))
                        if (!isspace(*sp))

-                               mvwaddch(win2, y + win1->_begy, x, *sp);
+                               mvwaddch(win2, y2, x, *sp);

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