BSD 4_4 release

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

diff --git a/usr/src/lib/libcurses/box.c b/usr/src/lib/libcurses/box.c
index a28de4a..4da2303 100644 (file)
--- a/usr/src/lib/libcurses/box.c
+++ b/usr/src/lib/libcurses/box.c
@@ -1,51 +1,78 @@
 /*
 /*

- * 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.

  *
  *

- * 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.
+ * 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[] = "@(#)box.c      5.4 (Berkeley) 6/1/90";
-#endif /* not lint */
+static char sccsid[] = "@(#)box.c      8.1 (Berkeley) 6/4/93";
+#endif /* not lint */

 
 

-# include      "curses.ext"
+#include <curses.h>

 
 /*
 
 /*

- *     This routine draws a box around the given window with "vert"
- * as the vertical delimiting char, and "hor", as the horizontal one.
- *
+ * box --
+ *     Draw a box around the given window with "vert" as the vertical
+ *     delimiting char, and "hor", as the horizontal one.

  */
  */

+int

 box(win, vert, hor)
 box(win, vert, hor)

-reg WINDOW     *win;
-char           vert, hor; {
-
-       reg int         i;
-       reg int         endy, endx;
-       reg char        *fp, *lp;
+       register WINDOW *win;
+       int vert, hor;
+{
+       register int endy, endx, i;
+       register __LDATA *fp, *lp;

 
 

-       endx = win->_maxx;
-       endy = win->_maxy - 1;
-       fp = win->_y[0];
-       lp = win->_y[endy];
-       for (i = 0; i < endx; i++)
-               fp[i] = lp[i] = hor;
+       endx = win->maxx;
+       endy = win->maxy - 1;
+       fp = win->lines[0]->line;
+       lp = win->lines[endy]->line;
+       for (i = 0; i < endx; i++) {
+               fp[i].ch = lp[i].ch = hor;
+               fp[i].attr &= ~__STANDOUT;
+               lp[i].attr &= ~__STANDOUT;
+       }

        endx--;
        endx--;

-       for (i = 0; i <= endy; i++)
-               win->_y[i][0] = (win->_y[i][endx] = vert);
-       if (!win->_scroll && (win->_flags&_SCROLLWIN))
-               fp[0] = fp[endx] = lp[0] = lp[endx] = ' ';
-       touchwin(win);
+       for (i = 0; i <= endy; i++) {
+               win->lines[i]->line[0].ch = vert;
+               win->lines[i]->line[endx].ch = vert;
+               win->lines[i]->line[0].attr &= ~__STANDOUT;
+               win->lines[i]->line[endx].attr &= ~__STANDOUT;
+       }
+       if (!(win->flags & __SCROLLOK) && (win->flags & __SCROLLWIN)) {
+               fp[0].ch = fp[endx].ch = lp[0].ch = lp[endx].ch = ' ';
+               fp[0].attr &= ~__STANDOUT;
+               fp[endx].attr &= ~__STANDOUT;
+               lp[0].attr &= ~__STANDOUT;
+               lp[endx].attr &= ~__STANDOUT;
+       }
+       __touchwin(win);
+       return (OK);

 }
 }