BSD 4_4 release

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

diff --git a/usr/src/lib/libcurses/id_subwins.c b/usr/src/lib/libcurses/id_subwins.c
index 49ebdd1..6dc715c 100644 (file)
--- a/usr/src/lib/libcurses/id_subwins.c
+++ b/usr/src/lib/libcurses/id_subwins.c
@@ -1,38 +1,65 @@
 /*
 /*

- * Copyright (c) 1981 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1981, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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[] = "@(#)id_subwins.c       5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)id_subwins.c       8.1 (Berkeley) 6/4/93";

 #endif /* not lint */
 
 #include <curses.h>
 
 /*
  * __id_subwins --
 #endif /* not lint */
 
 #include <curses.h>
 
 /*
  * __id_subwins --

- *     Re-sync the pointers to _y for all the subwindows.
+ *     Re-sync the pointers to lines for all the subwindows.

  */
 void
 __id_subwins(orig)
        register WINDOW *orig;
 {
        register WINDOW *win;
  */
 void
 __id_subwins(orig)
        register WINDOW *orig;
 {
        register WINDOW *win;

-       register int oy, realy, x, y;
+       register int oy, realy, y;

 
 

-       realy = orig->_begy + orig->_cury;
-       for (win = orig->_nextp; win != orig; win = win->_nextp) {
+       realy = orig->begy + orig->cury;
+       for (win = orig->nextp; win != orig; win = win->nextp) {

                /*
                 * If the window ends before our current position, don't need
                 * to do anything.
                 */
                /*
                 * If the window ends before our current position, don't need
                 * to do anything.
                 */

-               if (win->_begy + win->_maxy <= realy)
+               if (win->begy + win->maxy <= realy)

                        continue;
 
                        continue;
 

-               oy = orig->_cury;
-               for (y = realy - win->_begy; y < win->_maxy; y++, oy++)
-                       win->_y[y] = &orig->_y[oy][win->_ch_off];
+               oy = orig->cury;
+               for (y = realy - win->begy; y < win->maxy; y++, oy++)
+                       win->lines[y]->line = 
+                               &orig->lines[oy]->line[win->ch_off];

        }
 }
        }
 }